Mesa (staging/22.0): zink: store the correct number of components for xfb packing outputs

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Feb 16 15:15:35 2022 -0500

zink: store the correct number of components for xfb packing outputs

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15224>
(cherry picked from commit 432700fc61a33e0c040d47d9b7bd8cfe970d35cc)

---

 .pick_status.json                        | 2 +-
 src/gallium/drivers/zink/zink_compiler.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 0a68b1b0169..4f5bbdd33ee 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1750,7 +1750,7 @@
         "description": "zink: store the correct number of components for xfb packing outputs",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index 3134a19d251..5dc008867aa 100644
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -627,7 +627,7 @@ update_so_info(struct zink_shader *zs, const struct pipe_stream_output_info *so_
          } else {
             /* otherwise store some metadata for later */
             packed |= BITFIELD64_BIT(slot);
-            packed_components[slot]++;
+            packed_components[slot] += output->num_components;
             packed_streams[slot] |= BITFIELD_BIT(output->stream);
             packed_buffers[slot] |= BITFIELD_BIT(output->output_buffer);
             for (unsigned j = 0; j < output->num_components; j++)