Mesa (staging/20.0): turnip: fix srgb MRT

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: 8334c60cba686a721959b6c970d2f357f8166391
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8334c60cba686a721959b6c970d2f357f8166391

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Thu Feb 27 10:22:02 2020 -0500

turnip: fix srgb MRT

Register packing macros makes this only set the first bit. Set to whole
dword to fix srgb for color attachments >0.

Fixes: 59f29fc8 ("turnip: Convert the rest of tu_cmd_buffer.c over to the new pack macros.")

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3979>
(cherry picked from commit 6420406f197cc4f1170c340e839701aeb253fdf0)

---

 .pick_status.json                    | 2 +-
 src/freedreno/vulkan/tu_cmd_buffer.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index dbb9db6dc30..aec87ae34ae 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -193,7 +193,7 @@
         "description": "turnip: fix srgb MRT",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "59f29fc845ce6425959e8db9b707363b1e273445"
     },
diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c
index 8135a02fe00..bb9d3baafb8 100644
--- a/src/freedreno/vulkan/tu_cmd_buffer.c
+++ b/src/freedreno/vulkan/tu_cmd_buffer.c
@@ -459,10 +459,10 @@ tu6_emit_mrt(struct tu_cmd_buffer *cmd,
    }
 
    tu_cs_emit_regs(cs,
-                   A6XX_RB_SRGB_CNTL(srgb_cntl));
+                   A6XX_RB_SRGB_CNTL(.dword = srgb_cntl));
 
    tu_cs_emit_regs(cs,
-                   A6XX_SP_SRGB_CNTL(srgb_cntl));
+                   A6XX_SP_SRGB_CNTL(.dword = srgb_cntl));
 
    tu_cs_emit_regs(cs,
                    A6XX_RB_RENDER_COMPONENTS(