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

radeonsi: determine uses_bindless_samplers correctly

Browse source 
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4079>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4079>
This commit is contained in:
Marek Olšák 2020-02-26 22:48:41 -05:00
parent fc65df5651
commit c1b8e84961
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gallium/drivers/radeonsi/si_shader_nir.c
View file

@ -34,12 +34,12 @@
#include "compiler/nir/nir_builder.h"
#include "compiler/nir/nir_deref.h"
static nir_variable* tex_get_texture_var(nir_tex_instr *instr)
static const nir_deref_instr *tex_get_texture_deref(nir_tex_instr *instr)
{
for (unsigned i = 0; i < instr->num_srcs; i++) {
switch (instr->src[i].src_type) {
case nir_tex_src_texture_deref:
return nir_deref_instr_get_variable(nir_src_as_deref(instr->src[i].src));
return nir_src_as_deref(instr->src[i].src);
default:
break;
}
@ -201,13 +201,14 @@ static void scan_instruction(const struct nir_shader *nir,
}
} else if (instr->type == nir_instr_type_tex) {
nir_tex_instr *tex = nir_instr_as_tex(instr);
nir_variable *texture = tex_get_texture_var(tex);
const nir_deref_instr *deref = tex_get_texture_deref(tex);
nir_variable *var = deref ? nir_deref_instr_get_variable(deref) : NULL;
if (!texture) {
if (!var) {
info->samplers_declared |=
u_bit_consecutive(tex->sampler_index, 1);
} else {
if (texture->data.bindless)
if (deref->mode != nir_var_uniform || var->data.bindless)
info->uses_bindless_samplers = true;
}