Provide double width 4bpp output to lcd_draw_line

deltabeard · May 30, 2024 · df4c609 · df4c609
1 parent e7e73ef
commit df4c609
Show file tree

Hide file tree

Showing 5 changed files with 136 additions and 135 deletions.
diff --git a/examples/benchmark/peanut-benchmark.c b/examples/benchmark/peanut-benchmark.c
@@ -127,11 +127,7 @@ static void lcd_draw_line(struct gb_s *gb, const uint8_t pixels[160],
 
 	for (unsigned int x = 0; x < LCD_WIDTH; x++)
 	{
-#if PEANUT_GB_16BIT_COLOUR
-		priv->fb[line][x] = palette[pixels[x] & 3];
-#else
-		priv->fb[line][x] = palette[pixels[x]];
-#endif
+		priv->fb[line][x] = palette[pixels[x] & LCD_COLOUR];
 	}
 }
 #endif

diff --git a/examples/debug/peanut-debug.c b/examples/debug/peanut-debug.c
@@ -19,11 +19,11 @@
 
 #include "../../peanut_gb.h"
 
-const uint16_t lcd_palette[3][4] =
+const uint16_t lcd_palette[4 * 4] =
 {
-	{ 0x7FFF, 0x5294, 0x294A, 0x0000 },
-	{ 0x7FFF, 0x5294, 0x294A, 0x0000 },
-	{ 0x7FFF, 0x5294, 0x294A, 0x0000 }
+	0x7FFF, 0x5294, 0x294A, 0x0000,
+	0x7FFF, 0x5294, 0x294A, 0x0000,
+	0x7FFF, 0x5294, 0x294A, 0x0000
 };
 
 struct priv_t
@@ -180,9 +180,7 @@ void lcd_draw_line(struct gb_s *gb, const uint8_t pixels[160],
 
 	for(unsigned int x = 0; x < LCD_WIDTH; x++)
 	{
-		priv->fb[line][x] = lcd_palette
-				    [(pixels[x] & LCD_PALETTE_ALL) >> 4]
-				    [pixels[x] & 3];
+		priv->fb[line][x] = lcd_palette[pixels[x] & (LCD_COLOUR | LCD_PALETTE_ALL)];
 	}
 }
 #endif

diff --git a/examples/mini_fb/peanut_minifb.c b/examples/mini_fb/peanut_minifb.c
@@ -115,7 +115,7 @@ void lcd_draw_line(struct gb_s *gb, const uint8_t pixels[160],
 	const uint32_t palette[] = { 0xFFFFFF, 0xA5A5A5, 0x525252, 0x000000 };
 
 	for(unsigned int x = 0; x < LCD_WIDTH; x++)
-		priv->fb[line][x] = palette[pixels[x] & 3];
+		priv->fb[line][x] = palette[pixels[x] & LCD_COLOUR];
 }
 #endif