summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2017-11-01 12:43:45 +1100
committerTimothy Arceri <[email protected]>2017-11-03 14:19:46 +1100
commit440d08fe932be89f56fc8ebec94c8393a6626369 (patch)
tree9e34bdea5cdf0255356e7483e32fc985103f8104 /src
parentde126b0402c53ed9011b8ea5237daea554537aa1 (diff)
nir: skip lowering sampler if there is no dereference
This avoids a crash on the output of nir_lower_bitmap(). Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/compiler/nir/nir_lower_samplers_as_deref.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/nir/nir_lower_samplers_as_deref.c b/src/compiler/nir/nir_lower_samplers_as_deref.c
index bdbd8672f40..3e819f7fa75 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);