Mesa (master): turnip: fix GMEM resolve in CmdNextSubpass

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: eab73799d16ea142dcbcabb6d5bedf860b5c9af7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=eab73799d16ea142dcbcabb6d5bedf860b5c9af7

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Tue Apr 21 13:37:23 2020 -0400

turnip: fix GMEM resolve in CmdNextSubpass

The BLIT scissor must be set correctly for tu_store_gmem_attachment.

Fixes this deqp test:

dEQP-VK.pipeline.multisample_shader_builtin.sample_id.137_191_1.samples

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4666>

---

 src/freedreno/vulkan/tu_cmd_buffer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c
index 7df98b34e05..11269c2a98c 100644
--- a/src/freedreno/vulkan/tu_cmd_buffer.c
+++ b/src/freedreno/vulkan/tu_cmd_buffer.c
@@ -2344,13 +2344,15 @@ tu_CmdNextSubpass(VkCommandBuffer commandBuffer, VkSubpassContents contents)
    tu_cond_exec_start(cs, CP_COND_EXEC_0_RENDER_MODE_GMEM);
 
    if (subpass->resolve_attachments) {
+      tu6_emit_blit_scissor(cmd, cs, true);
+
       for (unsigned i = 0; i < subpass->color_count; i++) {
          uint32_t a = subpass->resolve_attachments[i].attachment;
          if (a == VK_ATTACHMENT_UNUSED)
             continue;
 
          tu_store_gmem_attachment(cmd, cs, a,
-                                    subpass->color_attachments[i].attachment);
+                                  subpass->color_attachments[i].attachment);
 
          if (pass->attachments[a].gmem_offset < 0)
             continue;