Disable OpenXR sample on UWP

RavEngine · Oct 16, 2023 · 4268a3d · 4268a3d
1 parent e2caa9e
commit 4268a3d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/01-HelloTriangle/hellotriangle.cpp b/01-HelloTriangle/hellotriangle.cpp
@@ -191,13 +191,6 @@ struct HelloWorld : public AppBase {
             .inputAssembly = {
                 .topology = RGL::PrimitiveTopology::TriangleList,
             },
-            .viewport = {
-                .width = (float)width,
-                .height = (float)height
-            },
-            .scissor = {
-                .extent = {width, height}
-            },
             .rasterizerConfig = {
                 .windingOrder = RGL::WindingOrder::Counterclockwise,
             },

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -313,7 +313,7 @@ add_sample(01-HelloTriangle)
 add_sample(02-Cubes)
 add_sample(03-Imgui)
 add_sample(04-Deferred)
-if (CMAKE_SYSTEM_NAME MATCHES "Windows" OR CMAKE_SYSTEM_NAME MATCHES "WindowsStore")				# OpenXR only on windows fornow
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")				# OpenXR only on windows fornow
 	add_sample(05-XR)
 	target_link_libraries(05-XR
 	PUBLIC

diff --git a/deps/RGL b/deps/RGL
+1 −1		deps/ShaderTranspiler
+2 −0		include/RGL/Swapchain.hpp
+4 −0		src/D3D12Swapchain.cpp
+3 −1		src/D3D12Swapchain.hpp
+22 −6		src/VkSwapchain.cpp
+3 −0		src/VkSwapchain.hpp