final fixes for UIQ3

[picodrive.git] / Pico / Draw.c

diff --git a/Pico/Draw.c b/Pico/Draw.c
index 8635d79..15d0992 100644 (file)
--- a/Pico/Draw.c
+++ b/Pico/Draw.c
@@ -839,7 +839,7 @@ static void DrawSpritesSHi(unsigned char *sprited)
     }\r
   }\r
 }\r
-#endif\r
+#endif // !_ASM_DRAW_C\r
 \r
 static void DrawSpritesHiAS(unsigned char *sprited, int sh)\r
 {\r
@@ -850,6 +850,8 @@ static void DrawSpritesHiAS(unsigned char *sprited, int sh)
   cnt = sprited[0] & 0x7f;\r
   if (cnt == 0) return;\r
 \r
+  rendstatus |= PDRAW_SPR_LO_ON_HI;\r
+\r
   p = &sprited[3];\r
 \r
   // Go through sprites:\r
@@ -1139,6 +1141,37 @@ static void BackFill(int reg7, int sh)
 unsigned short HighPal[0x100];\r
 \r
 #ifndef _ASM_DRAW_C\r
+void PicoDoHighPal555(int sh)\r
+{\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
+#ifdef USE_BGR555\r
+      dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);\r
+#else\r
+      dpal[i] = ((spal[i]&0x000f000f)<<12)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)>>7);\r
+#endif\r
+  }\r
+\r
+  if (sh)\r
+  {\r
+    // shadowed pixels\r
+    for (i = 0x3f; i >= 0; i--)\r
+      pal[0x40|i] = pal[0xc0|i] = (unsigned short)((pal[i]>>1)&0x738e);\r
+    // hilighted pixels\r
+    for (i = 0x3f; i >= 0; i--) {\r
+      t=pal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c;\r
+      pal[0x80|i]=(unsigned short)t;\r
+    }\r
+  }\r
+}\r
+\r
 static void FinalizeLineBGR444(int sh)\r
 {\r
   unsigned short *pd=DrawLineDest;\r
@@ -1169,7 +1202,7 @@ static void FinalizeLineBGR444(int sh)
     }\r
   }\r
 \r
-  if (!sh && (rendstatus & PDRAW_ACC_SPRITES))\r
+  if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI))\r
     mask=0x3f; // accurate sprites\r
 \r
   for(i = 0; i < len; i++)\r
@@ -1182,34 +1215,10 @@ static void FinalizeLineRGB555(int sh)
   unsigned short *pd=DrawLineDest;\r
   unsigned char  *ps=HighCol+8;\r
   unsigned short *pal=HighPal;\r
-  int len, i, t, dirtyPal = Pico.m.dirtyPal;\r
-\r
-  if (dirtyPal)\r
-  {\r
-    unsigned int *spal=(void *)Pico.cram;\r
-    unsigned int *dpal=(void *)HighPal;\r
-    for (i = 0x3f/2; i >= 0; i--)\r
-#ifdef USE_BGR555\r
-      dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);\r
-#else\r
-      dpal[i] = ((spal[i]&0x000f000f)<<12)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)>>7);\r
-#endif\r
-    Pico.m.dirtyPal = 0;\r
-  }\r
+  int len;\r
 \r
-  if (sh)\r
-  {\r
-    if (dirtyPal) {\r
-      // shadowed pixels\r
-      for (i = 0x3f; i >= 0; i--)\r
-        pal[0x40|i] = pal[0xc0|i] = (unsigned short)((pal[i]>>1)&0x738e);\r
-      // hilighted pixels\r
-      for (i = 0x3f; i >= 0; i--) {\r
-        t=pal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c;\r
-        pal[0x80|i]=(unsigned short)t;\r
-      }\r
-    }\r
-  }\r
+  if (Pico.m.dirtyPal)\r
+    PicoDoHighPal555(sh);\r
 \r
   if (Pico.video.reg[12]&1) {\r
     len = 320;\r
@@ -1220,8 +1229,8 @@ static void FinalizeLineRGB555(int sh)
 \r
   {\r
 #ifndef PSP\r
-    int mask=0xff;\r
-    if (!sh && (rendstatus & PDRAW_ACC_SPRITES))\r
+    int i, mask=0xff;\r
+    if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI))\r
       mask=0x3f; // accurate sprites, upper bits are priority stuff\r
 \r
     for (i = 0; i < len; i++)\r
@@ -1229,7 +1238,7 @@ static void FinalizeLineRGB555(int sh)
 #else\r
     extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);\r
     extern void amips_clut_6bit(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);\r
-    if (!sh && (rendstatus & PDRAW_ACC_SPRITES))\r
+    if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI))\r
          amips_clut_6bit(pd, ps, pal, len);\r
     else amips_clut(pd, ps, pal, len);\r
 #endif\r
@@ -1243,7 +1252,7 @@ static void FinalizeLine8bit(int sh)
   int len, rs = rendstatus;\r
   static int dirty_count;\r
 \r
-  if (!sh && !(rs & PDRAW_ACC_SPRITES) && Pico.m.dirtyPal == 1 && DrawScanline < 222)\r
+  if (!sh && Pico.m.dirtyPal == 1 && DrawScanline < 222)\r
   {\r
     // a hack for mid-frame palette changes\r
     if (!(rs & PDRAW_SONIC_MODE))\r
@@ -1367,8 +1376,8 @@ static int DrawDisplay(int sh)
   if (!(PicoDrawMask & PDRAW_SPRITES_HI_ON));\r
   else if (rendstatus & PDRAW_INTERLACE)\r
     DrawAllSpritesInterlace(1, sh);\r
-  // AS on and have both lo/hi sprites and lo before hi sprites?\r
-  else if ((sprited[1] & 0xd0) == 0xd0 && (rendstatus & PDRAW_ACC_SPRITES))\r
+  // have sprites without layer pri bit ontop of sprites with that bit\r
+  else if ((sprited[1] & 0xd0) == 0xd0 && (PicoOpt & POPT_ACC_SPRITES))\r
     DrawSpritesHiAS(sprited, sh);\r
   else if (sh && (sprited[1] & SPRL_MAY_HAVE_OP))\r
     DrawSpritesSHi(sprited);\r
@@ -1387,13 +1396,11 @@ static int DrawDisplay(int sh)
   return 0;\r
 }\r
 \r
-\r
+// MUST be called every frame\r
 PICO_INTERNAL void PicoFrameStart(void)\r
 {\r
   // prepare to do this frame\r
   rendstatus = 0;\r
-  if (PicoOpt & POPT_ACC_SPRITES)\r
-    rendstatus |= PDRAW_ACC_SPRITES;\r
   if ((Pico.video.reg[12]&6) == 6)\r
     rendstatus |= PDRAW_INTERLACE; // interlace mode\r
 \r
@@ -1423,7 +1430,7 @@ static void PicoLine(void)
     FinalizeLine(sh);\r
 \r
   if (PicoScanEnd != NULL)\r
-    PicoScanEnd(DrawScanline);\r
+    skip_next_line = PicoScanEnd(DrawScanline);\r
 }\r
 \r
 void PicoDrawSync(int to, int blank_last_line)\r
@@ -1437,7 +1444,7 @@ void PicoDrawSync(int to, int blank_last_line)
   }\r
 \r
 #if !CAN_HANDLE_240_LINES\r
-  if (DrawScanline >= 224) DrawScanline = 240, return;\r
+  if (DrawScanline >= 224) { DrawScanline = 240; return; }\r
 #endif\r
 \r
   // last line\r