Support different component orders for decoding RGB565.

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

Support different component orders for decoding RGB565.
6e0116fa · Nicolas Capens · 303d2407 · 6e0116fa
Commit 6e0116fa authored Jun 04, 2015 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 7 deletions

Image.cpp src/OpenGL/common/Image.cpp +21 -7

No files found.
--- a/src/OpenGL/common/Image.cpp
+++ b/src/OpenGL/common/Image.cpp
@@ -182,15 +182,29 @@ namespace
 	void LoadImageRow<RGB565>(const unsigned char *source, unsigned char *dest, GLint xoffset, GLsizei width, sw::Format internalFormat)
 	{
 		const unsigned short *source565 = reinterpret_cast<const unsigned short*>(source);
-		unsigned char *dest565 = dest + xoffset * 4;
+		unsigned char *destB = dest + xoffset * 4;
-		for(int x = 0; x < width; x++)
+		if(internalFormat == sw::FORMAT_X8R8G8B8 || internalFormat == sw::FORMAT_A8R8G8B8)
+		{
+			for(int x = 0; x < width; x++)
+			{
+				unsigned short rgba = source565[x];
+				destB[4 * x + 0] = ((rgba & 0x001F) << 3) | ((rgba & 0x001F) >> 2);
+				destB[4 * x + 1] = ((rgba & 0x07E0) >> 3) | ((rgba & 0x07E0) >> 9);
+				destB[4 * x + 2] = ((rgba & 0xF800) >> 8) | ((rgba & 0xF800) >> 13);
+				destB[4 * x + 3] = 0xFF;
+			}
+		}
+		else   // internalFormat == sw::FORMAT_X8B8G8R8 || internalFormat == sw::FORMAT_A8B8G8R8
 		{
-			unsigned short rgba = source565[x];
+			for(int x = 0; x < width; x++)
-			dest565[4 * x + 0] = ((rgba & 0x001F) << 3) | ((rgba & 0x001F) >> 2);
+			{
-			dest565[4 * x + 1] = ((rgba & 0x07E0) >> 3) | ((rgba & 0x07E0) >> 9);
+				unsigned short rgba = source565[x];
-			dest565[4 * x + 2] = ((rgba & 0xF800) >> 8) | ((rgba & 0xF800) >> 13);
+				destB[4 * x + 0] = ((rgba & 0xF800) >> 8) | ((rgba & 0xF800) >> 13);
-			dest565[4 * x + 3] = 0xFF;
+				destB[4 * x + 1] = ((rgba & 0x07E0) >> 3) | ((rgba & 0x07E0) >> 9);
+				destB[4 * x + 2] = ((rgba & 0x001F) << 3) | ((rgba & 0x001F) >> 2);
+				destB[4 * x + 3] = 0xFF;
+			}
 		}
 	}