From: Jason Ekstrand <jason@jlekstrand.net>
Date: Thu, 29 Jun 2017 17:33:35 +0000 (-0700)
Subject: nir/spirv: Simplify type copying
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=55da2cfba230f7d9680090bbc754333a53a9bb03;p=mesa.git

nir/spirv: Simplify type copying

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

diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 3d9ef766111..c69cb8c8a8d 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -413,10 +413,7 @@ static struct vtn_type *
 vtn_type_copy(struct vtn_builder *b, struct vtn_type *src)
 {
    struct vtn_type *dest = ralloc(b, struct vtn_type);
-   dest->type = src->type;
-   dest->is_builtin = src->is_builtin;
-   if (src->is_builtin)
-      dest->builtin = src->builtin;
+   *dest = *src;
 
    if (!glsl_type_is_scalar(src->type)) {
       switch (glsl_get_base_type(src->type)) {
@@ -428,9 +425,6 @@ vtn_type_copy(struct vtn_builder *b, struct vtn_type *src)
       case GLSL_TYPE_FLOAT:
       case GLSL_TYPE_DOUBLE:
       case GLSL_TYPE_ARRAY:
-         dest->row_major = src->row_major;
-         dest->stride = src->stride;
-         dest->array_element = src->array_element;
          break;
 
       case GLSL_TYPE_STRUCT: {