From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Sat, 1 Jul 2017 00:59:06 +0000 (-0700)
Subject: nir/spirv: Stop trying to convert pointers to SSA in glsl450
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0bdc622d431ba15c8ef5ab2ef08790e2e7554eff;p=mesa.git

nir/spirv: Stop trying to convert pointers to SSA in glsl450

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
---

diff --git a/src/compiler/spirv/vtn_glsl450.c b/src/compiler/spirv/vtn_glsl450.c
index 1d7e2b8d95b..c30dcc74add 100644
--- a/src/compiler/spirv/vtn_glsl450.c
+++ b/src/compiler/spirv/vtn_glsl450.c
@@ -483,8 +483,13 @@ handle_glsl450_alu(struct vtn_builder *b, enum GLSLstd450 entrypoint,
    /* Collect the various SSA sources */
    unsigned num_inputs = count - 5;
    nir_ssa_def *src[3] = { NULL, };
-   for (unsigned i = 0; i < num_inputs; i++)
+   for (unsigned i = 0; i < num_inputs; i++) {
+      /* These are handled specially below */
+      if (vtn_untyped_value(b, w[i + 5])->value_type == vtn_value_type_pointer)
+         continue;
+
       src[i] = vtn_ssa_value(b, w[i + 5])->def;
+   }
 
    switch (entrypoint) {
    case GLSLstd450Radians: