From 440d08fe932be89f56fc8ebec94c8393a6626369 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Wed, 1 Nov 2017 12:43:45 +1100 Subject: [PATCH] nir: skip lowering sampler if there is no dereference MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This avoids a crash on the output of nir_lower_bitmap(). Reviewed-by: Nicolai Hähnle --- src/compiler/nir/nir_lower_samplers_as_deref.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/compiler/nir/nir_lower_samplers_as_deref.c b/src/compiler/nir/nir_lower_samplers_as_deref.c index bdbd867..3e819f7 100644 --- a/src/compiler/nir/nir_lower_samplers_as_deref.c +++ b/src/compiler/nir/nir_lower_samplers_as_deref.c @@ -157,8 +157,10 @@ static bool lower_sampler(nir_tex_instr *instr, struct lower_samplers_as_deref_state *state, nir_builder *b) { + if (!instr->texture) + return false; + /* In GLSL, we only fill out the texture field. The sampler is inferred */ - assert(instr->texture != NULL); assert(instr->sampler == NULL); b->cursor = nir_before_instr(&instr->instr); -- 2.7.4