[Bf-blender-cvs] [75163f2a7dd] soc-2019-openxr: Add XR_ prefix like now in master

Julian Eisel noreply at git.blender.org
Thu Mar 5 12:46:57 CET 2020


Commit: 75163f2a7dd627baa14146a875adab9d800ddd64
Author: Julian Eisel
Date:   Thu Mar 5 12:20:08 2020 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rB75163f2a7dd627baa14146a875adab9d800ddd64

Add XR_ prefix like now in master

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

M	intern/ghost/CMakeLists.txt
M	intern/ghost/GHOST_C-api.h
M	intern/ghost/GHOST_Types.h
M	intern/ghost/intern/GHOST_C-api.cpp

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

diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 48a2a99fd0d..8bd46cb4f64 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -357,7 +357,7 @@ elseif(WIN32)
 
 endif()
 
-if(WITH_OPENXR)
+if(WITH_XR_OPENXR)
   list(APPEND SRC
     intern/GHOST_Xr.cpp
     intern/GHOST_XrContext.cpp
@@ -373,7 +373,7 @@ if(WITH_OPENXR)
     intern/GHOST_XrSession.h
   )
   list(APPEND INC_SYS
-    ${OPENXR_SDK_INCLUDE_DIR}
+    ${XR_OPENXR_SDK_INCLUDE_DIR}
   )
 
   set(XR_PLATFORM_DEFINES -DXR_USE_GRAPHICS_API_OPENGL)
@@ -394,7 +394,7 @@ if(WITH_OPENXR)
     )
   endif()
 
-  add_definitions(-DWITH_OPENXR ${XR_PLATFORM_DEFINES})
+  add_definitions(-DWITH_XR_OPENXR ${XR_PLATFORM_DEFINES})
 
   unset(XR_PLATFORM_DEFINES)
 endif()
diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h
index 26fded45ac3..cac31c5be1d 100644
--- a/intern/ghost/GHOST_C-api.h
+++ b/intern/ghost/GHOST_C-api.h
@@ -991,7 +991,7 @@ extern void GHOST_BeginIME(GHOST_WindowHandle windowhandle,
  */
 extern void GHOST_EndIME(GHOST_WindowHandle windowhandle);
 
-#ifdef WITH_OPENXR
+#ifdef WITH_XR_OPENXR
 
 /* XR-context */
 
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h
index bfd1205c6f2..cb4e9d2f0ba 100644
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@ -593,7 +593,7 @@ struct GHOST_TimerTaskHandle__;
 typedef void (*GHOST_TimerProcPtr)(struct GHOST_TimerTaskHandle__ *task, GHOST_TUns64 time);
 #endif
 
-#ifdef WITH_OPENXR
+#ifdef WITH_XR_OPENXR
 
 /**
  * The XR view (i.e. the OpenXR runtime) may require a different graphics library than OpenGL. An
diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp
index 31855245d2a..7caf5392ab3 100644
--- a/intern/ghost/intern/GHOST_C-api.cpp
+++ b/intern/ghost/intern/GHOST_C-api.cpp
@@ -30,7 +30,7 @@
 #include "GHOST_ISystem.h"
 #include "GHOST_IEvent.h"
 #include "GHOST_IEventConsumer.h"
-#ifdef WITH_OPENXR
+#ifdef WITH_XR_OPENXR
 #  include "GHOST_IXrContext.h"
 #endif
 #include "intern/GHOST_CallbackEventConsumer.h"
@@ -919,7 +919,7 @@ void GHOST_EndIME(GHOST_WindowHandle windowhandle)
 
 #endif /* WITH_INPUT_IME */
 
-#ifdef WITH_OPENXR
+#ifdef WITH_XR_OPENXR
 
 #  define GHOST_XR_CAPI_CALL(call, ctx) \
     try { \



More information about the Bf-blender-cvs mailing list