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

nvk: Lower image_size to txs

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand 2023-07-28 10:37:16 -05:00 • committed by Marge Bot
parent ae14362ff6
commit 4fa8df43ea
1 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/nouveau/vulkan/nvk_shader.c
View file

@ -74,6 +74,43 @@ nvk_physical_device_spirv_options(const struct nvk_physical_device *pdevice,
};
}
static bool
lower_image_size_to_txs(nir_builder *b, nir_instr *instr, UNUSED void *_data)
{
if (instr->type != nir_instr_type_intrinsic)
return false;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
if (intrin->intrinsic != nir_intrinsic_image_deref_size)
return false;
b->cursor = nir_instr_remove(&intrin->instr);
nir_deref_instr *img = nir_src_as_deref(intrin->src[0]);
nir_ssa_def *lod = nir_tex_type_has_lod(img->type) ?
intrin->src[1].ssa : NULL;
nir_ssa_def *size = nir_txs_deref(b, img, lod);
if (glsl_get_sampler_dim(img->type) == GLSL_SAMPLER_DIM_CUBE) {
/* Cube image descriptors are set up as simple arrays but SPIR-V wants
* the number of cubes.
*/
if (glsl_sampler_type_is_array(img->type)) {
size = nir_vec3(b, nir_channel(b, size, 0),
nir_channel(b, size, 1),
nir_udiv_imm(b, nir_channel(b, size, 2), 6));
} else {
size = nir_vec3(b, nir_channel(b, size, 0),
nir_channel(b, size, 1),
nir_imm_int(b, 1));
}
}
nir_ssa_def_rewrite_uses(&intrin->dest.ssa, size);
return true;
}
static bool
lower_load_global_constant_offset_instr(nir_builder *b, nir_instr *instr,
UNUSED void *_data)
@ -249,6 +286,9 @@ nvk_lower_nir(struct nvk_device *device, nir_shader *nir,
NIR_PASS(_, nir, nir_lower_explicit_io, nir_var_mem_push_const,
nir_address_format_32bit_offset);
NIR_PASS(_, nir, nir_shader_instructions_pass, lower_image_size_to_txs,
nir_metadata_block_index | nir_metadata_dominance, NULL);
NIR_PASS(_, nir, nvk_nir_lower_descriptors, rs, layout);
NIR_PASS(_, nir, nir_lower_explicit_io, nir_var_mem_global,
nir_address_format_64bit_global);