TextureDecoder: Clean up the code style

For a long time, we've had ugly and inconsistent function names here as
helpers, names like "decodebytesRGB5A3rgba" which are absolutely
incomprehensible to understand. Fix this by introducing a new consistent
naming scheme, where the above function now becomes "DecodeBytes_RGB5A3".

1 files changed, 71 insertions, 71 deletions

diff --git a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp
index 92a7687f4e..663e73f756 100644
--- a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp
+++ b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp
@@ -17,7 +17,24 @@
 // Decodes all known GameCube/Wii texture formats.
 // by ector
 
-static inline u32 decode5A3RGBA(u16 val)
+static inline u32 DecodePixel_IA8(u16 val)
+{
+	int a = val & 0xFF;
+	int i = val >> 8;
+	return i | (i<<8) | (i<<16) | (a<<24);
+}
+
+static inline u32 DecodePixel_RGB565(u16 val)
+{
+	int r,g,b,a;
+	r=Convert5To8((val>>11) & 0x1f);
+	g=Convert6To8((val>>5 ) & 0x3f);
+	b=Convert5To8((val    ) & 0x1f);
+	a=0xFF;
+	return  r | (g<<8) | (b << 16) | (a << 24);
+}
+
+static inline u32 DecodePixel_RGB5A3(u16 val)
 {
 	int r,g,b,a;
 	if ((val&0x8000))
@@ -37,76 +54,53 @@ static inline u32 decode5A3RGBA(u16 val)
 	return r | (g<<8) | (b << 16) | (a << 24);
 }
 
-static inline u32 decode565RGBA(u16 val)
-{
-	int r,g,b,a;
-	r=Convert5To8((val>>11) & 0x1f);
-	g=Convert6To8((val>>5 ) & 0x3f);
-	b=Convert5To8((val    ) & 0x1f);
-	a=0xFF;
-	return  r | (g<<8) | (b << 16) | (a << 24);
-}
-static inline u32 decodeIA8Swapped(u16 val)
-{
-	int a = val & 0xFF;
-	int i = val >> 8;
-	return i | (i<<8) | (i<<16) | (a<<24);
-}
-
-struct DXTBlock
-{
-	u16 color1;
-	u16 color2;
-	u8 lines[4];
-};
-
-static inline u32 decodePalettedPixel(u16 pixel, TlutFormat tlutfmt)
+static inline u32 DecodePixel_Paletted(u16 pixel, TlutFormat tlutfmt)
 {
 	switch (tlutfmt)
 	{
 	case GX_TL_IA8:
-		return decodeIA8Swapped(pixel);
+		return DecodePixel_IA8(pixel);
 	case GX_TL_RGB565:
-		return decode565RGBA(Common::swap16(pixel));
+		return DecodePixel_RGB565(Common::swap16(pixel));
 	case GX_TL_RGB5A3:
-		return decode5A3RGBA(Common::swap16(pixel));
+		return DecodePixel_RGB5A3(Common::swap16(pixel));
 	default:
 		return 0;
 	}
 }
 
-static inline void decodeC4(u32 *dst, const u8 *src, const u8* tlut_, TlutFormat tlutfmt)
+static inline void DecodeBytes_C4(u32 *dst, const u8 *src, const u8* tlut_, TlutFormat tlutfmt)
 {
 	const u16* tlut = (u16*) tlut_;
 	for (int x = 0; x < 4; x++)
 	{
 		u8 val = src[x];
-		*dst++ = decodePalettedPixel(tlut[val >> 4], tlutfmt);
-		*dst++ = decodePalettedPixel(tlut[val & 0xF], tlutfmt);
+		*dst++ = DecodePixel_Paletted(tlut[val >> 4], tlutfmt);
+		*dst++ = DecodePixel_Paletted(tlut[val & 0xF], tlutfmt);
 	}
 }
 
