From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 12 Jan 2016 09:31:10 +0000 (-0800)
Subject: nir/spirv: Allow non-block variables with interface types in lists
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=62e56492c3caa3979e5064fe177a9d030b0a0f2c;p=mesa.git

nir/spirv: Allow non-block variables with interface types in lists

The original objective was to disallow UBO and SSBO variables from the
variable lists.  This was accidentally broken in b208620fd when fixing some
other interface issues.
---

diff --git a/src/glsl/nir/spirv/spirv_to_nir.c b/src/glsl/nir/spirv/spirv_to_nir.c
index 78d5940a75e..71e589d88b7 100644
--- a/src/glsl/nir/spirv/spirv_to_nir.c
+++ b/src/glsl/nir/spirv/spirv_to_nir.c
@@ -1816,7 +1816,7 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
       /* Interface block variables aren't actually going to be referenced
        * by the generated NIR, so we don't put them in the list
        */
-      if (var->interface_type)
+      if (var->interface_type && glsl_type_is_struct(var->interface_type))
          break;
 
       if (var->data.mode == nir_var_local) {