AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: fix the value of uses_bindless_samplers

Browse Source 
We don't have any nir_variables for uniforms, so this code wasn't
doing anything. Also, uniform handles are almost always uniforms.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9028>
This commit is contained in:
Marek Olšák
2021-02-13 13:22:33 -05:00
parent 19e6601413
commit 5e47d6fc73
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/radeonsi/si_shader_nir.c
+6 -14
View File
@@ -31,17 +31,12 @@
#include "si_shader_internal.h"
#include "tgsi/tgsi_from_mesa.h"
static const nir_deref_instr *tex_get_texture_deref(nir_tex_instr *instr)
static const nir_src *get_texture_src(nir_tex_instr *instr, nir_tex_src_type type)
{
for (unsigned i = 0; i < instr->num_srcs; i++) {
switch (instr->src[i].src_type) {
case nir_tex_src_texture_deref:
return nir_src_as_deref(instr->src[i].src);
default:
break;
}
if (instr->src[i].src_type == type)
return &instr->src[i].src;
}
return NULL;
}
@@ -183,13 +178,10 @@ static void scan_instruction(const struct nir_shader *nir, struct si_shader_info
{
if (instr->type == nir_instr_type_tex) {
nir_tex_instr *tex = nir_instr_as_tex(instr);
const nir_deref_instr *deref = tex_get_texture_deref(tex);
nir_variable *var = deref ? nir_deref_instr_get_variable(deref) : NULL;
const nir_src *handle = get_texture_src(tex, nir_tex_src_texture_handle);
if (var) {
if (var->data.mode != nir_var_uniform || var->data.bindless)
info->uses_bindless_samplers = true;
}
if (handle)
info->uses_bindless_samplers = true;
} else if (instr->type == nir_instr_type_intrinsic) {
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);