-static inline void decodeC8(u32 *dst, const u8 *src, const u8* tlut_, TlutFormat tlutfmt)
+static inline void DecodeBytes_C8(u32 *dst, const u8 *src, const u8* tlut_, TlutFormat tlutfmt)
 {
 	const u16* tlut = (u16*) tlut_;
 	for (int x = 0; x < 8; x++)
 	{
 		u8 val = src[x];
-		*dst++ = decodePalettedPixel(tlut[val], tlutfmt);
+		*dst++ = DecodePixel_Paletted(tlut[val], tlutfmt);
 	}
 }
 
-static inline void decodeC14X2(u32 *dst, const u16 *src, const u8* tlut_, TlutFormat tlutfmt)
+static inline void DecodeBytes_C14X2(u32 *dst, const u16 *src, const u8* tlut_, TlutFormat tlutfmt)
 {
 	const u16* tlut = (u16*) tlut_;
 	for (int x = 0; x < 4; x++)
 	{
 		u16 val = Common::swap16(src[x]);
-		*dst++ = decodePalettedPixel(tlut[(val & 0x3FFF)], tlutfmt);
+		*dst++ = DecodePixel_Paletted(tlut[(val & 0x3FFF)], tlutfmt);
 	}
 }
 
-static inline void decodebytesIA4RGBA(u32 *dst, const u8 *src)
+static inline void DecodeBytes_IA4(u32 *dst, const u8 *src)
 {
 	for (int x = 0; x < 8; x++)
 	{
@@ -117,20 +111,20 @@ static inline void decodebytesIA4RGBA(u32 *dst, const u8 *src)
 	}
 }
 
-static inline void decodebytesRGB5A3rgba(u32 *dst, const u16 *src)
+static inline void DecodeBytes_RGB5A3(u32 *dst, const u16 *src)
 {
 #if 0
 	for (int x = 0; x < 4; x++)
-		dst[x] = decode5A3RGBA(Common::swap16(src[x]));
+		dst[x] = DecodePixel_RGB5A3(Common::swap16(src[x]));
 #else
-	dst[0] = decode5A3RGBA(Common::swap16(src[0]));
-	dst[1] = decode5A3RGBA(Common::swap16(src[1]));
-	dst[2] = decode5A3RGBA(Common::swap16(src[2]));
-	dst[3] = decode5A3RGBA(Common::swap16(src[3]));
+	dst[0] = DecodePixel_RGB5A3(Common::swap16(src[0]));
+	dst[1] = DecodePixel_RGB5A3(Common::swap16(src[1]));
+	dst[2] = DecodePixel_RGB5A3(Common::swap16(src[2]));
+	dst[3] = DecodePixel_RGB5A3(Common::swap16(src[3]));
 #endif
 }
 
