gallium/st: fix shader_has_one_variant
authorErik Faye-Lund <erik.faye-lund@collabora.com>
Tue, 16 Mar 2021 17:43:37 +0000 (18:43 +0100)
committerErik Faye-Lund <erik.faye-lund@collabora.com>
Thu, 18 Mar 2021 10:16:06 +0000 (11:16 +0100)
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 <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9631>

src/mesa/state_tracker/st_context.c

index 07dad53..0706980 100644 (file)
@@ -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;