Merge pull request #127 from rbessems/resolve_issue_125

Resolve issue 125
KhronosGroup · Feb 28, 2024 · 493e7ca · 493e7ca
2 parents 7329577 + d1ab255
commit 493e7ca
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/build-host-windows.yml b/.github/workflows/build-host-windows.yml
@@ -8,7 +8,6 @@ on:
 
 jobs:
   build:
-    if: false
     name: Windows Build
     runs-on: ${{matrix.os}}
     strategy:

diff --git a/Chapter1/CMakeLists.txt b/Chapter1/CMakeLists.txt
@@ -158,6 +158,7 @@ else() # Windows / Linux
     # OpenGL
     include(../cmake/gfxwrapper.cmake)
     if(TARGET openxr-gfxwrapper)
+        target_include_directories(${PROJECT_NAME} PUBLIC ${openxr_SOURCE_DIR}/src/common)
         target_link_libraries(${PROJECT_NAME} openxr-gfxwrapper)
         target_compile_definitions(${PROJECT_NAME} PUBLIC XR_TUTORIAL_USE_OPENGL)
     endif()

diff --git a/Chapter2/CMakeLists.txt b/Chapter2/CMakeLists.txt
@@ -99,6 +99,7 @@ if (ANDROID) # Android
     # XR_DOCS_TAG_BEGIN_Gfxwrapper
     include(../cmake/gfxwrapper.cmake)
     if(TARGET openxr-gfxwrapper)
+        target_include_directories(${PROJECT_NAME} PUBLIC ${openxr_SOURCE_DIR}/src/common)
         target_link_libraries(${PROJECT_NAME} openxr-gfxwrapper)
         target_compile_definitions(${PROJECT_NAME} PUBLIC XR_TUTORIAL_USE_OPENGL_ES)
     endif()

diff --git a/Chapter3/CMakeLists.txt b/Chapter3/CMakeLists.txt
@@ -115,6 +115,7 @@ if (ANDROID) # Android
     # XR_DOCS_TAG_BEGIN_Gfxwrapper
     include(../cmake/gfxwrapper.cmake)
     if(TARGET openxr-gfxwrapper)
+        target_include_directories(${PROJECT_NAME} PUBLIC ${openxr_SOURCE_DIR}/src/common)
         target_link_libraries(${PROJECT_NAME} openxr-gfxwrapper)
         target_compile_definitions(${PROJECT_NAME} PUBLIC XR_TUTORIAL_USE_OPENGL_ES)
     endif()

diff --git a/Chapter4/CMakeLists.txt b/Chapter4/CMakeLists.txt
@@ -218,6 +218,7 @@ else() # Windows / Linux
     # OpenGL
     include(../cmake/gfxwrapper.cmake)
     if(TARGET openxr-gfxwrapper)
+        target_include_directories(${PROJECT_NAME} PUBLIC ${openxr_SOURCE_DIR}/src/common)
         target_link_libraries(${PROJECT_NAME} openxr-gfxwrapper)
         target_compile_definitions(${PROJECT_NAME} PUBLIC XR_TUTORIAL_USE_OPENGL)
     endif()

diff --git a/Chapter5/CMakeLists.txt b/Chapter5/CMakeLists.txt
@@ -115,6 +115,7 @@ if (ANDROID) # Android
     # XR_DOCS_TAG_BEGIN_Gfxwrapper
     include(../cmake/gfxwrapper.cmake)
     if(TARGET openxr-gfxwrapper)
+        target_include_directories(${PROJECT_NAME} PUBLIC ${openxr_SOURCE_DIR}/src/common)
         target_link_libraries(${PROJECT_NAME} openxr-gfxwrapper)
         target_compile_definitions(${PROJECT_NAME} PUBLIC XR_TUTORIAL_USE_OPENGL_ES)
     endif()

diff --git a/Chapter6_1_Multiview/Chapter6/CMakeLists.txt b/Chapter6_1_Multiview/Chapter6/CMakeLists.txt
@@ -128,6 +128,7 @@ if (ANDROID) # Android
     # XR_DOCS_TAG_BEGIN_Gfxwrapper
     include(../cmake/gfxwrapper.cmake)
     if(TARGET openxr-gfxwrapper)
+        target_include_directories(${PROJECT_NAME} PUBLIC ${openxr_SOURCE_DIR}/src/common)
         target_link_libraries(${PROJECT_NAME} openxr-gfxwrapper)
         target_compile_definitions(${PROJECT_NAME} PUBLIC XR_TUTORIAL_USE_OPENGL_ES)
     endif()

diff --git a/GraphicsAPI_Test/CMakeLists.txt b/GraphicsAPI_Test/CMakeLists.txt
@@ -72,7 +72,7 @@ if (Vulkan_FOUND)
 endif()
 
 # Fix redirection to a different project's build folder
-target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/../Chapter2/openxr/src/common)
+target_include_directories(${PROJECT_NAME} PUBLIC ${openxr_SOURCE_DIR}/src/common)
 target_link_libraries(${PROJECT_NAME} openxr-gfxwrapper)
 target_compile_definitions(${PROJECT_NAME} PUBLIC XR_TUTORIAL_USE_OPENGL)
 

diff --git a/GraphicsAPI_Test/main.cpp b/GraphicsAPI_Test/main.cpp
@@ -237,7 +237,9 @@ int main() {
     } else if (apiType == D3D12) {
         graphicsAPI = new GraphicsAPI_D3D12();
     } else if (apiType == VULKAN) {
+#ifdef XR_TUTORIAL_USE_VULKAN        
         graphicsAPI = new GraphicsAPI_Vulkan();
+#endif
     } else {
         return -1;
     }
@@ -255,7 +257,11 @@ int main() {
 
     // Swapchain
     const uint32_t swapchainCount = 3;
+#ifdef XR_TUTORIAL_USE_VULKAN    
     swapchainFormat = apiType == VULKAN ? VK_FORMAT_B8G8R8A8_UNORM : DXGI_FORMAT_B8G8R8A8_UNORM;
+#else
+    swapchainFormat = DXGI_FORMAT_B8G8R8A8_UNORM;
+#endif
     void *swapchain = graphicsAPI->CreateDesktopSwapchain({width, height, swapchainCount, window, swapchainFormat, false});
     void *swapchainImages[swapchainCount] = {nullptr, nullptr, nullptr};
     void *swapchainImageViews[swapchainCount] = {nullptr, nullptr, nullptr};