fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 19:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/glsl_to_nir: disable st_nir_lower_builtin() when packing supported

Browse source 
There is no need to lower builtins when uniform packing is
supported by the driver. Lowering is only required by other drivers
because we prepack builtin uniforms.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3140
CC: <stable@lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5656>
This commit is contained in:
Timothy Arceri 2020-06-26 15:28:51 +10:00 • committed by Marge Bot
parent 4cca5137ae
commit 64a2500a69
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mesa/state_tracker/st_glsl_to_nir.cpp
View file

@ -455,10 +455,7 @@ st_glsl_to_nir_post_opts(struct st_context *st, struct gl_program *prog,
for (unsigned int i = 0; i < var->num_state_slots; i++) { for (unsigned int i = 0; i < var->num_state_slots; i++) {
unsigned comps; unsigned comps;
if (glsl_type_is_struct_or_ifc(type)) { if (glsl_type_is_struct_or_ifc(type)) {
/* Builtin struct require specical handling for now we just comps = _mesa_program_state_value_size(slots[i].tokens);
* make all members vec4. See st_nir_lower_builtin.
*/
comps = 4;
} else { } else {
comps = glsl_get_vector_elements(type); comps = glsl_get_vector_elements(type);
} }
@ -490,9 +487,11 @@ st_glsl_to_nir_post_opts(struct st_context *st, struct gl_program *prog,
st_set_prog_affected_state_flags(prog); st_set_prog_affected_state_flags(prog);
/* None of the builtins being lowered here can be produced by SPIR-V. See /* None of the builtins being lowered here can be produced by SPIR-V. See
* _mesa_builtin_uniform_desc. * _mesa_builtin_uniform_desc. Also drivers that support packed uniform
* storage don't need to lower builtins.
*/ */
if (!shader_program->data->spirv) if (!shader_program->data->spirv &&
!st->ctx->Const.PackedDriverUniformStorage)
NIR_PASS_V(nir, st_nir_lower_builtin); NIR_PASS_V(nir, st_nir_lower_builtin);
NIR_PASS_V(nir, gl_nir_lower_atomics, shader_program, true); NIR_PASS_V(nir, gl_nir_lower_atomics, shader_program, true);