Mesa (master): nir/serialize: fix build with gcc 4.4.7

[Dave Airlie]

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

Author: Dave Airlie <airl...@redhat.com>
Date:   Fri Nov  3 12:58:25 2017 +1000

nir/serialize: fix build with gcc 4.4.7

I had to build on RHEL6 today, and noticed this.

Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net>
Signed-off-by: Dave Airlie <airl...@redhat.com>

---

 src/compiler/nir/nir_serialize.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/compiler/nir/nir_serialize.c b/src/compiler/nir/nir_serialize.c
index 7951258a20..54a00c81d6 100644
--- a/src/compiler/nir/nir_serialize.c
+++ b/src/compiler/nir/nir_serialize.c
@@ -585,7 +585,7 @@ union packed_tex_data {
       unsigned component:2;
       unsigned has_texture_deref:1;
       unsigned has_sampler_deref:1;
-   };
+   } u;
 };
 
 static void
@@ -599,15 +599,15 @@ write_tex(write_ctx *ctx, const nir_tex_instr *tex)
 
    STATIC_ASSERT(sizeof(union packed_tex_data) == sizeof(uint32_t));
    union packed_tex_data packed = {
-      .sampler_dim = tex->sampler_dim,
-      .dest_type = tex->dest_type,
-      .coord_components = tex->coord_components,
-      .is_array = tex->is_array,
-      .is_shadow = tex->is_shadow,
-      .is_new_style_shadow = tex->is_new_style_shadow,
-      .component = tex->component,
-      .has_texture_deref = tex->texture != NULL,
-      .has_sampler_deref = tex->sampler != NULL,
+      .u.sampler_dim = tex->sampler_dim,
+      .u.dest_type = tex->dest_type,
+      .u.coord_components = tex->coord_components,
+      .u.is_array = tex->is_array,
+      .u.is_shadow = tex->is_shadow,
+      .u.is_new_style_shadow = tex->is_new_style_shadow,
+      .u.component = tex->component,
+      .u.has_texture_deref = tex->texture != NULL,
+      .u.has_sampler_deref = tex->sampler != NULL,
    };
    blob_write_uint32(ctx->blob, packed.u32);
 
@@ -636,13 +636,13 @@ read_tex(read_ctx *ctx)
 
    union packed_tex_data packed;
    packed.u32 = blob_read_uint32(ctx->blob);
-   tex->sampler_dim = packed.sampler_dim;
-   tex->dest_type = packed.dest_type;
-   tex->coord_components = packed.coord_components;
-   tex->is_array = packed.is_array;
-   tex->is_shadow = packed.is_shadow;
-   tex->is_new_style_shadow = packed.is_new_style_shadow;
-   tex->component = packed.component;
+   tex->sampler_dim = packed.u.sampler_dim;
+   tex->dest_type = packed.u.dest_type;
+   tex->coord_components = packed.u.coord_components;
+   tex->is_array = packed.u.is_array;
+   tex->is_shadow = packed.u.is_shadow;
+   tex->is_new_style_shadow = packed.u.is_new_style_shadow;
+   tex->component = packed.u.component;
 
    read_dest(ctx, &tex->dest, &tex->instr);
    for (unsigned i = 0; i < tex->num_srcs; i++) {
@@ -650,9 +650,9 @@ read_tex(read_ctx *ctx)
       read_src(ctx, &tex->src[i].src, &tex->instr);
    }
 
-   tex->texture = packed.has_texture_deref ?
+   tex->texture = packed.u.has_texture_deref ?
                   read_deref_chain(ctx, &tex->instr) : NULL;
-   tex->sampler = packed.has_sampler_deref ?
+   tex->sampler = packed.u.has_sampler_deref ?
                   read_deref_chain(ctx, &tex->instr) : NULL;
 
    return tex;

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit