Mesa (staging/21.3): nir: Initialize nir_register::divergent

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: ee6a3656541da110a0298aa72dc7a6cb571aef80
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee6a3656541da110a0298aa72dc7a6cb571aef80

Author: Caio Oliveira <caio.oliveira at intel.com>
Date:   Wed Dec 15 00:47:36 2021 -0800

nir: Initialize nir_register::divergent

Fixes: c7fc44f9ebb ("nir/from_ssa: Respect and populate divergence information")
Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14205>
(cherry picked from commit dcc7b19cae924ecbcee88186a11df0290e5c7a8e)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index c7694583c61..ac650493a63 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -517,7 +517,7 @@
         "description": "nir: Initialize nir_register::divergent",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "c7fc44f9ebbe93f7aefc010aea4e13e29d0d67fd"
     },
diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c
index 4451089c0d7..04bcb9051cd 100644
--- a/src/compiler/nir/nir.c
+++ b/src/compiler/nir/nir.c
@@ -154,6 +154,7 @@ reg_create(void *mem_ctx, struct exec_list *list)
    reg->num_components = 0;
    reg->bit_size = 32;
    reg->num_array_elems = 0;
+   reg->divergent = false;
 
    exec_list_push_tail(list, &reg->node);