-static inline void decodebytesARGB8_4ToRgba(u32 *dst, const u16 *src, const u16 * src2)
+static inline void DecodeBytes_RGBA8(u32 *dst, const u16 *src, const u16 * src2)
 {
 #if 0
 	for (int x = 0; x < 4; x++)
@@ -145,12 +139,19 @@ static inline void decodebytesARGB8_4ToRgba(u32 *dst, const u16 *src, const u16
 #endif
 }
 
-static inline u32 makeRGBA(int r, int g, int b, int a)
+struct DXTBlock
+{
+	u16 color1;
+	u16 color2;
+	u8 lines[4];
+};
+
+static inline u32 MakeRGBA(int r, int g, int b, int a)
 {
 	return (a<<24)|(b<<16)|(g<<8)|r;
 }
 
-static void decodeDXTBlockRGBA(u32 *dst, const DXTBlock *src, int pitch)
+static void DecodeDXTBlock(u32 *dst, const DXTBlock *src, int pitch)
 {
 	// S3TC Decoder (Note: GCN decodes differently from PC so we can't use native support)
 	// Needs more speed.
@@ -163,22 +164,22 @@ static void decodeDXTBlockRGBA(u32 *dst, const DXTBlock *src, int pitch)
 	int red1 = Convert5To8((c1 >> 11) & 0x1F);
 	int red2 = Convert5To8((c2 >> 11) & 0x1F);
 	int colors[4];
-	colors[0] = makeRGBA(red1, green1, blue1, 255);
-	colors[1] = makeRGBA(red2, green2, blue2, 255);
+	colors[0] = MakeRGBA(red1, green1, blue1, 255);
+	colors[1] = MakeRGBA(red2, green2, blue2, 255);
 	if (c1 > c2)
 	{
 		int blue3 = ((blue2 - blue1) >> 1) - ((blue2 - blue1) >> 3);
 		int green3 = ((green2 - green1) >> 1) - ((green2 - green1) >> 3);
 		int red3 = ((red2 - red1) >> 1) - ((red2 - red1) >> 3);
-		colors[2] = makeRGBA(red1 + red3, green1 + green3, blue1 + blue3, 255);
-		colors[3] = makeRGBA(red2 - red3, green2 - green3, blue2 - blue3, 255);
+		colors[2] = MakeRGBA(red1 + red3, green1 + green3, blue1 + blue3, 255);
+		colors[3] = MakeRGBA(red2 - red3, green2 - green3, blue2 - blue3, 255);
 	}
 	else
 	{
-		colors[2] = makeRGBA((red1 + red2 + 1) / 2, // Average
+		colors[2] = MakeRGBA((red1 + red2 + 1) / 2, // Average
 							(green1 + green2 + 1) / 2,
 							(blue1 + blue2 + 1) / 2, 255);
-		colors[3] = makeRGBA(red2, green2, blue2, 0);  // Color2 but transparent
+		colors[3] = MakeRGBA(red2, green2, blue2, 0);  // Color2 but transparent
 	}
 
 	for (int y = 0; y < 4; y++)
@@ -203,7 +204,6 @@ static void decodeDXTBlockRGBA(u32 *dst, const DXTBlock *src, int pitch)
 
 PC_TexFormat _TexDecoder_DecodeImpl(u32 * dst, const u8 * src, int width, int height, int texformat, const u8* tlut, TlutFormat tlutfmt)
 {
-
 	const int Wsteps4 = (width + 3) / 4;
 	const int Wsteps8 = (width + 7) / 8;
 
@@ -213,7 +213,7 @@ PC_TexFormat _TexDecoder_DecodeImpl(u32 * dst, const u8 * src, int width, int he
 		for (int y = 0; y < height; y += 8)
 			for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
 				for (int iy = 0, xStep =  8 * yStep; iy < 8; iy++,xStep++)
-					decodeC4(dst + (y + iy) * width + x, src + 4 * xStep, tlut, tlutfmt);
+					DecodeBytes_C4(dst + (y + iy) * width + x, src + 4 * xStep, tlut, tlutfmt);
 		break;
 	case GX_TF_I4:
 		{
@@ -257,14 +257,14 @@ PC_TexFormat _TexDecoder_DecodeImpl(u32 * dst, const u8 * src, int width, int he
 		for (int y = 0; y < height; y += 4)
 			for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
 				for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-					decodeC8((u32*)dst + (y + iy) * width + x, src + 8 * xStep, tlut, tlutfmt);
+					DecodeBytes_C8((u32*)dst + (y + iy) * width + x, src + 8 * xStep, tlut, tlutfmt);
 		break;
 	case GX_TF_IA4:
 		{
 			for (int y = 0; y < height; y += 4)
 				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
 					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesIA4RGBA(dst + (y + iy) * width + x, src + 8 * xStep);
+						DecodeBytes_IA4(dst + (y + iy) * width + x, src + 8 * xStep);
 		}
 		break;
 	case GX_TF_IA8:
@@ -276,10 +276,10 @@ PC_TexFormat _TexDecoder_DecodeImpl(u32 * dst, const u8 * src, int width, int he
 					{
 						u32 *ptr = dst + (y + iy) * width + x;
 						u16 *s = (u16 *)src;
-						ptr[0] = decodeIA8Swapped(s[0]);
-						ptr[1] = decodeIA8Swapped(s[1]);
-						ptr[2] = decodeIA8Swapped(s[2]);
-						ptr[3] = decodeIA8Swapped(s[3]);
+						ptr[0] = DecodePixel_IA8(s[0]);
+						ptr[1] = DecodePixel_IA8(s[1]);
+						ptr[2] = DecodePixel_IA8(s[2]);
+						ptr[3] = DecodePixel_IA8(s[3]);
 					}
 		}
 		break;
@@ -287,7 +287,7 @@ PC_TexFormat _TexDecoder_DecodeImpl(u32 * dst, const u8 * src, int width, int he
 		for (int y = 0; y < height; y += 4)
 			for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
 				for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-					decodeC14X2(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlut, tlutfmt);
+					DecodeBytes_C14X2(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlut, tlutfmt);
 		break;
 	case GX_TF_RGB565:
 		{
@@ -299,7 +299,7 @@ PC_TexFormat _TexDecoder_DecodeImpl(u32 * dst, const u8 * src, int width, int he
 						u32 *ptr = dst + (y + iy) * width + x;
 						u16 *s = (u16 *)src;
 						for (int j = 0; j < 4; j++)
-							*ptr++ = decode565RGBA(Common::swap16(*s++));
+							*ptr++ = DecodePixel_RGB565(Common::swap16(*s++));
 					}
 		}
 		break;
@@ -309,7 +309,7 @@ PC_TexFormat _TexDecoder_DecodeImpl(u32 * dst, const u8 * src, int width, int he
 			for (int y = 0; y < height; y += 4)
 				for (int x = 0; x < width; x += 4)
 					for (int iy = 0; iy < 4; iy++, src += 8)
-						decodebytesRGB5A3rgba(dst+(y+iy)*width+x, (u16*)src);
+						DecodeBytes_RGB5A3(dst+(y+iy)*width+x, (u16*)src);
 		}
 		break;
 	case GX_TF_RGBA8:  // speed critical
@@ -319,7 +319,7 @@ PC_TexFormat _TexDecoder_DecodeImpl(u32 * dst, const u8 * src, int width, int he
 				for (int x = 0; x < width; x += 4)
 				{
 					for (int iy = 0; iy < 4; iy++)
-						decodebytesARGB8_4ToRgba(dst + (y+iy)*width + x, (u16*)src + 4 * iy, (u16*)src + 4 * iy + 16);
+						DecodeBytes_RGBA8(dst + (y+iy)*width + x, (u16*)src + 4 * iy, (u16*)src + 4 * iy + 16);
 					src += 64;
 				}
 		}
@@ -331,14 +331,14 @@ PC_TexFormat _TexDecoder_DecodeImpl(u32 * dst, const u8 * src, int width, int he
 			{
 				for (int x = 0; x < width; x += 8)
 				{
-					decodeDXTBlockRGBA((u32*)dst + y * width + x, (DXTBlock*)src, width);
-										src += sizeof(DXTBlock);
-					decodeDXTBlockRGBA((u32*)dst + y * width + x + 4, (DXTBlock*)src, width);
-										src += sizeof(DXTBlock);
-					decodeDXTBlockRGBA((u32*)dst + (y + 4) * width + x, (DXTBlock*)src, width);
-										src += sizeof(DXTBlock);
-					decodeDXTBlockRGBA((u32*)dst + (y + 4) * width + x + 4, (DXTBlock*)src, width);
-										src += sizeof(DXTBlock);
+					DecodeDXTBlock((u32*)dst + y * width + x, (DXTBlock*)src, width);
+					src += sizeof(DXTBlock);
+					DecodeDXTBlock((u32*)dst + y * width + x + 4, (DXTBlock*)src, width);
+					src += sizeof(DXTBlock);
+					DecodeDXTBlock((u32*)dst + (y + 4) * width + x, (DXTBlock*)src, width);
+					src += sizeof(DXTBlock);
+					DecodeDXTBlock((u32*)dst + (y + 4) * width + x + 4, (DXTBlock*)src, width);
+					src += sizeof(DXTBlock);
 				}
 			}
 			break;