Fix MacOS build.

bluesky013 · Apr 3, 2024 · 1b253f5 · 1b253f5
1 parent 83095a8
commit 1b253f5
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 19 deletions.
diff --git a/cmake/thirdparty/Findimgui.cmake b/cmake/thirdparty/Findimgui.cmake
@@ -8,11 +8,11 @@ set(${LIB_NAME}_INCLUDE_DIR ${${LIB_NAME}_PATH}/include)
 set(${LIB_NAME}_LIBS_DIR ${${LIB_NAME}_PATH}/lib)
 
 set(${LIB_NAME}_LIBRARY_DEBUG
-	${${LIB_NAME}_LIBS_DIR}/Debug/${CMAKE_STATIC_LIBRARY_PREFIX}Imgui${CMAKE_STATIC_LIBRARY_SUFFIX})
+	${${LIB_NAME}_LIBS_DIR}/Debug/${CMAKE_STATIC_LIBRARY_PREFIX}ImGui${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 set(${LIB_NAME}_LIBRARY_RELEASE
-	${${LIB_NAME}_LIBS_DIR}/Release/${CMAKE_STATIC_LIBRARY_PREFIX}Imgui${CMAKE_STATIC_LIBRARY_SUFFIX})
-	
+	${${LIB_NAME}_LIBS_DIR}/Release/${CMAKE_STATIC_LIBRARY_PREFIX}ImGui${CMAKE_STATIC_LIBRARY_SUFFIX})
+
 set(${LIB_NAME}_LIBRARY
     "$<$<CONFIG:release>:${${LIB_NAME}_LIBRARY_RELEASE}>"
     "$<$<CONFIG:debug>:${${LIB_NAME}_LIBRARY_DEBUG}>")

diff --git a/render/backend/vulkan/include/vulkan/Swapchain.h b/render/backend/vulkan/include/vulkan/Swapchain.h
@@ -106,7 +106,6 @@ namespace sky::vk {
         std::vector<ImagePtr> images;
         std::vector<rhi::ImageViewPtr> imageViews;
     };
-#endif
     using XRSwapChainPtr = std::shared_ptr<XRSwapChain>;
-
+#endif
 } // namespace sky::vk
diff --git a/render/backend/vulkan/platform/macos/SwapchainImpl.mm b/render/backend/vulkan/platform/macos/SwapchainImpl.mm
@@ -24,7 +24,7 @@
         createInfo.pView = view;
         createInfo.pNext = nullptr;
 
