Mesa (staging/19.3): spirv: Fix glsl type assert in spir2nir.

[GitLab Mirror]

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

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Wed Jan  1 14:56:26 2020 +0100

spirv: Fix glsl type assert in spir2nir.

Fixes: 624789e3708 "compiler/glsl: handle case where we have multiple users for types"
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
(cherry picked from commit 96c9483ccf5bc9116f7b754a0ccbc09097275083)

Conflicts:
	src/compiler/spirv/spirv2nir.c

---

 src/compiler/spirv/spirv2nir.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/compiler/spirv/spirv2nir.c b/src/compiler/spirv/spirv2nir.c
index 48d2694c963..d135d453cf0 100644
--- a/src/compiler/spirv/spirv2nir.c
+++ b/src/compiler/spirv/spirv2nir.c
@@ -72,6 +72,8 @@ int main(int argc, char **argv)
       return 1;
    }
 
+   glsl_type_singleton_init_or_ref();
+
    struct spirv_to_nir_options spirv_opts = {};
 
    nir_shader *nir = spirv_to_nir(map, word_count, NULL, 0,
@@ -79,5 +81,7 @@ int main(int argc, char **argv)
                                   &spirv_opts, NULL);
    nir_print_shader(nir, stderr);
 
+   glsl_type_singleton_decref();
+
    return 0;
 }