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

radeonsi: don't load sampler states for buffer and MS samplers

Browse source 
They don't use them.

Reviewed-by: Qiang Yu <yuq825@gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38915>
This commit is contained in:
Marek Olšák 2025-12-08 12:30:13 -05:00 • committed by Marge Bot
parent 5acabdd1f8
commit 8cf154d2eb
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gallium/drivers/radeonsi/si_nir_lower_resource.c
View file

@ -495,6 +495,8 @@ static bool lower_resource_tex(nir_builder *b, nir_tex_instr *tex,
nir_deref_instr *sampler_deref = NULL;
nir_def *texture_handle = NULL;
nir_def *sampler_handle = NULL;
bool has_sampler = tex->sampler_dim != GLSL_SAMPLER_DIM_BUF &&
tex->sampler_dim != GLSL_SAMPLER_DIM_MS;
for (unsigned i = 0; i < tex->num_srcs; i++) {
switch (tex->src[i].src_type) {
@ -502,13 +504,23 @@ static bool lower_resource_tex(nir_builder *b, nir_tex_instr *tex,
texture_deref = nir_src_as_deref(tex->src[i].src);
break;
case nir_tex_src_sampler_deref:
sampler_deref = nir_src_as_deref(tex->src[i].src);
if (has_sampler) {
sampler_deref = nir_src_as_deref(tex->src[i].src);
} else {
nir_tex_instr_remove_src(tex, i);
i--;
}
break;
case nir_tex_src_texture_handle:
texture_handle = tex->src[i].src.ssa;
break;
case nir_tex_src_sampler_handle:
sampler_handle = tex->src[i].src.ssa;
if (has_sampler) {
sampler_handle = tex->src[i].src.ssa;
} else {
nir_tex_instr_remove_src(tex, i);
i--;
}
break;
default:
break;
@ -532,6 +544,7 @@ static bool lower_resource_tex(nir_builder *b, nir_tex_instr *tex,
}
if (tex->op == nir_texop_sampler_descriptor_amd) {
assert(has_sampler);
nir_def *sampler;
if (sampler_deref)
sampler = load_deref_sampler_desc(b, sampler_deref, AC_DESC_SAMPLER, s, true);