Merge pull request #111032 from Joonnas/bugfix-stencil-issue-d3d12

Repiteo · Repiteo · commit 31b25d5971bb · 2025-09-30T11:19:20.000-05:00
Fix d3d12 stencil buffer not clearing
diff --git a/drivers/d3d12/rendering_device_driver_d3d12.cpp b/drivers/d3d12/rendering_device_driver_d3d12.cpp
@@ -4619,9 +4619,12 @@ void RenderingDeviceDriverD3D12::command_begin_render_pass(CommandBufferID p_cmd
 				tex_info->pending_clear.remove_from_list();
 			}
 		} else if ((tex_info->desc.Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)) {
-			if (pass_info->attachments[i].stencil_load_op == ATTACHMENT_LOAD_OP_CLEAR) {
+			if (pass_info->attachments[i].load_op == ATTACHMENT_LOAD_OP_CLEAR) {
 				clear.aspect.set_flag(TEXTURE_ASPECT_DEPTH_BIT);
 			}
+			if (pass_info->attachments[i].stencil_load_op == ATTACHMENT_LOAD_OP_CLEAR) {
+				clear.aspect.set_flag(TEXTURE_ASPECT_STENCIL_BIT);
+			}
 		}
 		if (!clear.aspect.is_empty()) {
 			clear.value = p_attachment_clears[i];

Original file line number	Diff line number	Diff line change
`@@ -4619,9 +4619,12 @@ void RenderingDeviceDriverD3D12::command_begin_render_pass(CommandBufferID p_cmd`
`4619`	`4619`	`tex_info->pending_clear.remove_from_list();`
`4620`	`4620`	`}`
`4621`	`4621`	`} else if ((tex_info->desc.Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)) {`
`4622`		`- if (pass_info->attachments[i].stencil_load_op == ATTACHMENT_LOAD_OP_CLEAR) {`
	`4622`	`+ if (pass_info->attachments[i].load_op == ATTACHMENT_LOAD_OP_CLEAR) {`
`4623`	`4623`	`clear.aspect.set_flag(TEXTURE_ASPECT_DEPTH_BIT);`
`4624`	`4624`	`}`
	`4625`	`+ if (pass_info->attachments[i].stencil_load_op == ATTACHMENT_LOAD_OP_CLEAR) {`
	`4626`	`+ clear.aspect.set_flag(TEXTURE_ASPECT_STENCIL_BIT);`
	`4627`	`+ }`
`4625`	`4628`	`}`
`4626`	`4629`	`if (!clear.aspect.is_empty()) {`
`4627`	`4630`	`clear.value = p_attachment_clears[i];`