Mesa (staging/20.1): nir: Add a nir_metadata_all enum value

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 3def9817d920e9cf67f3701289349cdb148189c4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3def9817d920e9cf67f3701289349cdb148189c4

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Thu May 21 20:39:30 2020 -0500

nir: Add a nir_metadata_all enum value

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5171>
(cherry picked from commit e017ee95c113b3306708f54262d614cdf7440274)

---

 .pick_status.json      | 2 +-
 src/compiler/nir/nir.h | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 176f7c7fdde..866ec7720ed 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -27166,7 +27166,7 @@
         "description": "nir: Add a nir_metadata_all enum value",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 9f6d2c5895b..9bcbc6c3315 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -2574,6 +2574,15 @@ typedef enum {
    nir_metadata_live_ssa_defs = 0x4,
    nir_metadata_not_properly_reset = 0x8,
    nir_metadata_loop_analysis = 0x10,
+
+   /** All metadata
+    *
+    * This includes all nir_metadata flags except not_properly_reset.  Passes
+    * which do not change the shader in any way should call
+    *
+    *    nir_metadata_preserve(impl, nir_metadata_all);
+    */
+   nir_metadata_all = ~nir_metadata_not_properly_reset,
 } nir_metadata;
 
 typedef struct {