X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FDraw.c;h=15d09927f088451ef15a56aa3a30fa68f391b131;hb=6a13ef3f56a80ac698d463f5d00235ea2a090f52;hp=8635d79a58989ea9a87829275254835924375924;hpb=f579f7b891f9968ab4a4fd0b3f18404965eb41f7;p=picodrive.git

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