OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: fix lowering to scratch with boolean access

Browse Source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Fixes: 18ed82b084
   ('nir: Add a pass for selectively lowering variables to scratch space')

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5214>
This commit is contained in:
Rhys Perry
2020-05-26 18:08:17 +01:00
committed by Marge Bot
parent e369b8931c
commit 8e2009c448
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/compiler/nir/nir_lower_scratch.c
View File

@@ -57,24 +57,25 @@ lower_load_store(nir_builder *b,
load->num_components = intrin->num_components; load->num_components = intrin->num_components;
load->src[0] = nir_src_for_ssa(offset); load->src[0] = nir_src_for_ssa(offset);
nir_intrinsic_set_align(load, align, 0); nir_intrinsic_set_align(load, align, 0);
unsigned bit_size = intrin->dest.ssa.bit_size;
nir_ssa_dest_init(&load->instr, &load->dest, nir_ssa_dest_init(&load->instr, &load->dest,
intrin->dest.ssa.num_components, intrin->dest.ssa.num_components,
intrin->dest.ssa.bit_size, NULL); bit_size == 1 ? 32 : bit_size, NULL);
nir_builder_instr_insert(b, &load->instr); nir_builder_instr_insert(b, &load->instr);
nir_ssa_def *value = &load->dest.ssa; nir_ssa_def *value = &load->dest.ssa;
if (glsl_type_is_boolean(deref->type)) if (bit_size == 1)
value = nir_b2i32(b, value); value = nir_b2b1(b, value);
nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_ssa_def_rewrite_uses(&intrin->dest.ssa,
nir_src_for_ssa(&load->dest.ssa)); nir_src_for_ssa(value));
} else { } else {
assert(intrin->intrinsic == nir_intrinsic_store_deref); assert(intrin->intrinsic == nir_intrinsic_store_deref);
assert(intrin->src[1].is_ssa); assert(intrin->src[1].is_ssa);
nir_ssa_def *value = intrin->src[1].ssa; nir_ssa_def *value = intrin->src[1].ssa;
if (glsl_type_is_boolean(deref->type)) if (value->bit_size == 1)
value = nir_i2b(b, value); value = nir_b2b32(b, value);
nir_intrinsic_instr *store = nir_intrinsic_instr *store =
nir_intrinsic_instr_create(b->shader, nir_intrinsic_store_scratch); nir_intrinsic_instr_create(b->shader, nir_intrinsic_store_scratch);