Mesa (staging/21.0): gallium/st: fix shader_has_one_variant

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: 74af2631b9ec4fef99866e4f81d433c8b00c00a8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=74af2631b9ec4fef99866e4f81d433c8b00c00a8

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue Mar 16 19:04:08 2021 +0100

gallium/st: fix shader_has_one_variant

I think we need to care about this here as well, otherwise the variant
logic might be short-circuited.

Fixes: 7eb5fd98fd1 ("mesa/st: handle running nir lower passes for ucp and psiz in tess stage")
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9631>
(cherry picked from commit 78de2de8f31e8eb94799679618caefe7010f26ed)

---

 .pick_status.json                   | 2 +-
 src/mesa/state_tracker/st_context.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index d57209eb69d..761dffe48e2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -76,7 +76,7 @@
         "description": "gallium/st: fix shader_has_one_variant",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "7eb5fd98fd188c2765b80c278086e5a4382539a8"
     },
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 38d192bd3ec..d5b20e1955b 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -810,7 +810,8 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
          st->has_shareable_shaders &&
          !st->clamp_frag_depth_in_shader &&
          !st->clamp_vert_color_in_shader &&
-         !st->lower_point_size;
+         !st->lower_point_size &&
+         !st->lower_ucp;
 
    st->shader_has_one_variant[MESA_SHADER_GEOMETRY] =
          st->has_shareable_shaders &&