Make use of STORE_OP_NONE when appropriate.

Themaister · Mar 26, 2024 · 6540e09 · 6540e09
1 parent ac540cf
commit 6540e09
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/renderer/render_graph.cpp b/renderer/render_graph.cpp
@@ -1214,7 +1214,7 @@ void RenderGraph::build_render_pass_info()
 					if (preserve_depth)
 					{
 						// Have to store here, or the attachment becomes undefined in future passes.
-						rp.op_flags |= Vulkan::RENDER_PASS_OP_STORE_DEPTH_STENCIL_BIT;
+						rp.op_flags |= Vulkan::RENDER_PASS_OP_PRESERVE_DEPTH_STENCIL_BIT;
 					}
 				}
 

diff --git a/vulkan/render_pass.cpp b/vulkan/render_pass.cpp
@@ -177,7 +177,17 @@ RenderPass::RenderPass(Hash hash, Device *device_, const RenderPassInfo &info)
 		ds_load_op = VK_ATTACHMENT_LOAD_OP_LOAD;
 
 	if (info.op_flags & RENDER_PASS_OP_STORE_DEPTH_STENCIL_BIT)
+	{
 		ds_store_op = VK_ATTACHMENT_STORE_OP_STORE;
+	}
+	else if (info.op_flags & RENDER_PASS_OP_PRESERVE_DEPTH_STENCIL_BIT)
+	{
+		ds_store_op = device->get_device_features().device_api_core_version >= VK_API_VERSION_1_3 ?
+		              VK_ATTACHMENT_STORE_OP_NONE : VK_ATTACHMENT_STORE_OP_STORE;
+
+		if (ds_load_op != VK_ATTACHMENT_LOAD_OP_LOAD)
+			ds_store_op = VK_ATTACHMENT_STORE_OP_STORE;
+	}
 
 	bool ds_read_only = (info.op_flags & RENDER_PASS_OP_DEPTH_STENCIL_READ_ONLY_BIT) != 0;
 	VkImageLayout depth_stencil_layout = VK_IMAGE_LAYOUT_UNDEFINED;

diff --git a/vulkan/render_pass.hpp b/vulkan/render_pass.hpp
@@ -40,7 +40,8 @@ enum RenderPassOp
 	RENDER_PASS_OP_STORE_DEPTH_STENCIL_BIT = 1 << 2,
 	RENDER_PASS_OP_DEPTH_STENCIL_READ_ONLY_BIT = 1 << 3,
 	RENDER_PASS_OP_ENABLE_TRANSIENT_STORE_BIT = 1 << 4,
-	RENDER_PASS_OP_ENABLE_TRANSIENT_LOAD_BIT = 1 << 5
+	RENDER_PASS_OP_ENABLE_TRANSIENT_LOAD_BIT = 1 << 5,
+	RENDER_PASS_OP_PRESERVE_DEPTH_STENCIL_BIT = 1 << 6
 };
 using RenderPassOpFlags = uint32_t;