Mesa (main): nir/lower_samplers_as_deref: rewrite more image intrinsics

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: b0c40bc9054404c1b0e42516b72d6d9d070a4c10
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b0c40bc9054404c1b0e42516b72d6d9d070a4c10

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Oct 22 14:04:45 2021 -0400

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 <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13489>

---

 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;
 }