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

Author: Jason Ekstrand <[email protected]>
Date:   Fri Jun 30 17:59:06 2017 -0700

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

Reviewed-by: Connor Abbott <[email protected]>

---

 src/compiler/spirv/vtn_glsl450.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/compiler/spirv/vtn_glsl450.c b/src/compiler/spirv/vtn_glsl450.c
index 1d7e2b8d95..c30dcc74ad 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:

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to