fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 14:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir: Fix builder usage in lower_mediump_vars()

Browse source 
In our handling of load_deref, we were calling builder helpers to create
conversions and then adjusting the destination bit size of the load.  We
should adjust the bit size first because the builder sometimes looks at
the bit sizes of SSA values passed in as arguments.

Even though it's not strictly necessary, adjust the store_deref case as
well to make it fully symmetric with the load_deref case.

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20067>
This commit is contained in:
Jason Ekstrand 2022-11-29 14:26:44 -06:00 • committed by Marge Bot
parent 976405907e
commit 8a406fe055
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/compiler/nir/nir_lower_mediump.c
View file

@ -456,9 +456,13 @@ nir_lower_mediump_vars_impl(nir_function_impl *impl, nir_variable_mode modes,
break;
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
nir_ssa_def *replace = NULL;
if (glsl_get_bit_size(deref->type) != 16)
break;
intrin->dest.ssa.bit_size = 16;
b.cursor = nir_after_instr(&intrin->instr);
nir_ssa_def *replace = NULL;
switch (glsl_get_base_type(deref->type)) {
case GLSL_TYPE_FLOAT16:
replace = nir_f2f32(&b, &intrin->dest.ssa);
@ -470,12 +474,9 @@ nir_lower_mediump_vars_impl(nir_function_impl *impl, nir_variable_mode modes,
replace = nir_u2u32(&b, &intrin->dest.ssa);
break;
default:
break;
unreachable("Invalid 16-bit type");
}
if (!replace)
break;
intrin->dest.ssa.bit_size = 16;
nir_ssa_def_rewrite_uses_after(&intrin->dest.ssa,
replace,
replace->parent_instr);
@ -488,8 +489,11 @@ nir_lower_mediump_vars_impl(nir_function_impl *impl, nir_variable_mode modes,
if (data->bit_size != 32)
break;
b.cursor = nir_before_instr(&intrin->instr);
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
if (glsl_get_bit_size(deref->type) != 16)
break;
b.cursor = nir_before_instr(&intrin->instr);
nir_ssa_def *replace = NULL;
switch (glsl_get_base_type(deref->type)) {
case GLSL_TYPE_FLOAT16:
@ -500,10 +504,8 @@ nir_lower_mediump_vars_impl(nir_function_impl *impl, nir_variable_mode modes,
replace = nir_i2imp(&b, data);
break;
default:
break;
unreachable("Invalid 16-bit type");
}
if (!replace)
break;
nir_instr_rewrite_src(&intrin->instr, &intrin->src[1],
nir_src_for_ssa(replace));