Mesa (master): gallium/st: fix shader_has_one_variant

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 78de2de8f31e8eb94799679618caefe7010f26ed
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=78de2de8f31e8eb94799679618caefe7010f26ed

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>

---

 src/mesa/state_tracker/st_context.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 07069808834..5876a37e89d 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -832,7 +832,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 &&