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

nir: dont lower bindless samplers

Browse source 
We neeed to skip the var if its not a uniform here as well as checking
the bindless flag since UBOs can contain bindless samplers.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Timothy Arceri 2018-03-22 14:28:22 +11:00
parent bd4cc54c8b
commit 74b3fc2ce0
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/compiler/nir/nir_lower_samplers_as_deref.c
View file

@ -157,7 +157,8 @@ static bool
lower_sampler(nir_tex_instr *instr, struct lower_samplers_as_deref_state *state,
nir_builder *b)
{
if (!instr->texture)
if (!instr->texture || instr->texture->var->data.bindless ||
instr->texture->var->data.mode != nir_var_uniform)
return false;
/* In GLSL, we only fill out the texture field. The sampler is inferred */
@ -195,6 +196,11 @@ lower_intrinsic(nir_intrinsic_instr *instr,
instr->intrinsic == nir_intrinsic_image_var_atomic_comp_swap ||
instr->intrinsic == nir_intrinsic_image_var_size) {
b->cursor = nir_before_instr(&instr->instr);
if (instr->variables[0]->var->data.bindless ||
instr->variables[0]->var->data.mode != nir_var_uniform)
return false;
lower_deref(instr->variables[0], state, b);
return true;
}