From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 11 Jun 2010 22:49:49 +0000 (-0700)
Subject: ir_constant_visitor: Use 'union ir_constant_data' instead of open-coded version
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0bb70a30d5adbbd2b187f3e714420f2ce6f49046;p=mesa.git

ir_constant_visitor: Use 'union ir_constant_data' instead of open-coded version
---

diff --git a/ir_constant_expression.cpp b/ir_constant_expression.cpp
index a3ce6e7e591..4c92478db1d 100644
--- a/ir_constant_expression.cpp
+++ b/ir_constant_expression.cpp
@@ -558,11 +558,7 @@ ir_constant_visitor::visit(ir_swizzle *ir)
    this->value = NULL;
 
    if (v != NULL) {
-      union {
-	 float f[4];
-	 unsigned u[4];
-	 bool b[4];
-      } data;
+      ir_constant_data data;
 
       const unsigned swiz_idx[4] = {
 	 ir->mask.x, ir->mask.y, ir->mask.z, ir->mask.w
@@ -615,10 +611,7 @@ ir_constant_visitor::visit(ir_dereference_array *ir)
 	  */
 	 const unsigned mat_idx = column * column_type->vector_elements;
 
-	 union {
-	    unsigned u[4];
-	    float f[4];
-	 } data;
+	 ir_constant_data data;
 
 	 switch (column_type->base_type) {
 	 case GLSL_TYPE_UINT: