From: Connor Abbott <connor.w.abbott@intel.com>
Date: Sat, 4 Jul 2015 22:51:24 +0000 (-0700)
Subject: nir/spirv: fix a bug with structure creation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=15047514c9503313427b2467334624f2e697430d;p=mesa.git

nir/spirv: fix a bug with structure creation

We were creating 2 extra bogus fields.
---

diff --git a/src/glsl/nir/spirv_to_nir.c b/src/glsl/nir/spirv_to_nir.c
index ed23a9cb747..4b97a862eda 100644
--- a/src/glsl/nir/spirv_to_nir.c
+++ b/src/glsl/nir/spirv_to_nir.c
@@ -452,7 +452,7 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
 
       const char *name = val->name ? val->name : "struct";
 
-      val->type->type = glsl_struct_type(fields, count, name);
+      val->type->type = glsl_struct_type(fields, num_fields, name);
       return;
    }