[RHI]Fix render pass object state mismatch with read-only depth stenc…

…il attachment. [Studio]Fix program crash.
JX-Master · Oct 24, 2024 · 4cb3a05 · 4cb3a05
1 parent 1ae6e7e
commit 4cb3a05
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Modules/Luna/RHI/Source/Vulkan/RenderPassPool.cpp b/Modules/Luna/RHI/Source/Vulkan/RenderPassPool.cpp
@@ -106,7 +106,14 @@ namespace Luna
                         dst.finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
                     }
                     depth_stencil_attachment_ref.attachment = attachment_index;
-                    depth_stencil_attachment_ref.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+                    if (key.depth_stencil_read_only)
+                    {
+                        depth_stencil_attachment_ref.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
+                    }
+                    else
+                    {
+                        depth_stencil_attachment_ref.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+                    }
                     ++attachment_index;
                 }
                 VkSubpassDescription subpass{};

diff --git a/Programs/Studio/main.cpp b/Programs/Studio/main.cpp
@@ -69,7 +69,8 @@ namespace Luna
             module_asset(),
             module_obj_loader(),
             module_rg(),
-            module_job_system()}));
+            module_job_system(),
+            module_shader_compiler()}));
         auto r = init_modules();
         if (failed(r))
         {