more sms wip, better ROM detect, line callback change

[picodrive.git] / pico / draw.c

diff --git a/pico/draw.c b/pico/draw.c
index 4acf22f..747f428 100644 (file)
--- a/pico/draw.c
+++ b/pico/draw.c
@@ -40,7 +40,7 @@ unsigned char *HighCol=DefHighCol;
 #else\r
 unsigned char  HighCol[8+320+8];\r
 #endif\r
-unsigned short DefOutBuff[320*2];\r
+static unsigned int DefOutBuff[320*2/2];\r
 void *DrawLineDest=DefOutBuff; // pointer to dest buffer where to draw this line to\r
 \r
 static int  HighCacheA[41+1];   // caches for high layers\r
@@ -1269,7 +1269,7 @@ static void FinalizeLine8bit(int sh)
   int len, rs = rendstatus;\r
   static int dirty_count;\r
 \r
-  if (!sh && Pico.m.dirtyPal == 1 && DrawScanline < 222)\r
+  if (!sh && Pico.m.dirtyPal == 1)\r
   {\r
     // a hack for mid-frame palette changes\r
     if (!(rs & PDRAW_SONIC_MODE))\r
@@ -1306,22 +1306,6 @@ static void (*FinalizeLine)(int sh);
 \r
 // --------------------------------------------\r
 \r
-static void DrawBlankedLine(void)\r
-{\r
-  int sh=(Pico.video.reg[0xC]&8)>>3; // shadow/hilight?\r
-\r
-  if (PicoScanBegin != NULL)\r
-    PicoScanBegin(DrawScanline);\r
-\r
-  BackFill(Pico.video.reg[7], sh);\r
-\r
-  if (FinalizeLine != NULL)\r
-    FinalizeLine(sh);\r
-\r
-  if (PicoScanEnd != NULL)\r
-    PicoScanEnd(DrawScanline);\r
-}\r
-\r
 static int DrawDisplay(int sh)\r
 {\r
   unsigned char *sprited = &HighLnSpr[DrawScanline][0];\r
@@ -1420,23 +1404,46 @@ PICO_INTERNAL void PicoFrameStart(void)
   rendstatus = 0;\r
   if ((Pico.video.reg[12]&6) == 6)\r
     rendstatus |= PDRAW_INTERLACE; // interlace mode\r
+  if (Pico.video.reg[1] & 8)\r
+    rendstatus |= PDRAW_240LINES;\r
 \r
-  if (Pico.m.dirtyPal) Pico.m.dirtyPal = 2; // reset dirty if needed\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 PicoLine(void)\r
+static void DrawBlankedLine(int line, int offs)\r
+{\r
+  int sh = (Pico.video.reg[0xC]&8)>>3; // shadow/hilight?\r
+\r
+  if (PicoScanBegin != NULL)\r
+    PicoScanBegin(line + offs);\r
+\r
+  BackFill(Pico.video.reg[7], sh);\r
+\r
+  if (FinalizeLine != NULL)\r
+    FinalizeLine(sh);\r
+\r
+  if (PicoScanEnd != NULL)\r
+    PicoScanEnd(line + offs);\r
+}\r
+\r
+static void PicoLine(int line, int offs)\r
 {\r
   int sh;\r
-  if (skip_next_line>0) { skip_next_line--; return; } // skip rendering lines\r
+  if (skip_next_line > 0) {\r
+    skip_next_line--;\r
+    return;\r
+  }\r
 \r
   sh=(Pico.video.reg[0xC]&8)>>3; // shadow/hilight?\r
 \r
+  DrawScanline = line;\r
   if (PicoScanBegin != NULL)\r
-    skip_next_line = PicoScanBegin(DrawScanline);\r
+    skip_next_line = PicoScanBegin(line + offs);\r
 \r
   // Draw screen:\r
   BackFill(Pico.video.reg[7], sh);\r
@@ -1447,31 +1454,40 @@ static void PicoLine(void)
     FinalizeLine(sh);\r
 \r
   if (PicoScanEnd != NULL)\r
-    skip_next_line = PicoScanEnd(DrawScanline);\r
+    skip_next_line = PicoScanEnd(line + offs);\r
 }\r
 \r
 void PicoDrawSync(int to, int blank_last_line)\r
 {\r
-  for (; DrawScanline < to; DrawScanline++)\r
+  int line, offs = 0;\r
+\r
+  if (!(rendstatus & PDRAW_240LINES))\r
+    offs = 8;\r
+\r
+  for (line = DrawScanline; line < to; line++)\r
   {\r
 #if !CAN_HANDLE_240_LINES\r
-    if (DrawScanline >= 224) break;\r
+    if (line >= 224) break;\r
 #endif\r
-    PicoLine();\r
+    PicoLine(line, offs);\r
   }\r
 \r
 #if !CAN_HANDLE_240_LINES\r
-  if (DrawScanline >= 224) { DrawScanline = 240; return; }\r
+  if (line >= 224) {\r
+    DrawScanline = 240;\r
+    return;\r
+  }\r
 #endif\r
 \r
   // last line\r
-  if (DrawScanline <= to)\r
+  if (line <= to)\r
   {\r
     if (blank_last_line)\r
-         DrawBlankedLine();\r
-    else PicoLine();\r
-    DrawScanline++;\r
+         DrawBlankedLine(line, offs);\r
+    else PicoLine(line, offs);\r
+    line++;\r
   }\r
+  DrawScanline = line;\r
 }\r
 \r
 void PicoDrawSetColorFormat(int which)\r
@@ -1483,8 +1499,10 @@ void PicoDrawSetColorFormat(int which)
     case 0: FinalizeLine = FinalizeLineBGR444; break;\r
     default:FinalizeLine = NULL; break;\r
   }\r
+  PicoDrawSetColorFormatMode4(which);\r
 #if OVERRIDE_HIGHCOL\r
-  if (which) HighCol=DefHighCol;\r
+  if (which)\r
+    HighCol=DefHighCol;\r
 #endif\r
 }\r
 \r