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

aco: bail out if the NIR IO base offset isn't zero

Browse Source 
nir_io_add_const_offset_to_base takes care of this.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7003>
This commit is contained in:
Samuel Pitoiset
2020-10-05 11:28:02 +02:00
parent 9d5ec7f6f2
commit 1211d05bef
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/amd/compiler/aco_instruction_selection.cpp
View File

@@ -4124,11 +4124,10 @@ bool store_output_to_temps(isel_context *ctx, nir_intrinsic_instr *instr)
unsigned component = nir_intrinsic_component(instr);
unsigned idx = nir_intrinsic_base(instr) * 4u + component;
if (!nir_src_is_const(instr->src[1]))
if (!nir_src_is_const(instr->src[1]) || nir_src_as_uint(instr->src[1]))
return false;
Temp src = get_ssa_temp(ctx, instr->src[0].ssa);
idx += nir_src_as_uint(instr->src[1]) * 4u;
if (instr->src[0].ssa->bit_size == 64)
write_mask = widen_mask(write_mask, 2);
@@ -4510,13 +4509,12 @@ void visit_load_input(isel_context *ctx, nir_intrinsic_instr *instr)
Temp dst = get_ssa_temp(ctx, &instr->dest.ssa);
if (ctx->shader->info.stage == MESA_SHADER_VERTEX) {
if (!nir_src_is_const(instr->src[0]))
isel_err(instr->src[0].ssa->parent_instr, "Unimplemented non-const nir_intrinsic_load_input offset");
uint32_t offset = nir_src_as_uint(instr->src[0]);
if (!nir_src_is_const(instr->src[0]) || nir_src_as_uint(instr->src[0]))
isel_err(instr->src[0].ssa->parent_instr, "Unimplemented non-zero nir_intrinsic_load_input offset");
Temp vertex_buffers = convert_pointer_to_64_bit(ctx, get_arg(ctx, ctx->args->vertex_buffers));
unsigned location = nir_intrinsic_base(instr) - VERT_ATTRIB_GENERIC0 + offset;
unsigned location = nir_intrinsic_base(instr) - VERT_ATTRIB_GENERIC0;
unsigned component = nir_intrinsic_component(instr);
unsigned bitsize = instr->dest.ssa.bit_size;
unsigned attrib_binding = ctx->options->key.vs.vertex_attribute_bindings[location];