mesa/st: Check deref modes in lower_builtin_instr

This is a bit more robust and generally a better pattern as it works
even in the presence of incomplete deref chains on non-uniform variable
modes.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16482>
This commit is contained in:
Jason Ekstrand
2022-05-12 14:07:30 -05:00
committed by Marge Bot
parent 627d58099c
commit 46a49df7b6
@@ -166,12 +166,12 @@ lower_builtin_instr(nir_builder *b, nir_instr *instr, UNUSED void *_data)
if (intrin->intrinsic != nir_intrinsic_load_deref)
return false;
nir_variable *var =
nir_deref_instr_get_variable(nir_src_as_deref(intrin->src[0]));
if (var->data.mode != nir_var_uniform)
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
if (!nir_deref_mode_is(deref, nir_var_uniform))
return false;
/* built-in's will always start with "gl_" */
nir_variable *var = nir_deref_instr_get_variable(deref);
if (strncmp(var->name, "gl_", 3) != 0)
return false;