Mesa (staging/22.0): turnip: fix assert for max xfb outputs

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed May 18 10:07:43 2022 -0400

turnip: fix assert for max xfb outputs

this is a counter, not an index, so use <=

cc: mesa-stable

Reviewed-by: Hyunjun Ko <zzoon at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16620>
(cherry picked from commit aa32b96c51ffea32e7be40b2a12a2c5bd8d307f0)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 5f3392ed96a..023513a1899 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -508,7 +508,7 @@
         "description": "turnip: fix assert for max xfb outputs",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": null
     },
     {
diff --git a/src/freedreno/vulkan/tu_shader.c b/src/freedreno/vulkan/tu_shader.c
index 82e94da573f..143525d63a3 100644
--- a/src/freedreno/vulkan/tu_shader.c
+++ b/src/freedreno/vulkan/tu_shader.c
@@ -680,7 +680,7 @@ tu_gather_xfb_info(nir_shader *nir, struct ir3_stream_output_info *info)
          output_map[var->data.location + i] = var->data.driver_location + i;
    }
 
-   assert(xfb->output_count < IR3_MAX_SO_OUTPUTS);
+   assert(xfb->output_count <= IR3_MAX_SO_OUTPUTS);
    info->num_outputs = xfb->output_count;
 
    for (int i = 0; i < IR3_MAX_SO_BUFFERS; i++) {