commit 76b9a6aa7e14dd02a702532da5a1f9ab0b7bbbe8
author Nicolas Capens <capn@google.com> Fri Jun 12 17:19:31 2015 -0400
committer Nicolas Capens <capn@google.com> Mon Jun 15 21:15:40 2015 +0000
tree 9d3c9d742b1dcf24b044e19518bd28cc30f6e837
parent 76a343af4ea1f781a56fec006b5fe67a5615d5f8

Simplify int4 and float4 types.

Change-Id: Id0d55c1364fc3db05821eb6ef666aed8c5713e31
Reviewed-on: https://swiftshader-review.googlesource.com/3503
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

src/Common/Types.hpp

diff --git a/src/Common/Types.hpp b/src/Common/Types.hpp
index 44989d4..1337f4d 100644
--- a/src/Common/Types.hpp
+++ b/src/Common/Types.hpp
@@ -58,15 +58,12 @@
 
 	ALIGN(16, struct int4
 	{
-		struct
-		{
-			int x;
-			int y;
-			int z;
-			int w;
-		};
+		int x;
+		int y;
+		int z;
+		int w;
 
-		int &operator[](int i)	
+		int &operator[](int i)
 		{
 			return (&x)[i];
 		}
@@ -76,12 +73,12 @@
 			return (&x)[i];
 		}
 
-		bool operator!=(int4 &rhs)
+		bool operator!=(const int4 &rhs)
 		{
 			return x != rhs.x || y != rhs.y || z != rhs.z || w != rhs.w;
 		}
 
-		bool operator==(int4 &rhs)
+		bool operator==(const int4 &rhs)
 		{
 			return x == rhs.x && y == rhs.y && z == rhs.z && w == rhs.w;
 		}
@@ -89,26 +86,12 @@
 
 	ALIGN(16, struct float4
 	{
-		union
-		{
-			struct
-			{
-				float x;
-				float y;
-				float z;
-				float w;
-			};
+		float x;
+		float y;
+		float z;
+		float w;
 
-			struct
-			{
-				float r;
-				float g;
-				float b;
-				float a;
-			};
-		};
-
-		float &operator[](int i)	
+		float &operator[](int i)
 		{
 			return (&x)[i];
 		}
@@ -118,12 +101,12 @@
 			return (&x)[i];
 		}
 
-		bool operator!=(float4 &rhs)
+		bool operator!=(const float4 &rhs)
 		{
 			return x != rhs.x || y != rhs.y || z != rhs.z || w != rhs.w;
 		}
 
-		bool operator==(float4 &rhs)
+		bool operator==(const float4 &rhs)
 		{
 			return x == rhs.x && y == rhs.y && z == rhs.z && w == rhs.w;
 		}

src/OpenGL/libGL/Context.cpp

diff --git a/src/OpenGL/libGL/Context.cpp b/src/OpenGL/libGL/Context.cpp
index 1a7bdfb..635e8ab 100644
--- a/src/OpenGL/libGL/Context.cpp
+++ b/src/OpenGL/libGL/Context.cpp
@@ -3482,10 +3482,10 @@
 	v.P.y = y;

 	v.P.z = z;

 	v.P.w = w;

-    v.C.r = mState.vertexAttribute[sw::Color0].mCurrentValue[0];

-	v.C.g = mState.vertexAttribute[sw::Color0].mCurrentValue[1];

-	v.C.b = mState.vertexAttribute[sw::Color0].mCurrentValue[2];

-	v.C.a = mState.vertexAttribute[sw::Color0].mCurrentValue[3];

+    v.C.x = mState.vertexAttribute[sw::Color0].mCurrentValue[0];

+	v.C.y = mState.vertexAttribute[sw::Color0].mCurrentValue[1];

+	v.C.z = mState.vertexAttribute[sw::Color0].mCurrentValue[2];

+	v.C.w = mState.vertexAttribute[sw::Color0].mCurrentValue[3];

 	v.N.x = mState.vertexAttribute[sw::Normal].mCurrentValue[0];

 	v.N.y = mState.vertexAttribute[sw::Normal].mCurrentValue[1];

 	v.N.z = mState.vertexAttribute[sw::Normal].mCurrentValue[2];