From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 22 Dec 2015 05:20:50 +0000 (-0800)
Subject: spirv/nir: Handle non-vector extractions in vtn_composite_extract
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=af74ce5a19315284f229277b44b84bede5be4d99;p=mesa.git

spirv/nir: Handle non-vector extractions in vtn_composite_extract
---

diff --git a/src/glsl/nir/spirv_to_nir.c b/src/glsl/nir/spirv_to_nir.c
index d56f9be4447..23c2c481153 100644
--- a/src/glsl/nir/spirv_to_nir.c
+++ b/src/glsl/nir/spirv_to_nir.c
@@ -2824,6 +2824,8 @@ vtn_composite_extract(struct vtn_builder *b, struct vtn_ssa_value *src,
          ret->type = glsl_scalar_type(glsl_get_base_type(cur->type));
          ret->def = vtn_vector_extract(b, cur->def, indices[i]);
          return ret;
+      } else {
+         cur = cur->elems[indices[i]];
       }
    }