fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-26 03:30:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvk: Make texture descriptors a bit more acceptable to codegen

Browse source 
Codegen assumes that it gets a combined descriptor on both the texture
and sampler handle sources and that it's 64-bit.  It's not too hard to
just give it that in NIR.  We may make codegen a bit more flexible in
future but, for now, this gets things working.  While we're here, do a
quick optimization for combined texture+sampler descriptors because it's
easy.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand 2023-01-30 20:11:49 -06:00 • committed by Marge Bot
parent c9bf974472
commit 8213eaa99f
2 changed files with 52 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/nouveau/vulkan/nvk_descriptor_set.h
View file

@ -9,6 +9,9 @@
struct nvk_descriptor_set_layout;
#define NVK_IMAGE_DESCRIPTOR_IMAGE_INDEX_MASK 0x000fffff
#define NVK_IMAGE_DESCRIPTOR_SAMPLER_INDEX_MASK 0xfff00000
struct nvk_image_descriptor {
unsigned image_index:20;
unsigned sampler_index:12;

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

@ -1,4 +1,5 @@
#include "nvk_cmd_buffer.h"
#include "nvk_descriptor_set.h"
#include "nvk_descriptor_set_layout.h"
#include "nvk_nir.h"
#include "nvk_pipeline_layout.h"
@ -149,32 +150,60 @@ lower_tex(nir_builder *b, nir_tex_instr *tex,
{
b->cursor = nir_before_instr(&tex->instr);
for (unsigned i = 0; i < tex->num_srcs; i++) {
if (tex->src[i].src_type != nir_tex_src_texture_deref &&
tex->src[i].src_type != nir_tex_src_sampler_deref)
continue;
const int texture_src_idx =
nir_tex_instr_src_index(tex, nir_tex_src_texture_deref);
const int sampler_src_idx =
nir_tex_instr_src_index(tex, nir_tex_src_sampler_deref);
if (texture_src_idx < 0) {
assert(sampler_src_idx < 0);
return false;
}
nir_deref_instr *deref = nir_src_as_deref(tex->src[i].src);
nir_ssa_def *desc = load_resource_deref_desc(b, deref, 0, 1, 32, ctx);
nir_deref_instr *texture = nir_src_as_deref(tex->src[texture_src_idx].src);
nir_deref_instr *sampler = sampler_src_idx < 0 ? NULL :
nir_src_as_deref(tex->src[sampler_src_idx].src);
assert(texture);
switch (tex->src[i].src_type) {
case nir_tex_src_texture_deref:
tex->src[i].src_type = nir_tex_src_texture_handle;
nir_instr_rewrite_src_ssa(&tex->instr, &tex->src[i].src,
nir_iand_imm(b, desc, 0x000fffff));
break;
nir_ssa_def *combined_handle;
if (texture == sampler) {
combined_handle = load_resource_deref_desc(b, texture, 0, 1, 32, ctx);
} else {
nir_ssa_def *texture_desc =
load_resource_deref_desc(b, texture, 0, 1, 32, ctx);
combined_handle = nir_iand_imm(b, texture_desc,
NVK_IMAGE_DESCRIPTOR_IMAGE_INDEX_MASK);
case nir_tex_src_sampler_deref:
tex->src[i].src_type = nir_tex_src_sampler_handle;
nir_instr_rewrite_src_ssa(&tex->instr, &tex->src[i].src,
nir_iand_imm(b, desc, 0xfff00000));
break;
default:
unreachable("Unhandled texture source");
if (sampler != NULL) {
nir_ssa_def *sampler_desc =
load_resource_deref_desc(b, sampler, 0, 1, 32, ctx);
nir_ssa_def *sampler_index =
nir_iand_imm(b, sampler_desc,
NVK_IMAGE_DESCRIPTOR_SAMPLER_INDEX_MASK);
combined_handle = nir_ior(b, combined_handle, sampler_index);
}
}
/* TODO: The nv50 back-end assumes it's 64-bit because of GL */
combined_handle = nir_u2u64(b, combined_handle);
/* TODO: The nv50 back-end assumes it gets handles both places, even for
* texelFetch.
*/
nir_instr_rewrite_src_ssa(&tex->instr,
&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,
nir_src_for_ssa(combined_handle));
} else {
nir_instr_rewrite_src_ssa(&tex->instr,
&tex->src[sampler_src_idx].src,
combined_handle);
tex->src[sampler_src_idx].src_type = nir_tex_src_sampler_handle;
}
return true;
}