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

radv/nir: adjust lowering of immediate samplers for descriptor heap

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39483>
This commit is contained in:
Samuel Pitoiset 2025-10-07 11:25:40 +02:00 • committed by Marge Bot
parent a44303ff11
commit 0f2f9a9045
1 changed files with 52 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
src/amd/vulkan/nir/radv_nir_lower_immediate_samplers.c
View file

@ -10,6 +10,7 @@
#include "radv_device.h"
#include "radv_nir.h"
#include "radv_physical_device.h"
#include "radv_sampler.h"
#include "radv_shader.h"
/**
@ -18,6 +19,7 @@
* forbidden).
*/
typedef struct {
const struct radv_device *device;
bool disable_tg4_trunc_coord;
const struct radv_shader_layout *layout;
} lower_immediate_samplers_state;
@ -29,43 +31,59 @@ lower_immediate_samplers(nir_builder *b, nir_tex_instr *tex, void *cb_data)
b->cursor = nir_before_instr(&tex->instr);
nir_deref_instr *deref = nir_get_tex_deref(tex, nir_tex_src_sampler_deref);
if (!deref)
return false;
if (nir_deref_instr_has_indirect(deref))
return false;
nir_variable *var = nir_deref_instr_get_variable(deref);
assert(var);
const unsigned desc_set = var->data.descriptor_set;
const unsigned binding_index = var->data.binding;
const struct radv_descriptor_set_layout *layout = state->layout->set[desc_set].layout;
const struct radv_descriptor_set_binding_layout *binding = &layout->binding[binding_index];
if (!binding->immutable_samplers_offset)
return false;
unsigned constant_index = 0;
while (deref->deref_type != nir_deref_type_var) {
assert(deref->deref_type == nir_deref_type_array);
unsigned array_size = MAX2(glsl_get_aoa_size(deref->type), 1);
constant_index += nir_src_as_uint(deref->arr.index) * array_size;
deref = nir_deref_instr_parent(deref);
}
const uint32_t dword0_mask =
tex->op == nir_texop_tg4 && state->disable_tg4_trunc_coord ? C_008F30_TRUNC_COORD : 0xffffffffu;
const uint32_t *samplers = radv_immutable_samplers(layout, binding);
nir_def *sampler = nir_imm_ivec4(b, samplers[constant_index * 4 + 0] & dword0_mask, samplers[constant_index * 4 + 1],
samplers[constant_index * 4 + 2], samplers[constant_index * 4 + 3]);
if (tex->embedded_sampler) {
const struct vk_sampler_state_array *embedded_samplers = &state->layout->embedded_samplers;
const uint32_t sampler_idx = tex->sampler_index;
uint32_t desc[4];
const int i = nir_tex_instr_src_index(tex, nir_tex_src_sampler_deref);
tex->src[i].src_type = nir_tex_src_sampler_handle;
nir_src_rewrite(&tex->src[i].src, sampler);
assert(sampler_idx < embedded_samplers->sampler_count);
const struct vk_sampler_state *sampler_state = &embedded_samplers->samplers[sampler_idx];
radv_make_sampler_descriptor(state->device, sampler_state, desc);
nir_tex_instr_add_src(tex, nir_tex_src_sampler_handle,
nir_imm_ivec4(b, desc[0] & dword0_mask, desc[1], desc[2], desc[3]));
} else {
nir_deref_instr *deref = nir_get_tex_deref(tex, nir_tex_src_sampler_deref);
if (!deref)
return false;
if (nir_deref_instr_has_indirect(deref))
return false;
nir_variable *var = nir_deref_instr_get_variable(deref);
assert(var);
const unsigned desc_set = var->data.descriptor_set;
const unsigned binding_index = var->data.binding;
const struct radv_descriptor_set_layout *layout = state->layout->set[desc_set].layout;
const struct radv_descriptor_set_binding_layout *binding = &layout->binding[binding_index];
if (!binding->immutable_samplers_offset)
return false;
unsigned constant_index = 0;
while (deref->deref_type != nir_deref_type_var) {
assert(deref->deref_type == nir_deref_type_array);
unsigned array_size = MAX2(glsl_get_aoa_size(deref->type), 1);
constant_index += nir_src_as_uint(deref->arr.index) * array_size;
deref = nir_deref_instr_parent(deref);
}
const uint32_t *samplers = radv_immutable_samplers(layout, binding);
nir_def *sampler =
nir_imm_ivec4(b, samplers[constant_index * 4 + 0] & dword0_mask, samplers[constant_index * 4 + 1],
samplers[constant_index * 4 + 2], samplers[constant_index * 4 + 3]);
const int i = nir_tex_instr_src_index(tex, nir_tex_src_sampler_deref);
tex->src[i].src_type = nir_tex_src_sampler_handle;
nir_src_rewrite(&tex->src[i].src, sampler);
}
return true;
}
@ -76,6 +94,7 @@ radv_nir_lower_immediate_samplers(nir_shader *shader, struct radv_device *device
const struct radv_physical_device *pdev = radv_device_physical(device);
lower_immediate_samplers_state state = {
.device = device,
.disable_tg4_trunc_coord =
!pdev->info.compiler_info.conformant_trunc_coord && !pdev->cache_key.disable_trunc_coord,
.layout = &stage->layout,