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

glsl_to_nir: handle bindless textures

Browse source 
v2: add support for AMD

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> (v1)
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Karol Herbst 2019-03-24 17:11:34 +01:00
parent 035759b61b
commit d7bbb3caf1
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/amd/common/ac_nir_to_llvm.c
View file

@ -3498,9 +3498,17 @@ static LLVMValueRef get_sampler_desc(struct ac_nir_context *ctx,
bool bindless = false;
if (!deref_instr) {
assert(tex_instr && !image);
int sampSrcIdx = nir_tex_instr_src_index(tex_instr,
nir_tex_src_sampler_handle);
descriptor_set = 0;
base_index = tex_instr->sampler_index;
if (sampSrcIdx != -1) {
base_index = 0;
bindless = true;
index = get_src(ctx, tex_instr->src[sampSrcIdx].src);
} else {
assert(tex_instr && !image);
base_index = tex_instr->sampler_index;
}
} else {
while(deref_instr->deref_type != nir_deref_type_var) {
if (deref_instr->deref_type == nir_deref_type_array) {

19
src/compiler/glsl/glsl_to_nir.cpp
View file

@ -2410,10 +2410,21 @@ nir_visitor::visit(ir_texture *ir)
}
nir_deref_instr *sampler_deref = evaluate_deref(ir->sampler);
instr->src[0].src = nir_src_for_ssa(&sampler_deref->dest.ssa);
instr->src[0].src_type = nir_tex_src_texture_deref;
instr->src[1].src = nir_src_for_ssa(&sampler_deref->dest.ssa);
instr->src[1].src_type = nir_tex_src_sampler_deref;
/* check for bindless handles */
if (sampler_deref->mode != nir_var_uniform ||
nir_deref_instr_get_variable(sampler_deref)->data.bindless) {
nir_ssa_def *load = nir_load_deref(&b, sampler_deref);
instr->src[0].src = nir_src_for_ssa(load);
instr->src[0].src_type = nir_tex_src_texture_handle;
instr->src[1].src = nir_src_for_ssa(load);
instr->src[1].src_type = nir_tex_src_sampler_handle;
} else {
instr->src[0].src = nir_src_for_ssa(&sampler_deref->dest.ssa);
instr->src[0].src_type = nir_tex_src_texture_deref;
instr->src[1].src = nir_src_for_ssa(&sampler_deref->dest.ssa);
instr->src[1].src_type = nir_tex_src_sampler_deref;
}
unsigned src_number = 2;