Finishing touches.

Source/Core/VideoCommon/Src/VertexShaderGen.h

@@ -71,22 +71,26 @@ struct vertex_shader_uid_data
 	u32 NumValues() const { return num_values; }
 
 	u32 components;
-	u32 num_values : 16; // TODO: Shouldn't be a u32
+	u32 num_values : 16; // TODO: u8 might be enough, actually
 	u32 numColorChans : 2;
 	u32 numTexGens : 4;
 
 	u32 dualTexTrans_enabled : 1;
 
-	u32 texMtxInfo_n_projection : 16; // XF_TEXPROJ_X
+	u32 texMtxInfo_n_projection : 16; // Stored separately to guarantee that the texMtxInfo struct is 8 bits wide
 	struct {
-		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]; // TODO: Wasting space
+		u32 inputform : 2;
+		u32 texgentype : 3;
+		u32 sourcerow : 5;
+		u32 embosssourceshift : 3;
+		u32 embosslightshift : 3;
+	} texMtxInfo[8];
 
-	u8 postMtxInfo[8]; // index + normalize + 1 padding bit, TODO: Can be made a struct again..
+	struct {
+		u32 index : 6;
+		u32 normalize : 1;
+		u32 pad : 1;
+	} postMtxInfo[8];
 
 	LightingUidData lighting;
 };