Mesa (staging/22.0): zink: fix max geometry input component advertising

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Apr  4 17:00:26 2022 -0400

zink: fix max geometry input component advertising

forgot to divide by 4 somehow

cc: mesa-stable

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

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 34db59e957a..ce2f5fdd03e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5468,7 +5468,7 @@
         "description": "zink: fix max geometry input component advertising",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 5,
+        "resolution": 1,
         "because_sha": null
     },
     {
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index ee2034d23ab..53827772f22 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -857,7 +857,7 @@ zink_get_shader_param(struct pipe_screen *pscreen,
          max = screen->info.props.limits.maxTessellationEvaluationInputComponents / 4;
          break;
       case PIPE_SHADER_GEOMETRY:
-         max = screen->info.props.limits.maxGeometryInputComponents;
+         max = screen->info.props.limits.maxGeometryInputComponents / 4;
          break;
       case PIPE_SHADER_FRAGMENT:
          /* intel drivers report fewer components, but it's a value that's compatible