From bdfe0e3ef430f756e482384779b75e0ed153396c Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 16 Mar 2021 18:43:37 +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: ad0037fcfe1 ("mesa/st: set lower_point_size for tes/gs during program update") Reviewed-by: Marek Olšák Part-of: --- src/mesa/state_tracker/st_context.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 07dad53ef70..07069808834 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -831,11 +831,14 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe, st->shader_has_one_variant[MESA_SHADER_TESS_EVAL] = st->has_shareable_shaders && !st->clamp_frag_depth_in_shader && - !st->clamp_vert_color_in_shader; + !st->clamp_vert_color_in_shader && + !st->lower_point_size; + st->shader_has_one_variant[MESA_SHADER_GEOMETRY] = st->has_shareable_shaders && !st->clamp_frag_depth_in_shader && !st->clamp_vert_color_in_shader && + !st->lower_point_size && !st->lower_ucp; st->shader_has_one_variant[MESA_SHADER_COMPUTE] = st->has_shareable_shaders;