Mesa (staging/21.3): zink: clamp PIPE_SHADER_CAP_MAX_INPUTS for xfb

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Nov  1 10:44:59 2021 -0400

zink: clamp PIPE_SHADER_CAP_MAX_INPUTS for xfb

vertex shader stages that can produce xfb must have
their input size clamped to the compiler define MAX_VARYING
to successfully be able to export an xfb output for each input

fixes KHR-GL46.geometry_shader.limits.max_input_components

cc: mesa-stable

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

---

 .pick_status.json                      | 2 +-
 src/gallium/drivers/zink/zink_screen.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 54c4181accd..7b8e2c1af78 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -256,7 +256,7 @@
         "description": "zink: clamp PIPE_SHADER_CAP_MAX_INPUTS for xfb",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index dac3edbee35..c13f7608d90 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -787,6 +787,14 @@ zink_get_shader_param(struct pipe_screen *pscreen,
       default:
          return 0; /* unsupported stage */
       }
+      switch (shader) {
+      case PIPE_SHADER_VERTEX:
+      case PIPE_SHADER_TESS_EVAL:
+      case PIPE_SHADER_GEOMETRY:
+         /* last vertex stage must support streamout, and this is capped in glsl compiler */
+         return MIN2(max, MAX_VARYING);
+      default: break;
+      }
       return MIN2(max, 64); // prevent overflowing struct shader_info::inputs_read
    }