Improve rgba and rgbaq structs

Author: fjtrujy

ee/gs/include/gsInit.h

@@ -970,58 +970,65 @@ typedef union {
 		u16 y;
 		u32 z;
 	};
-} __attribute__((packed,aligned(8))) gs_xyz_t;
+} __attribute__((packed)) gs_xyz_t;
 
 typedef union {
-	u64 rgbaq;
+	u32 rgba;
 	struct {
 		u8 r;
 		u8 g;
 		u8 b;
 		u8 a;
+	};
+} __attribute__((packed)) gs_rgba_t;
+
+typedef union {
+	u64 rgbaq;
+	struct {
+		gs_rgba_t components;
 		float q;
 	};
-} __attribute__((packed,aligned(8))) gs_rgbaq_t;
+} __attribute__((packed)) gs_rgbaq_t;
 
 typedef union {
     u64 st;
     struct {
 		float s;
 		float t;
     };
-} __attribute__((packed, aligned(8))) gs_stq_t;
+} __attribute__((packed)) gs_stq_t;
 
 typedef union {
 	u128 xyz2;
 	struct {
 		gs_xyz_t xyz;
 		u64 tag;
 	};
-} __attribute__((packed,aligned(8))) gs_xyz2;
+} __attribute__((packed)) gs_xyz2;
 
 typedef union {
 	u128 rgbaq;
 	struct {
 		gs_rgbaq_t color;
 		u64 tag;
 	};
-} __attribute__((packed,aligned(8))) gs_rgbaq;
+} __attribute__((packed)) gs_rgbaq;
 
 typedef union {
 	u128 uv;
 	struct {
 		u64 coord;
 		u64 tag;
 	};
-} __attribute__((packed,aligned(8))) gs_uv;
+} __attribute__((packed)) gs_uv;
 
 typedef union {
 	u128 stq;
 	struct {
 		gs_stq_t st;
 		u64 tag;
 	};
-} __attribute__((packed, aligned(8))) gs_stq;
+} __attribute__((packed)) gs_stq;
 
 /// gsKit Point Primitive Structure
 /// This structure holds all relevant data for any

ee/gs/include/gsInline.h

@@ -173,16 +173,38 @@ static inline gs_rgbaq color_to_RGBAQ(uint8_t r, uint8_t g, uint8_t b, uint8_t a
 {
 	gs_rgbaq res;
 
-	res.color.r = r;
-	res.color.g = g;
-	res.color.b = b;
-	res.color.a = a;
+	res.color.components.r = r;
+	res.color.components.g = g;
+	res.color.components.b = b;
+	res.color.components.a = a;
 	res.color.q = q;
 	res.tag = GS_RGBAQ;
 
 	return res;
 }
 
+// If STQ coordinates are used set q to 1.0f otherwise keep it as 0.0f
+static inline gs_rgbaq rgba_to_RGBAQ(uint32_t rgba, float q)
+{
+	gs_rgbaq res;
+
+	res.color.components.rgba = rgba;
+	res.color.q = q;
+	res.tag = GS_RGBAQ;
+
+	return res;
+}
+
+static inline gs_rgbaq rgbaq_to_RGBAQ(uint64_t rgbaq)
+{
+	gs_rgbaq res;
+
+	res.color.rgbaq = rgbaq;
+	res.tag = GS_RGBAQ;
+
+	return res;
+}
+
 static inline gs_uv vertex_to_UV(const GSTEXTURE *Texture, float u, float v)
 {
 	gs_uv res;