[PATCH 12/20] Fix RGB calculation for the setting that we use in Hatari

[Thomas Huth <huth@xxxxxxxxxxxxx>]

---
 src/jaguar/tom.c | 52 ++++++------------------------------------------
 1 file changed, 6 insertions(+), 46 deletions(-)

diff --git a/src/jaguar/tom.c b/src/jaguar/tom.c
index 7ce102bd..de7a3792 100644
--- a/src/jaguar/tom.c
+++ b/src/jaguar/tom.c
@@ -540,14 +540,9 @@ void TOMFillLookupTables(void)
 	// NOTE: Jaguar 16-bit (non-CRY) color is RBG 556 like so:
 	//       RRRR RBBB BBGG GGGG
 	for(uint32 i=0; i<0x10000; i++)
-//hm.		RGB16ToRGB32[i] = 0xFF000000
-//			| ((i & 0xF100) >> 8)  | ((i & 0xE000) >> 13)
-//			| ((i & 0x07C0) << 13) | ((i & 0x0700) << 8)
-//			| ((i & 0x003F) << 10) | ((i & 0x0030) << 4);
-		RGB16ToRGB32[i] = 0x000000FF
-			| ((i & 0xF100) << 16)					// Red
-			| ((i & 0x003F) << 18)					// Green
-			| ((i & 0x07C0) << 5);					// Blue
+		RGB16ToRGB32[i] = ((i & 0xF100) << 8)					// Red
+				| ((i & 0x003F) << 10)					// Green
+				| ((i & 0x07C0) >> 3);					// Blue
 
 	for(uint32 i=0; i<0x10000; i++)
 	{
@@ -559,8 +554,7 @@ void TOMFillLookupTables(void)
 			g = (((uint32)greencv[cyan][red]) * intensity) >> 8,
 			b = (((uint32)bluecv[cyan][red]) * intensity) >> 8;
 
-//hm.		CRY16ToRGB32[i] = 0xFF000000 | (b << 16) | (g << 8) | r;
-		CRY16ToRGB32[i] = 0x000000FF | (r << 24) | (g << 16) | (b << 8);
+		CRY16ToRGB32[i] = (r << 16) | (g << 8) | b;
 		MIX16ToRGB32[i] = (i & 0x01 ? RGB16ToRGB32[i] : CRY16ToRGB32[i]);
 	}
 }
@@ -696,8 +690,7 @@ void tom_render_24bpp_scanline(uint32 * backbuffer)
 		uint32 r = *current_line_buffer++;
 		current_line_buffer++;
 		uint32 b = *current_line_buffer++;
-//hm.		*backbuffer++ = 0xFF000000 | (b << 16) | (g << 8) | r;
-		*backbuffer++ = 0x000000FF | (r << 24) | (g << 16) | (r << 8);
+		*backbuffer++ = (r << 16) | (g << 8) | b;
 		width--;
 	}
 }
@@ -829,38 +822,6 @@ void TOMExecScanline(uint16 scanline, bool render)
 //So, for example, if HDB1 is less than LEFT_VISIBLE_HC, then we have to figure out where
 //in the VTLB that we start writing pixels from the Jaguar line buffer (VTLB start=0,
 //JLB=something).
-#if 0
-//
-// 24 BPP mode rendering
-//
-void tom_render_24bpp_scanline(uint32 * backbuffer)
-{
-//CHANGED TO 32BPP RENDERING
-	uint16 width = tomWidth;
-	uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800];
-
-	//New stuff--restrict our drawing...
-	uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1;
-	//NOTE: May have to check HDB2 as well!
-	int16 startPos = GET16(tomRam8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL);	// Get start position in HC ticks
-	startPos /= pwidth;
-	if (startPos < 0)
-		current_line_buffer += 4 * -startPos;
-	else
-//This should likely be 4 instead of 2 (?--not sure)
-		backbuffer += 2 * startPos, width -= startPos;
-
-	while (width)
-	{
-		uint32 g = *current_line_buffer++;
-		uint32 r = *current_line_buffer++;
-		current_line_buffer++;
-		uint32 b = *current_line_buffer++;
-		*backbuffer++ = 0xFF000000 | (b << 16) | (g << 8) | r;
-		width--;
-	}
-}
-#endif
 
 			}
 		}
@@ -869,8 +830,7 @@ void tom_render_24bpp_scanline(uint32 * backbuffer)
 			// If outside of VDB & VDE, then display the border color
 			uint32 * currentLineBuffer = TOMBackbuffer;
 			uint8 g = tomRam8[BORD1], r = tomRam8[BORD1 + 1], b = tomRam8[BORD2 + 1];
-//Hm.			uint32 pixel = 0xFF000000 | (b << 16) | (g << 8) | r;
-			uint32 pixel = 0x000000FF | (r << 24) | (g << 16) | (b << 8);
+			uint32 pixel = (b << 16) | (g << 8) | r;
 
 			for(uint32 i=0; i<tomWidth; i++)
 				*currentLineBuffer++ = pixel;
-- 
2.48.1


--MP_/VkVZp1l8MIESxWVe2vPSxV2
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename=0013-Add-memory-bank-handling-for-the-Jaguar-code.patch