sms wip: random tweaks, refactoring (palette, sound stuff, etc)

[picodrive.git] / pico / draw.c

diff --git a/pico/draw.c b/pico/draw.c
index 747f428..8647a36 100644 (file)
--- a/pico/draw.c
+++ b/pico/draw.c
@@ -53,8 +53,8 @@ int  HighPreSpr[80*2+1]; // slightly preprocessed sprites
 #define SPRL_LO_ABOVE_HI 0x10 // low priority sprites may be on top of hi\r
 unsigned char HighLnSpr[240][3 + MAX_LINE_SPRITES]; // sprite_count, ^flags, tile_count, [spritep]...\r
 \r
-int rendstatus = 0;\r
-int DrawScanline = 0;\r
+int rendstatus, rendstatus_old;\r
+int DrawScanline;\r
 int PicoDrawMask = -1;\r
 \r
 static int skip_next_line=0;\r
@@ -79,7 +79,6 @@ void DrawTilesFromCache(int *hc, int sh, int rlim);
 void DrawSpritesSHi(unsigned char *sprited);\r
 void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells);\r
 void FinalizeLineBGR444(int sh);\r
-void FinalizeLineRGB555(int sh);\r
 void *blockcpy(void *dst, const void *src, size_t n);\r
 void blockcpy_or(void *dst, void *src, size_t n, int pat);\r
 #else\r
@@ -1160,20 +1159,24 @@ unsigned short HighPal[0x100];
 #ifndef _ASM_DRAW_C\r
 void PicoDoHighPal555(int sh)\r
 {\r
+  unsigned int *spal, *dpal;\r
   unsigned short *pal=HighPal;\r
   int i, t;\r
 \r
   Pico.m.dirtyPal = 0;\r
 \r
-  {\r
-    unsigned int *spal=(void *)Pico.cram;\r
-    unsigned int *dpal=(void *)HighPal;\r
-    for (i = 0x3f/2; i >= 0; i--)\r
+  spal = (void *)Pico.cram;\r
+  dpal = (void *)HighPal;\r
+\r
+  for (i = 0; i < 0x40; i++) {\r
+    unsigned int t = spal[i];\r
 #ifdef USE_BGR555\r
-      dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);\r
+    t = ((t & 0x000e000e)<< 1) | ((t & 0x00e000e0)<<3) | ((t & 0x0e000e00)<<4);\r
 #else\r
-      dpal[i] = ((spal[i]&0x000f000f)<<12)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)>>7);\r
+    t = ((t & 0x000e000e)<<12) | ((t & 0x00e000e0)<<3) | ((t & 0x0e000e00)>>7);\r
 #endif\r
+    t |= (t >> 3) & 0x18e318e3;\r
+    dpal[i] = t;\r
   }\r
 \r
   if (sh)\r
@@ -1227,7 +1230,7 @@ static void FinalizeLineBGR444(int sh)
 }\r
 \r
 \r
-static void FinalizeLineRGB555(int sh)\r
+void FinalizeLineRGB555(int sh)\r
 {\r
   unsigned short *pd=DrawLineDest;\r
   unsigned char  *ps=HighCol+8;\r
@@ -1265,7 +1268,7 @@ static void FinalizeLineRGB555(int sh)
 \r
 static void FinalizeLine8bit(int sh)\r
 {\r
-  unsigned char *pd=DrawLineDest;\r
+  unsigned char *pd = DrawLineDest;\r
   int len, rs = rendstatus;\r
   static int dirty_count;\r
 \r
@@ -1287,7 +1290,8 @@ static void FinalizeLine8bit(int sh)
   if (Pico.video.reg[12]&1) {\r
     len = 320;\r
   } else {\r
-    if (!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32;\r
+    if (!(PicoOpt & POPT_DIS_32C_BORDER))\r
+      pd += 32;\r
     len = 256;\r
   }\r
 \r
@@ -1407,12 +1411,22 @@ PICO_INTERNAL void PicoFrameStart(void)
   if (Pico.video.reg[1] & 8)\r
     rendstatus |= PDRAW_240LINES;\r
 \r
+  DrawScanline = 0;\r
+  skip_next_line = 0;\r
+\r
+  if (rendstatus != rendstatus_old) {\r
+    rendstatus_old = rendstatus;\r
+    emu_video_mode_change((rendstatus & PDRAW_240LINES) ? 0 : 8,\r
+      (rendstatus & PDRAW_240LINES) ? 240 : 224,\r
+      (Pico.video.reg[12] & 1) ? 0 : 1);\r
+  }\r
+\r
+  if (PicoOpt & POPT_ALT_RENDERER)\r
+    return;\r
+\r
   if (Pico.m.dirtyPal)\r
     Pico.m.dirtyPal = 2; // reset dirty if needed\r
-\r
-  DrawScanline=0;\r
   PrepareSprites(1);\r
-  skip_next_line=0;\r
 }\r
 \r
 static void DrawBlankedLine(int line, int offs)\r