-        if (vkCreateMacOSSurfaceMVK(device.GetInstance(), &createInfo, nullptr, &surface) != VK_SUCCESS) {
+        if (vkCreateMacOSSurfaceMVK(device.GetInstanceId(), &createInfo, nullptr, &surface) != VK_SUCCESS) {
             return false;
         }
         return true;

diff --git a/render/core/include/render/rdg/RenderGraph.h b/render/core/include/render/rdg/RenderGraph.h
@@ -125,7 +125,9 @@ namespace sky::rdg {
         void ImportImage(const char *name, const rhi::ImagePtr &image, rhi::ImageViewType viewType, const rhi::AccessFlags &flags);
 
         void ImportSwapChain(const char *name, const rhi::SwapChainPtr &swapchain);
+#ifdef SKY_ENABLE_XR
         void ImportXRSwapChain(const char *name, const rhi::XRSwapChainPtr &swapchain);
+#endif
         void AddImageView(const char *name, const char *source, const GraphImageView &view);
 
         void AddBuffer(const char *name, const GraphBuffer &attachment);

diff --git a/render/core/include/render/rdg/RenderGraphTypes.h b/render/core/include/render/rdg/RenderGraphTypes.h
@@ -360,11 +360,14 @@ namespace sky::rdg {
         uint32_t imageIndex = 0;
     };
 
+
     struct GraphXRSwapChain {
         using Tag = ImportXRSwapChainTag;
 
+#ifdef SKY_ENABLE_XR
         rhi::XRSwapChainPtr swapchain;
         uint32_t imageIndex = 0;
+#endif
     };
 
     struct GraphImageView {

diff --git a/render/core/src/RHI.cpp b/render/core/src/RHI.cpp
@@ -15,7 +15,9 @@ namespace sky {
 
     void RHI::InitInstance(rhi::Instance::Descriptor desc)
     {
+#ifdef SKY_ENABLE_XR
         desc.xrInterface = xrInterface;
+#endif
         instance = rhi::Instance::Create(desc);
         api = desc.api;
     }
@@ -24,4 +26,4 @@ namespace sky {
     {
         device.reset(instance->CreateDevice(desc));
     }
-}
+}
diff --git a/render/core/src/RenderPipeline.cpp b/render/core/src/RenderPipeline.cpp
@@ -122,10 +122,11 @@ namespace sky {
             rhi::PresentInfo presentInfo = {};
             presentInfo.semaphores.emplace_back(rdgContext->RenderFinishSemaphore());
             for (auto &swc : rdg.presentPasses) {
+#ifdef SKY_ENABLE_XR
                 if (swc.xrSwapChain) {
                     continue;
                 }
-
+#endif
                 auto &res = rdg.resourceGraph.swapChains[Index(swc.imageID, rdg.resourceGraph)];
                 presentInfo.imageIndex = res.desc.imageIndex;
                 swc.swapChain->Present(*queue, presentInfo);

diff --git a/render/core/src/RenderWindow.cpp b/render/core/src/RenderWindow.cpp
@@ -42,17 +42,17 @@ namespace sky {
     {
 #ifdef SKY_ENABLE_XR
         return swapChain ? swapChain->GetExtent().width : xrSwapChain->GetExtent().width;
-#elif
-        return swapChain->GetExent().width;
+#else
+        return swapChain->GetExtent().width;
 #endif
     }
 
     uint32_t RenderWindow::GetHeight() const
     {
 #ifdef SKY_ENABLE_XR
         return swapChain ? swapChain->GetExtent().height : xrSwapChain->GetExtent().height;
-#elif
-        return swapChain->GetExent().height;
+#else
+        return swapChain->GetExtent().height;
 #endif
     }
-} // namespace sky
+} // namespace sky
diff --git a/render/core/src/Renderer.cpp b/render/core/src/Renderer.cpp
@@ -85,7 +85,7 @@ namespace sky {
         rw->Init(hWnd, width, height, vSync);
         return rw;
     }
-
+#ifdef SKY_ENABLE_XR
     RenderWindow *Renderer::CreateRenderWindowByXR()
     {
         auto *renderWindow = new RenderWindow();
@@ -95,7 +95,7 @@ namespace sky {
         windows.emplace_back(renderWindow, &Renderer::DestroyObj<RenderWindow>);
         return renderWindow;
     }
-
+#endif
     void Renderer::RemoveScene(sky::RenderScene *scene)
     {
         scenes.remove_if([scene](const auto &scn) {

diff --git a/render/core/src/rdg/AccessUtils.cpp b/render/core/src/rdg/AccessUtils.cpp
@@ -131,11 +131,13 @@ namespace sky::rdg {
                 range.range = 1;
                 range.layers = 1;
             },
+#ifdef SKY_ENABLE_XR
             [&](const ImportXRSwapChainTag &tag) {
                 const auto &res = resourceGraph.xrSwapChains[Index(resID, resourceGraph)];
                 range.range = 1;
                 range.layers = res.desc.swapchain->GetArrayLayers();
             },
+#endif
             [&](const BufferTag &tag) {
                 const auto &buffer = resourceGraph.buffers[Index(resID, resourceGraph)];
                 range.range = buffer.desc.size;

diff --git a/render/core/src/rdg/RenderGraph.cpp b/render/core/src/rdg/RenderGraph.cpp
@@ -53,12 +53,12 @@ namespace sky::rdg {
     {
         add_edge(0, AddVertex(name, GraphSwapChain{swapchain}, *this), graph);
     }
-
+#ifdef SKY_ENABLE_XR
     void ResourceGraph::ImportXRSwapChain(const char *name, const rhi::XRSwapChainPtr &swapchain)
     {
         add_edge(0, AddVertex(name, GraphXRSwapChain{swapchain}, *this), graph);
     }
-
+#endif
     void ResourceGraph::AddImageView(const char *name, const char *source, const GraphImageView &view)
     {
         auto src = FindVertex(source, *this);
@@ -157,12 +157,14 @@ namespace sky::rdg {
                 add_edge(0, vtx, graph);
                 AddDependency(resID, vtx, DependencyInfo{PresentType::PRESENT, ResourceAccessBit::READ, {}});
             },
+#ifdef SKY_ENABLE_XR
             [&](const ImportXRSwapChainTag &tag) {
                 const auto &res = resourceGraph.xrSwapChains[Index(resID, resourceGraph)];
                 auto vtx = AddVertex(name, PresentPass(resID, res.desc.swapchain, &context->resources), *this);
                 add_edge(0, vtx, graph);
                 AddDependency(resID, vtx, DependencyInfo{PresentType::PRESENT, ResourceAccessBit::READ, {}});
             },
+#endif
             [&](const auto &) {}
         }, rdg::Tag(resID, resourceGraph));
     }

diff --git a/render/core/src/rdg/RenderGraphExecutor.cpp b/render/core/src/rdg/RenderGraphExecutor.cpp
@@ -21,10 +21,12 @@ namespace sky::rdg {
                 const auto &image = resourceGraph.swapChains[Index(resID, resourceGraph)];
                 res = image.desc.swapchain->GetImage(image.desc.imageIndex);
             },
+#ifdef SKY_ENABLE_XR
             [&](const ImportXRSwapChainTag &) {
                 const auto &image = resourceGraph.xrSwapChains[Index(resID, resourceGraph)];
                 res = image.desc.swapchain->GetImage(image.desc.imageIndex);
             },
+#endif
             [&](const auto &) {
             }
         }, Tag(resID, resourceGraph));
@@ -69,6 +71,7 @@ namespace sky::rdg {
                                                rhi::BarrierInfo{ barrier.srcFlags, barrier.dstFlags});
                     }
                 },
+#ifdef SKY_ENABLE_XR
                 [&](const ImportXRSwapChainTag &) {
                     auto &image = graph.resourceGraph.xrSwapChains[Index(resID, graph.resourceGraph)];
                     for (const auto &barrier : barriers) {
@@ -79,6 +82,7 @@ namespace sky::rdg {
                                                         rhi::BarrierInfo{ barrier.srcFlags, barrier.dstFlags});
                     }
                 },
+#endif
                 [&](const BufferTag &) {
                     auto &buffer = graph.resourceGraph.buffers[Index(resID, graph.resourceGraph)];
                     for (const auto &barrier : barriers) {

diff --git a/render/core/src/rdg/RenderResourceCompiler.cpp b/render/core/src/rdg/RenderResourceCompiler.cpp
@@ -190,13 +190,15 @@ namespace sky::rdg {
                     swc.res = swc.desc.swapchain->GetImageView(swc.desc.imageIndex);
                 }
             },
+#ifdef SKY_ENABLE_XR
             [&](const ImportXRSwapChainTag &) {
                 auto &swc = rdg.resourceGraph.xrSwapChains[Index(res, rdg.resourceGraph)];
                 if (!swc.res) {
                     swc.desc.imageIndex = swc.desc.swapchain->AcquireNextImage();
                     swc.res = swc.desc.swapchain->GetImageView(swc.desc.imageIndex);
                 }
             },
+#endif
             [&](const auto &) {}
         }, Tag(res, rdg.resourceGraph));
     }
@@ -241,11 +243,13 @@ namespace sky::rdg {
                     att.format = swc.desc.swapchain->GetFormat();
                     fbDesc.views[i] = swc.res;
                 },
+#ifdef SKY_ENABLE_XR
                 [&](const ImportXRSwapChainTag &) {
                     auto &swc = rdg.resourceGraph.xrSwapChains[Index(attachment, rdg.resourceGraph)];
                     att.format = swc.desc.swapchain->GetFormat();
                     fbDesc.views[i] = swc.res;
                 },
+#endif
                 [&](const ImageViewTag &) {
                     auto &source = rdg.resourceGraph.images[Index(Source(attachment, rdg.resourceGraph), rdg.resourceGraph)];
                     att.format = source.desc.format;

diff --git a/sample/RDSceneProject/native/src/scenes/SampleMesh.cpp b/sample/RDSceneProject/native/src/scenes/SampleMesh.cpp
@@ -131,7 +131,9 @@ namespace sky {
                 renderWidth  = ext.width * 2;
                 renderHeight = ext.height * 2;
                 rg.ImportSwapChain("SwapChain", swapChain);
-            } else {
+            }
+#ifdef SKY_ENABLE_XR
+            else {
                 auto xrSwapChain = output->GetXRSwaChain();
                 const auto &ext = xrSwapChain->GetExtent();
                 outWidth = ext.width;
@@ -148,6 +150,7 @@ namespace sky {
                 }
                 rg.ImportXRSwapChain("SwapChain", xrSwapChain);
             }
+#endif
 
 
             ShaderPassInfo passInfo = {};
@@ -295,4 +298,4 @@ namespace sky {
     {
         camera->GetComponent<CameraComponent>()->SetAspect(width, height);
     }
-} // namespace sky
+} // namespace sky