OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Allow a non-existent sampler deref in nir_lower_samplers_as_deref

Browse Source 
GL_ARB_gl_spirv does not provide a sampler deref for e.g. texelFetch(),
so we can't assume that both are present and identical.  Simply lower
each if it is present.

Fixes regressions in GL_ARB_gl_spirv tests since I switched everyone to
using this pass.  Thanks to Alejandro Piñeiro for catching these.

Fixes: f003859f97 nir: Make gl_nir_lower_samplers use gl_nir_lower_samplers_as_deref

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Tested-by: Alejandro Piñeiro <apinheiro@igalia.com>
This commit is contained in:
Kenneth Graunke
2019-01-10 11:10:13 -08:00
parent e12b0b5c6d
commit ae683ed3bc
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/compiler/glsl/gl_nir_lower_samplers_as_deref.c
View File

@@ -196,28 +196,30 @@ lower_sampler(nir_tex_instr *instr, struct lower_samplers_as_deref_state *state,
int sampler_idx = int sampler_idx =
nir_tex_instr_src_index(instr, nir_tex_src_sampler_deref); nir_tex_instr_src_index(instr, nir_tex_src_sampler_deref);
if (texture_idx < 0)
return false;
assert(texture_idx >= 0 && sampler_idx >= 0);
assert(instr->src[texture_idx].src.is_ssa);
assert(instr->src[sampler_idx].src.is_ssa);
assert(instr->src[texture_idx].src.ssa == instr->src[sampler_idx].src.ssa);
b->cursor = nir_before_instr(&instr->instr); b->cursor = nir_before_instr(&instr->instr);
nir_deref_instr *texture_deref = if (texture_idx >= 0) {
lower_deref(b, state, nir_src_as_deref(instr->src[texture_idx].src)); assert(instr->src[texture_idx].src.is_ssa);
/* don't lower bindless: */
if (!texture_deref)
return false;
nir_instr_rewrite_src(&instr->instr, &instr->src[texture_idx].src,
nir_src_for_ssa(&texture_deref->dest.ssa));
nir_deref_instr *sampler_deref = nir_deref_instr *texture_deref =
lower_deref(b, state, nir_src_as_deref(instr->src[sampler_idx].src)); lower_deref(b, state, nir_src_as_deref(instr->src[texture_idx].src));
nir_instr_rewrite_src(&instr->instr, &instr->src[sampler_idx].src, /* only lower non-bindless: */
nir_src_for_ssa(&sampler_deref->dest.ssa)); if (texture_deref) {
nir_instr_rewrite_src(&instr->instr, &instr->src[texture_idx].src,
nir_src_for_ssa(&texture_deref->dest.ssa));
}
}
if (sampler_idx >= 0) {
assert(instr->src[sampler_idx].src.is_ssa);
nir_deref_instr *sampler_deref =
lower_deref(b, state, nir_src_as_deref(instr->src[sampler_idx].src));
/* only lower non-bindless: */
if (sampler_deref) {
nir_instr_rewrite_src(&instr->instr, &instr->src[sampler_idx].src,
nir_src_for_ssa(&sampler_deref->dest.ssa));
}
}
return true; return true;
} }