AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ac/nir/cdna: don't use image_descriptor intrinsics if the src is a descriptor

Browse Source 
Fixes: 30af861bff - radeonsi: restructure (rewrite) the compute blit shader

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29852>
This commit is contained in:
Marek Olšák
2024-06-22 04:40:20 -04:00
committed by Marge Bot
parent 8023e89d11
commit 932e8c7768
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/amd/common/ac_nir_lower_image_opcodes_cdna.c
View File

@@ -302,6 +302,7 @@ static bool lower_image_opcodes(nir_builder *b, nir_instr *instr, void *data)
enum gl_access_qualifier access;
enum glsl_sampler_dim dim;
bool is_array;
unsigned num_desc_components;
nir_def *desc = NULL, *result = NULL;
ASSERTED const char *intr_name;
@@ -316,8 +317,14 @@ static bool lower_image_opcodes(nir_builder *b, nir_instr *instr, void *data)
if (dim == GLSL_SAMPLER_DIM_BUF)
return false;
is_array = nir_intrinsic_image_array(intr);
desc = nir_image_descriptor_amd(b, dim == GLSL_SAMPLER_DIM_BUF ? 4 : 8,
32, intr->src[0].ssa);
num_desc_components = dim == GLSL_SAMPLER_DIM_BUF ? 4 : 8;
if (intr->src[0].ssa->bit_size == 32 &&
intr->src[0].ssa->num_components == num_desc_components)
desc = intr->src[0].ssa;
else
desc = nir_image_descriptor_amd(b, num_desc_components,
32, intr->src[0].ssa);
break;
case nir_intrinsic_image_deref_load:
@@ -328,8 +335,14 @@ static bool lower_image_opcodes(nir_builder *b, nir_instr *instr, void *data)
if (dim == GLSL_SAMPLER_DIM_BUF)
return false;
is_array = glsl_sampler_type_is_array(deref->type);
desc = nir_image_deref_descriptor_amd(b, dim == GLSL_SAMPLER_DIM_BUF ? 4 : 8,
32, intr->src[0].ssa);
num_desc_components = dim == GLSL_SAMPLER_DIM_BUF ? 4 : 8;
if (intr->src[0].ssa->bit_size == 32 &&
intr->src[0].ssa->num_components == num_desc_components)
desc = intr->src[0].ssa;
else
desc = nir_image_deref_descriptor_amd(b, num_desc_components,
32, intr->src[0].ssa);
break;
case nir_intrinsic_bindless_image_load:
@@ -339,8 +352,14 @@ static bool lower_image_opcodes(nir_builder *b, nir_instr *instr, void *data)
if (dim == GLSL_SAMPLER_DIM_BUF)
return false;
is_array = nir_intrinsic_image_array(intr);
desc = nir_bindless_image_descriptor_amd(b, dim == GLSL_SAMPLER_DIM_BUF ? 4 : 8,
32, intr->src[0].ssa);
num_desc_components = dim == GLSL_SAMPLER_DIM_BUF ? 4 : 8;
if (intr->src[0].ssa->bit_size == 32 &&
intr->src[0].ssa->num_components == num_desc_components)
desc = intr->src[0].ssa;
else
desc = nir_bindless_image_descriptor_amd(b, num_desc_components,
32, intr->src[0].ssa);
break;
/* These don't need any lowering. */