Mesa (master): clover/nir: Call vars_to_explicit_types for shared memory

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 918e444f04552c74e805885caa0db66352fac2fd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=918e444f04552c74e805885caa0db66352fac2fd

Author: Karol Herbst <kherbst at redhat.com>
Date:   Sat Aug 15 13:33:29 2020 +0200

clover/nir: Call vars_to_explicit_types for shared memory

This is required for shared memory buffers declared with an explicit
size inside the kernel.

Signed-off-by: Karol Herbst <kherbst at redhat.com>
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6367>

---

 src/gallium/frontends/clover/nir/invocation.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/frontends/clover/nir/invocation.cpp b/src/gallium/frontends/clover/nir/invocation.cpp
index 36ee8c9a2ea..1faf8a6eb21 100644
--- a/src/gallium/frontends/clover/nir/invocation.cpp
+++ b/src/gallium/frontends/clover/nir/invocation.cpp
@@ -145,6 +145,9 @@ module clover::nir::spirv_to_nir(const module &mod, const device &dev,
       NIR_PASS_V(nir, nir_lower_vars_to_ssa);
       NIR_PASS_V(nir, nir_opt_dce);
 
+      NIR_PASS_V(nir, nir_lower_vars_to_explicit_types, nir_var_mem_shared,
+                 glsl_get_cl_type_size_align);
+
       /* use offsets for shader_in and shared memory */
       nir_variable_mode modes = (nir_variable_mode)(
          nir_var_shader_in |