[Bf-blender-cvs] [d15d07c4f6f] temp-ghost_openxr: Rename wm_xr_ -> GHOST_XR
Julian Eisel
noreply at git.blender.org
Wed Jun 19 00:29:09 CEST 2019
Commit: d15d07c4f6f6cffc4e85056c4ffc04e753ba0f9c
Author: Julian Eisel
Date: Wed Jun 19 00:28:37 2019 +0200
Branches: temp-ghost_openxr
https://developer.blender.org/rBd15d07c4f6f6cffc4e85056c4ffc04e753ba0f9c
Rename wm_xr_ -> GHOST_XR
===================================================================
M intern/ghost/GHOST_C-api.h
M intern/ghost/intern/GHOST_XR.cpp
M intern/ghost/intern/GHOST_XREvent.cpp
M intern/ghost/intern/GHOST_XRSession.cpp
M intern/ghost/intern/GHOST_XR_intern.h
M release/scripts/addons
M source/blender/windowmanager/intern/wm.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h
index e9c90c37c7d..3c6a684f054 100644
--- a/intern/ghost/GHOST_C-api.h
+++ b/intern/ghost/GHOST_C-api.h
@@ -966,7 +966,7 @@ extern void GHOST_EndIME(GHOST_WindowHandle windowhandle);
#ifdef WITH_OPENXR
# if !defined(WITH_OPENXR)
// TODO
-static_assert(false, "WITH_OPENXR not defined, but wm_xr.c is being compiled.");
+static_assert(false, "WITH_OPENXR not defined, but GHOST_XR.c is being compiled.");
# endif
/**
@@ -995,24 +995,24 @@ typedef struct {
} wmXRContextCreateInfo;
/* xr-context */
-struct wmXRContext *wm_xr_context_create(const wmXRContextCreateInfo *create_info);
-void wm_xr_context_destroy(struct wmXRContext *xr_context);
+struct wmXRContext *GHOST_XR_context_create(const wmXRContextCreateInfo *create_info);
+void GHOST_XR_context_destroy(struct wmXRContext *xr_context);
typedef void *(*wmXRGraphicsContextBindFn)(eWM_xrGraphicsBinding graphics_lib);
typedef void (*wmXRGraphicsContextUnbindFn)(eWM_xrGraphicsBinding graphics_lib,
void *graphics_context);
-void wm_xr_graphics_context_bind_funcs(struct wmXRContext *xr_context,
- wmXRGraphicsContextBindFn bind_fn,
- wmXRGraphicsContextUnbindFn unbind_fn);
+void GHOST_XR_graphics_context_bind_funcs(struct wmXRContext *xr_context,
+ wmXRGraphicsContextBindFn bind_fn,
+ wmXRGraphicsContextUnbindFn unbind_fn);
/* sessions */
-GHOST_TSuccess wm_xr_session_is_running(const struct wmXRContext *xr_context);
-void wm_xr_session_start(struct wmXRContext *xr_context);
-void wm_xr_session_end(struct wmXRContext *xr_context);
+GHOST_TSuccess GHOST_XR_session_is_running(const struct wmXRContext *xr_context);
+void GHOST_XR_session_start(struct wmXRContext *xr_context);
+void GHOST_XR_session_end(struct wmXRContext *xr_context);
/* events */
-GHOST_TSuccess wm_xr_events_handle(struct wmXRContext *xr_context);
+GHOST_TSuccess GHOST_XR_events_handle(struct wmXRContext *xr_context);
#endif
#ifdef __cplusplus
diff --git a/intern/ghost/intern/GHOST_XR.cpp b/intern/ghost/intern/GHOST_XR.cpp
index cba1e8b8413..810c850ef4f 100644
--- a/intern/ghost/intern/GHOST_XR.cpp
+++ b/intern/ghost/intern/GHOST_XR.cpp
@@ -222,7 +222,7 @@ static void openxr_instance_log_print(OpenXRData *oxr)
* Includes setting up the OpenXR instance, querying available extensions and API layers, enabling
* extensions (currently graphics binding extension only) and API layers.
*/
-wmXRContext *wm_xr_context_create(const wmXRContextCreateInfo *create_info)
+wmXRContext *GHOST_XR_context_create(const wmXRContextCreateInfo *create_info)
{
wmXRContext *xr_context = new wmXRContext();
OpenXRData *oxr = &xr_context->oxr;
@@ -249,12 +249,12 @@ wmXRContext *wm_xr_context_create(const wmXRContextCreateInfo *create_info)
return xr_context;
}
-void wm_xr_context_destroy(wmXRContext *xr_context)
+void GHOST_XR_context_destroy(wmXRContext *xr_context)
{
OpenXRData *oxr = &xr_context->oxr;
/* Unbinding may involve destruction, so call here too */
- wm_xr_graphics_context_unbind(*xr_context);
+ GHOST_XR_graphics_context_unbind(*xr_context);
if (oxr->session != XR_NULL_HANDLE) {
xrDestroySession(oxr->session);
@@ -274,23 +274,23 @@ void wm_xr_context_destroy(wmXRContext *xr_context)
* \param bind_fn Function to retrieve (possibly create) a graphics context.
* \param unbind_fn Function to release (possibly free) a graphics context.
*/
-void wm_xr_graphics_context_bind_funcs(wmXRContext *xr_context,
+void GHOST_XR_graphics_context_bind_funcs(wmXRContext *xr_context,
wmXRGraphicsContextBindFn bind_fn,
wmXRGraphicsContextUnbindFn unbind_fn)
{
- wm_xr_graphics_context_unbind(*xr_context);
+ GHOST_XR_graphics_context_unbind(*xr_context);
xr_context->gpu_ctx_bind_fn = bind_fn;
xr_context->gpu_ctx_unbind_fn = unbind_fn;
}
-void wm_xr_graphics_context_bind(wmXRContext &xr_context)
+void GHOST_XR_graphics_context_bind(wmXRContext &xr_context)
{
assert(xr_context.gpu_ctx_bind_fn);
xr_context.gpu_ctx = static_cast<GHOST_Context *>(
xr_context.gpu_ctx_bind_fn(xr_context.gpu_binding));
}
-void wm_xr_graphics_context_unbind(wmXRContext &xr_context)
+void GHOST_XR_graphics_context_unbind(wmXRContext &xr_context)
{
if (xr_context.gpu_ctx_unbind_fn) {
xr_context.gpu_ctx_unbind_fn(xr_context.gpu_binding, xr_context.gpu_ctx);
diff --git a/intern/ghost/intern/GHOST_XREvent.cpp b/intern/ghost/intern/GHOST_XREvent.cpp
index c05b80e1f8b..7901bd144f2 100644
--- a/intern/ghost/intern/GHOST_XREvent.cpp
+++ b/intern/ghost/intern/GHOST_XREvent.cpp
@@ -23,7 +23,7 @@
#include "GHOST_C-api.h"
#include "GHOST_XR_intern.h"
-static bool wm_xr_event_poll_next(OpenXRData *oxr, XrEventDataBuffer &r_event_data)
+static bool GHOST_XR_event_poll_next(OpenXRData *oxr, XrEventDataBuffer &r_event_data)
{
/* (Re-)initialize as required by specification */
r_event_data.type = XR_TYPE_EVENT_DATA_BUFFER;
@@ -32,21 +32,21 @@ static bool wm_xr_event_poll_next(OpenXRData *oxr, XrEventDataBuffer &r_event_da
return (xrPollEvent(oxr->instance, &r_event_data) == XR_SUCCESS);
}
-GHOST_TSuccess wm_xr_events_handle(wmXRContext *xr_context)
+GHOST_TSuccess GHOST_XR_events_handle(wmXRContext *xr_context)
{
OpenXRData *oxr = &xr_context->oxr;
XrEventDataBuffer event_buffer; /* structure big enought to hold all possible events */
- if (!wm_xr_session_is_running(xr_context)) {
+ if (!GHOST_XR_session_is_running(xr_context)) {
return GHOST_kFailure;
}
- while (wm_xr_event_poll_next(oxr, event_buffer)) {
+ while (GHOST_XR_event_poll_next(oxr, event_buffer)) {
XrEventDataBaseHeader &event = (XrEventDataBaseHeader &)event_buffer; /* base event struct */
switch (event.type) {
case XR_TYPE_EVENT_DATA_SESSION_STATE_CHANGED:
- wm_xr_session_state_change(oxr, (XrEventDataSessionStateChanged &)event);
+ GHOST_XR_session_state_change(oxr, (XrEventDataSessionStateChanged &)event);
return GHOST_kSuccess;
default:
diff --git a/intern/ghost/intern/GHOST_XRSession.cpp b/intern/ghost/intern/GHOST_XRSession.cpp
index cb0beb0ae0b..835a02ff730 100644
--- a/intern/ghost/intern/GHOST_XRSession.cpp
+++ b/intern/ghost/intern/GHOST_XRSession.cpp
@@ -30,7 +30,7 @@
* \ingroup wm
*/
-GHOST_TSuccess wm_xr_session_is_running(const wmXRContext *xr_context)
+GHOST_TSuccess GHOST_XR_session_is_running(const wmXRContext *xr_context)
{
if ((xr_context == nullptr) || (xr_context->oxr.session == XR_NULL_HANDLE)) {
return GHOST_kFailure;
@@ -49,7 +49,7 @@ GHOST_TSuccess wm_xr_session_is_running(const wmXRContext *xr_context)
* A system in OpenXR the combination of some sort of HMD plus controllers and whatever other
* devices are managed through OpenXR. So this attempts to init the HMD and the other devices.
*/
-static void wm_xr_system_init(OpenXRData *oxr)
+static void GHOST_XR_system_init(OpenXRData *oxr)
{
assert(oxr->instance != XR_NULL_HANDLE);
assert(oxr->system_id == XR_NULL_SYSTEM_ID);
@@ -99,7 +99,7 @@ static void *openxr_graphics_binding_create(const wmXRContext *xr_context,
return &binding;
}
-void wm_xr_session_start(wmXRContext *xr_context)
+void GHOST_XR_session_start(wmXRContext *xr_context)
{
OpenXRData *oxr = &xr_context->oxr;
@@ -108,19 +108,19 @@ void wm_xr_session_start(wmXRContext *xr_context)
if (xr_context->gpu_ctx_bind_fn == nullptr) {
fprintf(stderr,
"Invalid API usage: No way to bind graphics context to the XR session. Call "
- "wm_xr_graphics_context_bind_funcs() with valid parameters before starting the "
- "session (through wm_xr_session_start()).");
+ "GHOST_XR_graphics_context_bind_funcs() with valid parameters before starting the "
+ "session (through GHOST_XR_session_start()).");
return;
}
- wm_xr_system_init(oxr);
+ GHOST_XR_system_init(oxr);
- wm_xr_graphics_context_bind(*xr_context);
+ GHOST_XR_graphics_context_bind(*xr_context);
if (xr_context->gpu_ctx == nullptr) {
fprintf(stderr,
"Invalid API usage: No graphics context returned through the callback set with "
- "wm_xr_graphics_context_bind_funcs(). This is required for session starting (through "
- "wm_xr_session_start()).\n");
+ "GHOST_XR_graphics_context_bind_funcs(). This is required for session starting (through "
+ "GHOST_XR_session_start()).\n");
return;
}
@@ -133,13 +133,13 @@ void wm_xr_session_start(wmXRContext *xr_context)
xrCreateSession(oxr->instance, &create_info, &oxr->session);
}
-void wm_xr_session_end(wmXRContext *xr_context)
+void GHOST_XR_session_end(wmXRContext *xr_context)
{
xrEndSession(xr_context->oxr.session);
- wm_xr_graphics_context_unbind(*xr_context);
+ GHOST_XR_graphics_context_unbind(*xr_context);
}
-void wm_xr_session_state_change(OpenXRData *oxr, const XrEventDataSessionStateChanged &lifecycle)
+void GHOST_XR_session_state_change(OpenXRData *oxr, const XrEventDataSessionStateChanged &lifecycle)
{
oxr->session_state = lifecycle.state;
diff --git a/intern/ghost/intern/GHOST_XR_intern.h b/intern/ghost/intern/GHOST_XR_intern.h
index d2b93d484e9..33e433d4f6a 100644
--- a/intern/ghost/intern/GHOST_XR_intern.h
+++ b/intern/ghost/intern/GHOST_XR_intern.h
@@ -52,9 +52,9 @@ typedef struct wmXRContext {
std::vector<const char *> enabled_extensions;
} wmXRContext;
-void wm_xr_graphics_context_bind(wmXRContext &xr_context);
-void wm_xr_graphics_context_unbind(wmXRContext &xr_context);
+void GHOST_XR_graphics_context_bind(wmXRContext &xr_context);
+void GHOST_XR_graphics_context_unbind(wmXRContext &xr_context);
-void wm_xr_session_state_change(OpenXRData *oxr, const XrEventDataSessionStateChanged &lifecycle);
+void GHOST_XR_session_state_change(OpenXRData *oxr, const XrEventDataSessionStateChanged &lifecycle);
#endif /* __GHOST_XR_INTERN_H__ */
diff --git a/release/scripts/addo
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list