nir: Make nir_const_value a union

There's no good reason for it to be a struct of an anonymous union.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96221
Tested-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 96246f6d634e404c220c9f631d923dc877c9d29f..2e1bdfb429e626c10f2a8a280756672bb78910a3 100644 (file)
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -1266,15 +1266,13 @@ nir_tex_instr_src_index(nir_tex_instr *instr, nir_tex_src_type type)
    return -1;
 }
 
-typedef struct {
-   union {
-      float f32[4];
-      double f64[4];
-      int32_t i32[4];
-      uint32_t u32[4];
-      int64_t i64[4];
-      uint64_t u64[4];
-   };
+typedef union {
+   float f32[4];
+   double f64[4];
+   int32_t i32[4];
+   uint32_t u32[4];
+   int64_t i64[4];
+   uint64_t u64[4];
 } nir_const_value;
 
 typedef struct {

diff --git a/src/compiler/nir/nir_constant_expressions.py b/src/compiler/nir/nir_constant_expressions.py
index e36dc4853b5cc3e24090bf4c1b698e130f102d3c..96d52557bd79aa948cb627b38777128f0258e119 100644 (file)
--- a/src/compiler/nir/nir_constant_expressions.py
+++ b/src/compiler/nir/nir_constant_expressions.py
@@ -270,7 +270,7 @@ static nir_const_value
 evaluate_${name}(unsigned num_components, unsigned bit_size,
                  nir_const_value *_src)
 {
-   nir_const_value _dst_val = { { {0, 0, 0, 0} } };
+   nir_const_value _dst_val = { {0, } };
 
    switch (bit_size) {
    % for bit_size in [32, 64]: