[Bf-blender-cvs] [4c11886c4ec] soc-2019-openxr: Corrections to previous commit

Julian Eisel noreply at git.blender.org
Thu May 30 14:57:20 CEST 2019


Commit: 4c11886c4ec1da3e5ff18e36ce1cb7956c3fed28
Author: Julian Eisel
Date:   Thu May 30 14:56:23 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rB4c11886c4ec1da3e5ff18e36ce1cb7956c3fed28

Corrections to previous commit

* Remove testing instance creation
* Rename function

===================================================================

M	source/blender/windowmanager/intern/wm.c
M	source/blender/windowmanager/intern/wm_init_exit.c
M	source/blender/windowmanager/intern/wm_xr.c
M	source/blender/windowmanager/wm.h

===================================================================

diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c
index 6e07ab057dc..049b9210385 100644
--- a/source/blender/windowmanager/intern/wm.c
+++ b/source/blender/windowmanager/intern/wm.c
@@ -292,7 +292,7 @@ void WM_check(bContext *C)
 
 #ifdef WITH_OPENXR
   if (wm->xr_context == NULL) {
-    wm->xr_context = wm_xr_context_init();
+    wm->xr_context = wm_xr_context_create();
   }
 #endif
 
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 400f9412f3e..f38aef98c4f 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -218,13 +218,6 @@ void WM_init(bContext *C, int argc, const char **argv)
   wm_operatortype_init();
   wm_operatortypes_register();
 
-#ifdef WITH_OPENXR
-  /* Just to test OpenXR loader linking */
-  XrInstance xr_instance;
-  XrInstanceCreateInfo xr_inst_createi = {0};
-  xrCreateInstance(&xr_inst_createi, &xr_instance);
-#endif
-
   WM_paneltype_init(); /* Lookup table only. */
   WM_menutype_init();
   WM_uilisttype_init();
diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c
index d3ed9a8b10e..e3e1becfa65 100644
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@ -50,7 +50,7 @@ typedef struct wmXRContext {
   } oxr;
 } wmXRContext;
 
-wmXRContext *wm_xr_context_init(void)
+wmXRContext *wm_xr_context_create(void)
 {
   XrInstanceCreateInfo create_info = {.type = XR_TYPE_INSTANCE_CREATE_INFO};
   XrInstance instance = {0};
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index b00cfdbefc1..450262e0c29 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -97,7 +97,7 @@ void wm_open_init_use_scripts(wmOperator *op, bool use_prefs);
 
 #ifdef WITH_OPENXR
 /* wm_xr.c */
-struct wmXRContext *wm_xr_context_init(void) ATTR_WARN_UNUSED_RESULT;
+struct wmXRContext *wm_xr_context_create(void) ATTR_WARN_UNUSED_RESULT;
 void wm_xr_context_destroy(struct wmXRContext *xr_context);
 #endif



More information about the Bf-blender-cvs mailing list