Mesa (staging/20.2): nir/opt_intrinsics: Report progress for the gl_SampleMask optimization

[GitLab Mirror]

Module: Mesa
Branch: staging/20.2
Commit: 9595ba9abebfaa5a71bad62683d6b78e61644a42
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9595ba9abebfaa5a71bad62683d6b78e61644a42

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Thu Oct 29 10:15:46 2020 -0500

nir/opt_intrinsics: Report progress for the gl_SampleMask optimization

Fixes: d3ce8a7f6b93 "nir: optimize gl_SampleMaskIn to gl_HelperInvocation..."
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7366>
(cherry picked from commit d9c0f3627d78c33926c358f362818f9fe917c8a6)

---

 .pick_status.json                     | 2 +-
 src/compiler/nir/nir_opt_intrinsics.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 7631b18f607..b1de36c3fab 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4459,7 +4459,7 @@
         "description": "nir/opt_intrinsics: Report progress for the gl_SampleMask optimization",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "d3ce8a7f6b93e893929b81f4d6605a2a968730a1"
     },
diff --git a/src/compiler/nir/nir_opt_intrinsics.c b/src/compiler/nir/nir_opt_intrinsics.c
index 503462ecfbe..69b53459824 100644
--- a/src/compiler/nir/nir_opt_intrinsics.c
+++ b/src/compiler/nir/nir_opt_intrinsics.c
@@ -86,6 +86,7 @@ opt_intrinsics_impl(nir_function_impl *impl,
                      nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa,
                                               nir_src_for_ssa(new_expr));
                      nir_instr_remove(&alu->instr);
+                     progress = true;
                      continue;
                   }
                }