Enable depth test on stencil clear path

src/video_core/engines/maxwell_dma.cpp

@@ -109,11 +109,10 @@ void MaxwellDMA::Launch() {
         const bool is_const_a_dst = regs.remap_const.dst_x == RemapConst::Swizzle::CONST_A;
         if (regs.launch_dma.remap_enable != 0 && is_const_a_dst) {
             ASSERT(regs.remap_const.component_size_minus_one == 3);
-            accelerate.BufferClear(regs.offset_out, regs.line_length_in,
-                                   regs.remap_const.remap_consta_value);
+            accelerate.BufferClear(regs.offset_out, regs.line_length_in, regs.remap_consta_value);
             read_buffer.resize_destructive(regs.line_length_in * sizeof(u32));
             std::span<u32> span(reinterpret_cast<u32*>(read_buffer.data()), regs.line_length_in);
-            std::ranges::fill(span, regs.remap_const.remap_consta_value);
+            std::ranges::fill(span, regs.remap_consta_value);
             memory_manager.WriteBlockUnsafe(regs.offset_out,
                                             reinterpret_cast<u8*>(read_buffer.data()),
                                             regs.line_length_in * sizeof(u32));

src/video_core/engines/maxwell_dma.h

@@ -214,15 +214,14 @@ public:
             NO_WRITE = 6,
         };
 
-        u32 remap_consta_value;
-        u32 remap_constb_value;
+        PackedGPUVAddr address;
 
         union {
-            BitField<0, 12, u32> dst_components_raw;
             BitField<0, 3, Swizzle> dst_x;
             BitField<4, 3, Swizzle> dst_y;
             BitField<8, 3, Swizzle> dst_z;
             BitField<12, 3, Swizzle> dst_w;
+            BitField<0, 12, u32> dst_components_raw;
             BitField<16, 2, u32> component_size_minus_one;
             BitField<20, 2, u32> num_src_components_minus_one;
             BitField<24, 2, u32> num_dst_components_minus_one;
@@ -275,57 +274,55 @@ private:
     struct Regs {
         union {
             struct {
-                INSERT_PADDING_BYTES_NOINIT(0x100);
+                u32 reserved[0x40];
                 u32 nop;
-                INSERT_PADDING_BYTES_NOINIT(0x3C);
+                u32 reserved01[0xf];
                 u32 pm_trigger;
-                INSERT_PADDING_BYTES_NOINIT(0xFC);
+                u32 reserved02[0x3f];
                 Semaphore semaphore;
-                INSERT_PADDING_BYTES_NOINIT(0x8);
+                u32 reserved03[0x2];
                 RenderEnable render_enable;
                 PhysMode src_phys_mode;
                 PhysMode dst_phys_mode;
-                INSERT_PADDING_BYTES_NOINIT(0x98);
+                u32 reserved04[0x26];
                 LaunchDMA launch_dma;
-                INSERT_PADDING_BYTES_NOINIT(0xFC);
+                u32 reserved05[0x3f];
                 PackedGPUVAddr offset_in;
                 PackedGPUVAddr offset_out;
                 s32 pitch_in;
                 s32 pitch_out;
                 u32 line_length_in;
                 u32 line_count;
-                INSERT_PADDING_BYTES_NOINIT(0x2E0);
+                u32 reserved06[0xb6];
+                u32 remap_consta_value;
+                u32 remap_constb_value;
                 RemapConst remap_const;
                 DMA::Parameters dst_params;
-                INSERT_PADDING_BYTES_NOINIT(0x4);
+                u32 reserved07[0x1];
                 DMA::Parameters src_params;
-                INSERT_PADDING_BYTES_NOINIT(0x9D4);
+                u32 reserved08[0x275];
                 u32 pm_trigger_end;
-                INSERT_PADDING_BYTES_NOINIT(0xEE8);
+                u32 reserved09[0x3ba];
             };
             std::array<u32, NUM_REGS> reg_array;
         };
     } regs{};
-    static_assert(sizeof(Regs) == NUM_REGS * 4);
 
 #define ASSERT_REG_POSITION(field_name, position)                                                  \
-    static_assert(offsetof(MaxwellDMA::Regs, field_name) == position,                              \
+    static_assert(offsetof(MaxwellDMA::Regs, field_name) == position * 4,                          \
                   "Field " #field_name " has invalid position")
 
-    ASSERT_REG_POSITION(semaphore, 0x240);
-    ASSERT_REG_POSITION(render_enable, 0x254);
-    ASSERT_REG_POSITION(src_phys_mode, 0x260);
-    ASSERT_REG_POSITION(launch_dma, 0x300);
-    ASSERT_REG_POSITION(offset_in, 0x400);
-    ASSERT_REG_POSITION(offset_out, 0x408);
-    ASSERT_REG_POSITION(pitch_in, 0x410);
-    ASSERT_REG_POSITION(pitch_out, 0x414);
-    ASSERT_REG_POSITION(line_length_in, 0x418);
-    ASSERT_REG_POSITION(line_count, 0x41C);
-    ASSERT_REG_POSITION(remap_const, 0x700);
-    ASSERT_REG_POSITION(dst_params, 0x70C);
-    ASSERT_REG_POSITION(src_params, 0x728);
-    ASSERT_REG_POSITION(pm_trigger_end, 0x1114);
+    ASSERT_REG_POSITION(launch_dma, 0xC0);
+    ASSERT_REG_POSITION(offset_in, 0x100);
+    ASSERT_REG_POSITION(offset_out, 0x102);
+    ASSERT_REG_POSITION(pitch_in, 0x104);
+    ASSERT_REG_POSITION(pitch_out, 0x105);
+    ASSERT_REG_POSITION(line_length_in, 0x106);
+    ASSERT_REG_POSITION(line_count, 0x107);
+    ASSERT_REG_POSITION(remap_const, 0x1C0);
+    ASSERT_REG_POSITION(dst_params, 0x1C3);
+    ASSERT_REG_POSITION(src_params, 0x1CA);
+
 #undef ASSERT_REG_POSITION
 };
 

src/video_core/renderer_vulkan/blit_image.cpp

@@ -609,6 +609,8 @@ void BlitImageHelper::ClearDepthStencil(const Framebuffer* dst_framebuffer, bool
     const VkPipelineLayout layout = *clear_color_pipeline_layout;
     scheduler.RequestRenderpass(dst_framebuffer);
     scheduler.Record([pipeline, layout, clear_depth, dst_region](vk::CommandBuffer cmdbuf) {
+        constexpr std::array blend_constants{0.0f, 0.0f, 0.0f, 0.0f};
+        cmdbuf.SetBlendConstants(blend_constants.data());
         cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
         BindBlitState(cmdbuf, dst_region);
         cmdbuf.PushConstants(layout, VK_SHADER_STAGE_FRAGMENT_BIT, clear_depth);
@@ -865,7 +867,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceClearStencilPipeline(
         .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,
         .pNext = nullptr,
         .flags = 0,
-        .depthTestEnable = VK_FALSE,
+        .depthTestEnable = key.depth_clear,
         .depthWriteEnable = key.depth_clear,
         .depthCompareOp = VK_COMPARE_OP_ALWAYS,
         .depthBoundsTestEnable = VK_FALSE,

src/video_core/renderer_vulkan/vk_rasterizer.cpp

@@ -429,7 +429,8 @@ void RasterizerVulkan::Clear(u32 layer_count) {
         return;
     }
 
-    if (use_stencil && regs.stencil_front_mask != 0xFF && regs.stencil_front_mask != 0) {
+    if (use_stencil && framebuffer->HasAspectStencilBit() && regs.stencil_front_mask != 0xFF &&
+        regs.stencil_front_mask != 0) {
         Region2D dst_region = {
             Offset2D{.x = clear_rect.rect.offset.x, .y = clear_rect.rect.offset.y},
             Offset2D{.x = clear_rect.rect.offset.x + static_cast<s32>(clear_rect.rect.extent.width),