fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pco: basic image/texture cube support

Browse source 
Signed-off-by: Simon Perretta <simon.perretta@imgtec.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36412>
This commit is contained in:
Simon Perretta 2025-03-31 15:33:03 +01:00 • committed by Marge Bot
parent a3b2510c24
commit 0962eec985
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/imagination/pco/pco_nir.c
View file

@ -781,7 +781,12 @@ void pco_lower_nir(pco_ctx *ctx, nir_shader *nir, pco_data *data)
NIR_PASS(_, nir, pco_nir_lower_variables, true, true);
NIR_PASS(_, nir, pco_nir_lower_images, data);
NIR_PASS(_, nir, nir_lower_tex, &(nir_lower_tex_options){});
NIR_PASS(_,
nir,
nir_lower_tex,
&(nir_lower_tex_options){
.lower_txd_cube_map = true,
});
NIR_PASS(_, nir, pco_nir_lower_tex);
if (nir->info.stage == MESA_SHADER_FRAGMENT) {

14
src/imagination/pco/pco_nir_tex.c
View file

@ -513,6 +513,9 @@ lower_tex(nir_builder *b, nir_instr *instr, UNUSED void *cb_data)
params.tex_state = tex_state;
params.smp_state = smp_state;
bool is_cube_array = tex->sampler_dim == GLSL_SAMPLER_DIM_CUBE &&
tex->is_array;
nir_def *float_coords;
nir_def *int_coords;
nir_def *float_array_index;
@ -603,6 +606,8 @@ lower_tex(nir_builder *b, nir_instr *instr, UNUSED void *cb_data)
nir_def *array_max = STATE_UNPACK(b, tex_state_word, 2, 4, 11);
array_index = nir_uclamp(b, array_index, nir_imm_int(b, 0), array_max);
if (is_cube_array)
array_index = nir_imul_imm(b, array_index, 6);
nir_def *tex_meta = nir_load_tex_meta_pco(b,
PCO_IMAGE_META_COUNT,
@ -761,6 +766,8 @@ static nir_def *lower_image(nir_builder *b, nir_instr *instr, void *cb_data)
unsigned binding = nir_src_comp_as_uint(intr->src[0], 1);
nir_def *elem = nir_channel(b, intr->src[0].ssa, 2);
bool is_cube_array = image_dim == GLSL_SAMPLER_DIM_CUBE && is_array;
nir_def *lod;
switch (intr->intrinsic) {
case nir_intrinsic_image_deref_load:
@ -1062,6 +1069,11 @@ static nir_def *lower_image(nir_builder *b, nir_instr *instr, void *cb_data)
coords = nir_vec2(b,
nir_umod_imm(b, coords, 8192),
nir_udiv_imm(b, coords, 8192));
}
/* Special case; lower image cube to arrayed 2d textures. */
else if (image_dim == GLSL_SAMPLER_DIM_CUBE) {
image_dim = GLSL_SAMPLER_DIM_2D;
is_array = true;
} else if (ia) {
nir_variable *pos = nir_get_variable_with_location(b->shader,
nir_var_shader_in,
@ -1144,6 +1156,8 @@ static nir_def *lower_image(nir_builder *b, nir_instr *instr, void *cb_data)
nir_def *array_max = STATE_UNPACK(b, tex_state_word, 2, 4, 11);
array_index = nir_uclamp(b, array_index, nir_imm_int(b, 0), array_max);
if (is_cube_array)
array_index = nir_imul_imm(b, array_index, 6);
nir_def *tex_meta = nir_load_tex_meta_pco(b,
PCO_IMAGE_META_COUNT,