remove some dead code

[picodrive.git] / pico / draw.c

diff --git a/pico/draw.c b/pico/draw.c
index 3442d8f..0480242 100644 (file)
--- a/pico/draw.c
+++ b/pico/draw.c
@@ -1,11 +1,11 @@
-// This is part of Pico Library\r
-\r
-// (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006-2008 notaz, All rights reserved.\r
-// Free for non-commercial use.\r
-\r
-// For commercial use, separate licencing terms must be obtained.\r
-\r
+/*\r
+ * line renderer\r
+ * (c) Copyright Dave, 2004\r
+ * (C) notaz, 2006-2010\r
+ *\r
+ * This work is licensed under the terms of MAME license.\r
+ * See COPYING file in the top-level directory.\r
+ */\r
 /*\r
  * The renderer has 4 modes now:\r
  * - normal\r
@@ -1197,46 +1197,6 @@ void PicoDoHighPal555(int sh)
   }\r
 }\r
 \r
-#if 0\r
-static void FinalizeLineBGR444(int sh, int line)\r
-{\r
-  unsigned short *pd=DrawLineDest;\r
-  unsigned char  *ps=HighCol+8;\r
-  unsigned short *pal=Pico.cram;\r
-  int len, i, t, mask=0xff;\r
-\r
-  if (Pico.video.reg[12]&1) {\r
-    len = 320;\r
-  } else {\r
-    if(!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32;\r
-    len = 256;\r
-  }\r
-\r
-  if(sh) {\r
-    pal=HighPal;\r
-    if(Pico.m.dirtyPal) {\r
-      blockcpy(pal, Pico.cram, 0x40*2);\r
-      // shadowed pixels\r
-      for(i = 0x3f; i >= 0; i--)\r
-        pal[0x40|i] = pal[0xc0|i] = (unsigned short)((pal[i]>>1)&0x0777);\r
-      // hilighted pixels\r
-      for(i = 0x3f; i >= 0; i--) {\r
-        t=pal[i]&0xeee;t+=0x444;if(t&0x10)t|=0xe;if(t&0x100)t|=0xe0;if(t&0x1000)t|=0xe00;t&=0xeee;\r
-        pal[0x80|i]=(unsigned short)t;\r
-      }\r
-      Pico.m.dirtyPal = 0;\r
-    }\r
-  }\r
-\r
-  if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI))\r
-    mask=0x3f; // accurate sprites\r
-\r
-  for(i = 0; i < len; i++)\r
-    pd[i] = pal[ps[i] & mask];\r
-}\r
-#endif\r
-\r
-\r
 void FinalizeLine555(int sh, int line)\r
 {\r
   unsigned short *pd=DrawLineDest;\r
@@ -1424,11 +1384,6 @@ PICO_INTERNAL void PicoFrameStart(void)
     lines = 240;\r
   }\r
 \r
-  HighCol = HighColBase + offs * HighColIncrement;\r
-  DrawLineDest = (char *)DrawLineDestBase + offs * DrawLineDestIncrement;\r
-  DrawScanline = 0;\r
-  skip_next_line = 0;\r
-\r
   if (rendstatus != rendstatus_old || lines != rendlines) {\r
     rendlines = lines;\r
     // mode_change() might reset rendstatus_old by calling SetColorFormat\r
@@ -1437,6 +1392,11 @@ PICO_INTERNAL void PicoFrameStart(void)
     rendstatus_old = rendstatus;\r
   }\r
 \r
+  HighCol = HighColBase + offs * HighColIncrement;\r
+  DrawLineDest = (char *)DrawLineDestBase + offs * DrawLineDestIncrement;\r
+  DrawScanline = 0;\r
+  skip_next_line = 0;\r
+\r
   if (PicoOpt & POPT_ALT_RENDERER)\r
     return;\r
 \r
@@ -1457,6 +1417,9 @@ static void DrawBlankedLine(int line, int offs, int sh, int bgc)
 \r
   if (PicoScanEnd != NULL)\r
     PicoScanEnd(line + offs);\r
+\r
+  HighCol += HighColIncrement;\r
+  DrawLineDest = (char *)DrawLineDest + DrawLineDestIncrement;\r
 }\r
 \r
 static void PicoLine(int line, int offs, int sh, int bgc)\r
@@ -1505,19 +1468,9 @@ void PicoDrawSync(int to, int blank_last_line)
 \r
   for (line = DrawScanline; line < to; line++)\r
   {\r
-#if !CAN_HANDLE_240_LINES\r
-    if (line >= 224) break;\r
-#endif\r
     PicoLine(line, offs, sh, bgc);\r
   }\r
 \r
-#if !CAN_HANDLE_240_LINES\r
-  if (line >= 224) {\r
-    DrawScanline = 240;\r
-    return;\r
-  }\r
-#endif\r
-\r
   // last line\r
   if (line <= to)\r
   {\r
@@ -1546,7 +1499,7 @@ void PicoDrawUpdateHighPal(void)
   }\r
 }\r
 \r
-void PicoDrawSetOutFormat(pdso_t which, int allow_32x)\r
+void PicoDrawSetOutFormat(pdso_t which, int use_32x_line_mode)\r
 {\r
   switch (which)\r
   {\r
@@ -1555,7 +1508,7 @@ void PicoDrawSetOutFormat(pdso_t which, int allow_32x)
       break;\r
 \r
     case PDF_RGB555:\r
-      if ((PicoAHW & PAHW_32X) && allow_32x)\r
+      if ((PicoAHW & PAHW_32X) && use_32x_line_mode)\r
         FinalizeLine = FinalizeLine32xRGB555;\r
       else\r
         FinalizeLine = FinalizeLine555;\r
@@ -1565,6 +1518,7 @@ void PicoDrawSetOutFormat(pdso_t which, int allow_32x)
       FinalizeLine = NULL;\r
       break;\r
   }\r
+  PicoDrawSetOutFormat32x(which, use_32x_line_mode);\r
   PicoDrawSetOutputMode4(which);\r
   rendstatus_old = -1;\r
 }\r
@@ -1574,7 +1528,7 @@ void PicoDrawSetOutBuf(void *dest, int increment)
 {\r
   DrawLineDestBase = dest;\r
   DrawLineDestIncrement = increment;\r
-  DrawLineDest = DrawLineDestBase + DrawScanline * increment;\r
+  DrawLineDest = (unsigned char*)DrawLineDestBase + DrawScanline * increment;\r
 }\r
 \r
 void PicoDrawSetInternalBuf(void *dest, int increment)\r
@@ -1590,3 +1544,19 @@ void PicoDrawSetInternalBuf(void *dest, int increment)
   }\r
 }\r
 \r
+void PicoDrawSetCallbacks(int (*begin)(unsigned int num), int (*end)(unsigned int num))\r
+{\r
+  PicoScanBegin = NULL;\r
+  PicoScanEnd = NULL;\r
+  PicoScan32xBegin = NULL;\r
+  PicoScan32xEnd = NULL;\r
+\r
+  if ((PicoAHW & PAHW_32X) && FinalizeLine != FinalizeLine32xRGB555) {\r
+    PicoScan32xBegin = begin;\r
+    PicoScan32xEnd = end;\r
+  }\r
+  else {\r
+    PicoScanBegin = begin;\r
+    PicoScanEnd = end;\r
+  }\r
+}\r