From 78de2de8f31e8eb94799679618caefe7010f26ed Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 16 Mar 2021 19:04:08 +0100 Subject: [PATCH] gallium/st: fix shader_has_one_variant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Part-of: --- 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 &&