From b0c40bc9054404c1b0e42516b72d6d9d070a4c10 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 22 Oct 2021 14:04:45 -0400 Subject: [PATCH] nir/lower_samplers_as_deref: rewrite more image intrinsics "I think we want to lower them." -Jason "And I do know how the pass works" Ekstrand fixes #5540 cc: mesa-stable Reviewed-by: Jason Ekstrand Part-of: --- src/compiler/glsl/gl_nir_lower_samplers_as_deref.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c b/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c index 8c193e2115b..32109f0bc57 100644 --- a/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c +++ b/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c @@ -297,7 +297,8 @@ lower_intrinsic(nir_intrinsic_instr *instr, instr->intrinsic == nir_intrinsic_image_deref_atomic_exchange || instr->intrinsic == nir_intrinsic_image_deref_atomic_comp_swap || instr->intrinsic == nir_intrinsic_image_deref_atomic_fadd || - instr->intrinsic == nir_intrinsic_image_deref_size) { + instr->intrinsic == nir_intrinsic_image_deref_size || + instr->intrinsic == nir_intrinsic_image_deref_samples) { b->cursor = nir_before_instr(&instr->instr); nir_deref_instr *deref = @@ -312,6 +313,9 @@ lower_intrinsic(nir_intrinsic_instr *instr, nir_src_for_ssa(&deref->dest.ssa)); return true; } + if (instr->intrinsic == nir_intrinsic_image_deref_order || + instr->intrinsic == nir_intrinsic_image_deref_format) + unreachable("how did you even manage this?"); return false; }