Mesa (staging/22.0): radv: fix CmdSetColorWriteEnableEXT(attachmentCount==MAX_RTS)

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: c17f9df05e14862dd71990a67a283437e81f59a1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c17f9df05e14862dd71990a67a283437e81f59a1

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Tue Mar 22 15:49:21 2022 -0400

radv: fix CmdSetColorWriteEnableEXT(attachmentCount==MAX_RTS)

cc: mesa-stable

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15508>
(cherry picked from commit e23f88131110b7b647a037a76dbd77982c71e79f)

---

 .pick_status.json                | 2 +-
 src/amd/vulkan/radv_cmd_buffer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 057fc515f19..71753ded492 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -556,7 +556,7 @@
         "description": "radv: fix CmdSetColorWriteEnableEXT(attachmentCount==MAX_RTS)",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": null
     },
     {
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index eeb2fa41cde..a28de2d1d96 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -5502,7 +5502,7 @@ radv_CmdSetColorWriteEnableEXT(VkCommandBuffer commandBuffer, uint32_t attachmen
    struct radv_cmd_state *state = &cmd_buffer->state;
    uint32_t color_write_enable = 0;
 
-   assert(attachmentCount < MAX_RTS);
+   assert(attachmentCount <= MAX_RTS);
 
    for (uint32_t i = 0; i < attachmentCount; i++) {
       color_write_enable |= pColorWriteEnables[i] ? (0xfu << (i * 4)) : 0;