fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa/st: relax shader_has_one_variant checks for GLES2
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
GLES2/3 doesn't expose alpha test, user clip planes, or two-sided color.
These lowers therefore shouldn't disable the one-variant fast path for GLES2/3 contexts.

Keep the lowering itself unchanged and only relax the shader_has_one_variant checks.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40905>
This commit is contained in:
Lishin 2026-04-12 08:54:47 +01:00 • committed by Marge Bot
parent 62efee1860
commit 81feb2e7f1
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mesa/state_tracker/st_context.c
View file

@ -696,33 +696,38 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
ctx->Const.TESPositionAlwaysPrecise = options->vs_position_always_precise;
/* GLES 2/3 doesn't expose alpha test, user clip planes, or two-sided
* color, so those lowers shouldn't disable the one-variant fast path.
*/
const bool is_gles2 = _mesa_is_gles2(ctx);
/* Set which shader types can be compiled at link time. */
st->shader_has_one_variant[MESA_SHADER_VERTEX] =
st->has_shareable_shaders &&
!st->clamp_vert_color_in_shader &&
!st->lower_point_size &&
!st->lower_ucp;
(is_gles2 || !st->lower_ucp);
st->shader_has_one_variant[MESA_SHADER_FRAGMENT] =
st->has_shareable_shaders &&
!st->lower_flatshade &&
!st->lower_alpha_test &&
(is_gles2 || !st->lower_alpha_test) &&
!st->clamp_frag_color_in_shader &&
!st->force_persample_in_shader &&
!st->lower_two_sided_color;
(is_gles2 || !st->lower_two_sided_color);
st->shader_has_one_variant[MESA_SHADER_TESS_CTRL] = st->has_shareable_shaders;
st->shader_has_one_variant[MESA_SHADER_TESS_EVAL] =
st->has_shareable_shaders &&
!st->clamp_vert_color_in_shader &&
!st->lower_point_size &&
!st->lower_ucp;
(is_gles2 || !st->lower_ucp);
st->shader_has_one_variant[MESA_SHADER_GEOMETRY] =
st->has_shareable_shaders &&
!st->clamp_vert_color_in_shader &&
!st->lower_point_size &&
!st->lower_ucp;
(is_gles2 || !st->lower_ucp);
st->shader_has_one_variant[MESA_SHADER_COMPUTE] = st->has_shareable_shaders;
if (!st->pipe->set_context_param || !util_thread_scheduler_enabled())