From 597a6b34cb146c9b3488af5006386c3a18109446 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sun, 23 Jun 2013 19:28:36 +0200
Subject: [PATCH] Compactify VertexShader uid struct.

---
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |  8 ++++----
 Source/Core/VideoCommon/Src/VertexShaderGen.h | 20 +++++++++----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 8c157dc030..a7e3a3d923 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -376,7 +376,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 				break;
 			case XF_TEXGEN_REGULAR:
 			default:
-				uid_data.texMtxInfo[i].projection = xfregs.texMtxInfo[i].projection;
+				uid_data.texMtxInfo_n_projection |= xfregs.texMtxInfo[i].projection << i;
 				if (components & (VB_HAS_TEXMTXIDX0<<i))
 				{
 					out.Write("int tmp = int(tex%d.z);\n", i);
@@ -395,13 +395,13 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 				break;
 		}
 
-		uid_data.dualTexTrans.enabled = xfregs.dualTexTrans.enabled;
+		uid_data.dualTexTrans_enabled = xfregs.dualTexTrans.enabled;
 		// CHECKME: does this only work for regular tex gen types?
 		if (xfregs.dualTexTrans.enabled && texinfo.texgentype == XF_TEXGEN_REGULAR)
 		{
 			const PostMtxInfo& postInfo = xfregs.postMtxInfo[i];
 
-			uid_data.postMtxInfo[i].index = xfregs.postMtxInfo[i].index;
+			uid_data.postMtxInfo[i] = xfregs.postMtxInfo[i].index;
 			int postidx = postInfo.index;
 			out.Write("float4 P0 = " I_POSTTRANSFORMMATRICES"[%d];\n"
 				"float4 P1 = " I_POSTTRANSFORMMATRICES"[%d];\n"
@@ -419,7 +419,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 			}
 			else
 			{
-				uid_data.postMtxInfo[i].normalize = xfregs.postMtxInfo[i].normalize;
+				uid_data.postMtxInfo[i] |= xfregs.postMtxInfo[i].normalize << 6;
 				if (postInfo.normalize)
 					out.Write("o.tex%d.xyz = normalize(o.tex%d.xyz);\n", i, i);
 
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index 3f3087783d..3b233a22fe 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -63,32 +63,30 @@ const s_svar VSVar_Loc[] = {  {I_POSNORMALMATRIX, C_POSNORMALMATRIX, 6 },
 						{I_DEPTHPARAMS, C_DEPTHPARAMS, 1 },
 						};
 
-#pragma pack(4)
+#pragma pack(1)
 
 struct vertex_shader_uid_data
 {
-	u32 num_values; // TODO: Shouldn't be a u32
 
 	u32 NumValues() const { return num_values; }
+
 	u32 components;
+	u32 num_values : 16; // TODO: Shouldn't be a u32
 	u32 numColorChans : 2;
 	u32 numTexGens : 4;
 
+	u32 dualTexTrans_enabled : 1;
+
+	u32 texMtxInfo_n_projection : 16; // XF_TEXPROJ_X
 	struct {
-		u32 projection : 1; // XF_TEXPROJ_X
 		u32 inputform : 2; // XF_TEXINPUT_X
 		u32 texgentype : 3; // XF_TEXGEN_X
 		u32 sourcerow : 5; // XF_SRCGEOM_X
 		u32 embosssourceshift : 3; // what generated texcoord to use
 		u32 embosslightshift : 3; // light index that is used
-	} texMtxInfo[8];
-	struct {
-		u32 index : 6; // base row of dual transform matrix
-		u32 normalize : 1; // normalize before send operation
-	} postMtxInfo[8];
-	struct {
-		u32 enabled : 1;
-	} dualTexTrans;
+	} texMtxInfo[8]; // TODO: Wasting space
+
+	u8 postMtxInfo[8]; // index + normalize + 1 padding bit, TODO: Can be made a struct again..
 
 	LightingUidData lighting;
 };