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

aco: handle nir_intrinsic_image_deref_{load,store} with lod

Browse Source 
Use image_load_mip and image_store_mip respectively if the lod
parameter isn't zero.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Samuel Pitoiset
2020-01-06 10:21:04 +01:00
parent e77ff89914
commit 4d49a7ac73
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4078,6 +4078,15 @@ static Temp get_image_coords(isel_context *ctx, const nir_intrinsic_instr *instr
coords[i] = Operand(emit_extract_vector(ctx, src0, i, v1)); coords[i] = Operand(emit_extract_vector(ctx, src0, i, v1));
} }
if (instr->intrinsic == nir_intrinsic_image_deref_load ||
instr->intrinsic == nir_intrinsic_image_deref_store) {
int lod_index = instr->intrinsic == nir_intrinsic_image_deref_load ? 3 : 4;
bool level_zero = nir_src_is_const(instr->src[lod_index]) && nir_src_as_uint(instr->src[lod_index]) == 0;
if (!level_zero)
coords.emplace_back(Operand(get_ssa_temp(ctx, instr->src[lod_index].ssa)));
}
aco_ptr<Pseudo_instruction> vec{create_instruction<Pseudo_instruction>(aco_opcode::p_create_vector, Format::PSEUDO, coords.size(), 1)}; aco_ptr<Pseudo_instruction> vec{create_instruction<Pseudo_instruction>(aco_opcode::p_create_vector, Format::PSEUDO, coords.size(), 1)};
for (unsigned i = 0; i < coords.size(); i++) for (unsigned i = 0; i < coords.size(); i++)
vec->operands[i] = coords[i]; vec->operands[i] = coords[i];
@@ -4151,7 +4160,10 @@ void visit_image_load(isel_context *ctx, nir_intrinsic_instr *instr)
else else
tmp = {ctx->program->allocateId(), RegClass(RegType::vgpr, num_components)}; tmp = {ctx->program->allocateId(), RegClass(RegType::vgpr, num_components)};
aco_ptr<MIMG_instruction> load{create_instruction<MIMG_instruction>(aco_opcode::image_load, Format::MIMG, 2, 1)}; bool level_zero = nir_src_is_const(instr->src[3]) && nir_src_as_uint(instr->src[3]) == 0;
aco_opcode opcode = level_zero ? aco_opcode::image_load : aco_opcode::image_load_mip;
aco_ptr<MIMG_instruction> load{create_instruction<MIMG_instruction>(opcode, Format::MIMG, 2, 1)};
load->operands[0] = Operand(coords); load->operands[0] = Operand(coords);
load->operands[1] = Operand(resource); load->operands[1] = Operand(resource);
load->definitions[0] = Definition(tmp); load->definitions[0] = Definition(tmp);
@@ -4217,7 +4229,10 @@ void visit_image_store(isel_context *ctx, nir_intrinsic_instr *instr)
Temp coords = get_image_coords(ctx, instr, type); Temp coords = get_image_coords(ctx, instr, type);
Temp resource = get_sampler_desc(ctx, nir_instr_as_deref(instr->src[0].ssa->parent_instr), ACO_DESC_IMAGE, nullptr, true, true); Temp resource = get_sampler_desc(ctx, nir_instr_as_deref(instr->src[0].ssa->parent_instr), ACO_DESC_IMAGE, nullptr, true, true);
aco_ptr<MIMG_instruction> store{create_instruction<MIMG_instruction>(aco_opcode::image_store, Format::MIMG, 4, 0)}; bool level_zero = nir_src_is_const(instr->src[4]) && nir_src_as_uint(instr->src[4]) == 0;
aco_opcode opcode = level_zero ? aco_opcode::image_store : aco_opcode::image_store_mip;
aco_ptr<MIMG_instruction> store{create_instruction<MIMG_instruction>(opcode, Format::MIMG, 4, 0)};
store->operands[0] = Operand(coords); store->operands[0] = Operand(coords);
store->operands[1] = Operand(resource); store->operands[1] = Operand(resource);
store->operands[2] = Operand(s4); store->operands[2] = Operand(s4);