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

nvk: Only pass texture handles to NAK

Browse source 
Codegen expects to get the handle in both the sampler and texture handle
sources.  NAK only cares about texture_handle.  Now that we don't care
about codegen anymore, we can drop the extra source.

Reviewed-by: Lorenzo Rossi <snowycoder@gmail.com>
Acked-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Mel Henning <mhenning@darkrefraction.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30403>
This commit is contained in:
Faith Ekstrand 2025-05-27 20:44:07 -04:00 • committed by Marge Bot
parent 511a490f8b
commit cee45c8bf5
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nouveau/vulkan/nvk_nir_lower_descriptors.c
View file

@ -1349,18 +1349,12 @@ lower_tex(nir_builder *b, nir_tex_instr *tex,
}
}
/* TODO: The nv50 back-end assumes it gets handles both places, even for
* texelFetch.
*/
nir_src_rewrite(&tex->src[texture_src_idx].src, combined_handle);
tex->src[texture_src_idx].src_type = nir_tex_src_texture_handle;
if (sampler_src_idx < 0) {
nir_tex_instr_add_src(tex, nir_tex_src_sampler_handle, combined_handle);
} else {
nir_src_rewrite(&tex->src[sampler_src_idx].src, combined_handle);
tex->src[sampler_src_idx].src_type = nir_tex_src_sampler_handle;
}
/* NAK doesn't care about the sampler handle at all */
if (sampler_src_idx >= 0)
nir_tex_instr_remove_src(tex, sampler_src_idx);
/* On pre-Volta hardware, we don't have real null descriptors. Null
* descriptors work well enough for sampling but they may not return the