fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 13:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

panfrost: Add and use a new pan_nir_res_handle() helper

Browse source 
Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Reviewed-by: Lorenzo Rossi <lorenzo.rossi@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41036>
This commit is contained in:
Faith Ekstrand 2026-04-13 04:45:39 -04:00 • committed by Marge Bot
parent 1883f3094f
commit c99f97efd3
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gallium/drivers/panfrost/pan_nir_lower_res_indices.c
View file

@ -7,6 +7,7 @@
#include "genxml/gen_macros.h"
#include "pan_context.h"
#include "pan_shader.h"
#include "pan_nir.h"
static bool
lower_tex(nir_builder *b, nir_tex_instr *tex)
@ -17,8 +18,7 @@ lower_tex(nir_builder *b, nir_tex_instr *tex)
nir_def *sampler_offset = nir_steal_tex_src(tex, nir_tex_src_sampler_offset);
if (tex_offset != NULL) {
tex_offset =
nir_ior_imm(b, tex_offset, pan_res_handle(PAN_TABLE_TEXTURE, 0));
tex_offset = pan_nir_res_handle(b, PAN_TABLE_TEXTURE, 0, tex_offset);
nir_tex_instr_add_src(tex, nir_tex_src_texture_offset, tex_offset);
} else {
tex->texture_index =
@ -32,7 +32,7 @@ lower_tex(nir_builder *b, nir_tex_instr *tex)
tex->sampler_index = pan_res_handle(PAN_TABLE_SAMPLER, 0);
} else if (sampler_offset != NULL) {
sampler_offset =
nir_ior_imm(b, sampler_offset, pan_res_handle(PAN_TABLE_SAMPLER, 0));
pan_nir_res_handle(b, PAN_TABLE_SAMPLER, 0, sampler_offset);
nir_tex_instr_add_src(tex, nir_tex_src_sampler_offset, sampler_offset);
} else {
tex->sampler_index =
@ -49,7 +49,7 @@ lower_image_intrin(nir_builder *b, nir_intrinsic_instr *intrin)
nir_src *tex_handle = &intrin->src[0];
nir_def *new_handle =
nir_ior_imm(b, tex_handle->ssa, pan_res_handle(PAN_TABLE_IMAGE, 0));
pan_nir_res_handle(b, PAN_TABLE_IMAGE, 0, tex_handle->ssa);
nir_src_rewrite(tex_handle, new_handle);
return true;
@ -80,7 +80,7 @@ lower_load_ubo_intrin(nir_builder *b, nir_intrinsic_instr *intrin)
b->cursor = nir_before_instr(&intrin->instr);
nir_def *new_offset =
nir_ior_imm(b, intrin->src[0].ssa, pan_res_handle(PAN_TABLE_UBO, 0));
pan_nir_res_handle(b, PAN_TABLE_UBO, 0, intrin->src[0].ssa);
nir_src_rewrite(&intrin->src[0], new_offset);
@ -94,8 +94,7 @@ lower_ssbo_intrin(nir_builder *b, nir_intrinsic_instr *intrin)
bool is_store = intrin->intrinsic == nir_intrinsic_store_ssbo;
nir_src *handle = &intrin->src[is_store ? 1 : 0];
nir_def *new_handle = nir_ior_imm(b, handle->ssa,
pan_res_handle(PAN_TABLE_SSBO, 0));
nir_def *new_handle = pan_nir_res_handle(b, PAN_TABLE_SSBO, 0, handle->ssa);
nir_src_rewrite(handle, new_handle);

12
src/panfrost/compiler/pan_nir.h
View file

@ -45,6 +45,18 @@ pan_nir_tile_default_coverage(nir_builder *b)
return nir_iand_imm(b, nir_load_cumulative_coverage_pan(b), 0x1f);
}
static inline nir_def *
pan_nir_res_handle(nir_builder *b, uint32_t table,
uint32_t index, nir_def *offset)
{
if (offset) {
return nir_ior_imm(b, nir_iadd_imm(b, offset, index),
pan_res_handle(table, 0));
} else {
return nir_imm_int(b, pan_res_handle(table, index));
}
}
bool pan_nir_lower_bool_to_bitsize(nir_shader *shader);
bool pan_nir_lower_vertex_id(nir_shader *shader);

5
src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c
View file

@ -18,8 +18,7 @@
#include "vk_pipeline_layout.h"
#include "util/bitset.h"
#include "nir.h"
#include "nir_builder.h"
#include "pan_nir.h"
#if PAN_ARCH >= 9
#define VALHALL_RESOURCE_TABLE_IDX 62
@ -548,7 +547,7 @@ load_resource_deref_desc(nir_builder *b, nir_deref_instr *deref,
/* note that user sets start from index 1 */
return nir_load_ubo(
b, num_components, bit_size,
nir_imm_int(b, pan_res_handle(VALHALL_RESOURCE_TABLE_IDX, set + 1)),
pan_nir_res_handle(b, VALHALL_RESOURCE_TABLE_IDX, set + 1, NULL),
set_offset, .range = ~0u, .align_mul = PANVK_DESCRIPTOR_SIZE,
.align_offset = desc_offset);
#endif