X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FDraw.c;h=dec7abd156ce2f6822d571e308238c4e0b874c2b;hb=e28a980fb7737edcf70fbce20c77b64fa14264a2;hp=582c8cbf5ea88e906eedacff8cd50aacce55fbd3;hpb=6d7acf9eff33cdde5e3eac44a193448ac0cbf541;p=picodrive.git

diff --git a/Pico/Draw.c b/Pico/Draw.c
index 582c8cb..dec7abd 100644
--- a/Pico/Draw.c
+++ b/Pico/Draw.c
@@ -22,8 +22,8 @@ static int  HighCacheS[80+1];   // and sprites
 static int  HighPreSpr[80*2+1]; // slightly preprocessed sprites
 char HighSprZ[320+8+8]; // Z-buffer for accurate sprites and shadow/hilight mode
                         // (if bit 7 == 0, sh caused by tile; if bit 6 == 0 pixel must be shadowed, else hilighted, if bit5 == 1)
-// lsb->msb: moved sprites, all window tiles don't use same priority, accurate sprites (copied from PicoOpt), interlace
-//           dirty sprites, sonic mode
+// lsb->msb: moved sprites, not all window tiles use same priority, accurate sprites (copied from PicoOpt), interlace
+//           dirty sprites, sonic mode, have layer with all hi prio tiles (mk3), layer sh/hi already processed
 int rendstatus;
 void *DrawLineDest=DefOutBuff; // pointer to dest buffer where to draw this line to
 int Scanline=0; // Scanline
@@ -46,7 +46,7 @@ struct TileStrip
 void DrawWindow(int tstart, int tend, int prio, int sh);
 void BackFill(int reg7, int sh);
 void DrawSprite(int *sprite, int **hc, int sh);
-void DrawTilesFromCache(int *hc, int sh);
+void DrawTilesFromCache(int *hc, int sh, int rlim);
 void DrawSpritesFromCache(int *hc, int sh);
 void DrawLayer(int plane, int *hcache, int maxcells, int sh);
 void FinalizeLineBGR444(int sh);
@@ -316,6 +316,8 @@ static void DrawStrip(struct TileStrip *ts, int sh)
 
   // terminate the cache list
   *ts->hc = 0;
+  // if oldcode wasn't changed, it means all layer is hi priority
+  if (oldcode == -1) rendstatus|=0x40;
 }
 
 // this is messy
@@ -381,6 +383,7 @@ void DrawStripVSRam(struct TileStrip *ts, int plane)
 
   // terminate the cache list
   *ts->hc = 0;
+  if (oldcode == -1) rendstatus|=0x40;
 }
 #endif
 
@@ -576,35 +579,112 @@ static void DrawWindow(int tstart, int tend, int prio, int sh) // int *hcache
 
 // --------------------------------------------
 
-static void DrawTilesFromCache(int *hc, int sh)
+static void DrawTilesFromCache(int *hc, int sh, int rlim)
 {
-  int code, addr, zero, dx;
+  int code, addr, dx;
   int pal;
-  short blank=-1; // The tile we know is blank
 
   // *ts->hc++ = code | (dx<<16) | (ty<<25); // cache it
 
-  while((code=*hc++)) {
-    if(!sh && (short)code == blank) continue;
+  if (sh && (rendstatus&0xc0))
+  {
+    if (!(rendstatus&0x80))
+    {
+      // as some layer has covered whole line with hi priority tiles,
+      // we can process whole line and then act as if sh/hi mode was off.
+      rendstatus|=0x80;
+      int c = 320/4, *zb = (int *)(HighCol+8);
+      while (c--)
+      {
+        int tmp = *zb;
+        if (!(tmp & 0x80808080)) *zb=tmp&0x3f3f3f3f;
+        else {
+          if(!(tmp&0x00000080)) tmp&=~0x000000c0; if(!(tmp&0x00008000)) tmp&=~0x0000c000;
+          if(!(tmp&0x00800000)) tmp&=~0x00c00000; if(!(tmp&0x80000000)) tmp&=~0xc0000000;
+          *zb=tmp;
+        }
+        zb++;
+      }
+    }
+    sh = 0;
+  }
 
-    // Get tile address/2:
-    addr=(code&0x7ff)<<4;
-    addr+=(unsigned int)code>>25; // y offset into tile
-    dx=(code>>16)&0x1ff;
-    if(sh) {
-      unsigned char *zb = HighCol+dx;
+  if (sh)
+  {
+    while ((code=*hc++)) {
+      unsigned char *zb;
+      // Get tile address/2:
+      addr=(code&0x7ff)<<4;
+      addr+=(unsigned int)code>>25; // y offset into tile
+      dx=(code>>16)&0x1ff;
+      zb = HighCol+dx;
       if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;
       if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;
       if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;
       if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;
+
+      pal=((code>>9)&0x30);
+      if (rlim-dx < 0) goto last_cut_tile;
+
+      if (code&0x0800) TileFlip(dx,addr,pal);
+      else             TileNorm(dx,addr,pal);
     }
+  }
+  else
+  {
+    short blank=-1; // The tile we know is blank
+    while ((code=*hc++)) {
+      int zero;
+      if((short)code == blank) continue;
+      // Get tile address/2:
+      addr=(code&0x7ff)<<4;
+      addr+=(unsigned int)code>>25; // y offset into tile
+      dx=(code>>16)&0x1ff;
 
-    pal=((code>>9)&0x30);
+      pal=((code>>9)&0x30);
+      if (rlim-dx < 0) goto last_cut_tile;
 
-    if (code&0x0800) zero=TileFlip(dx,addr,pal);
-    else             zero=TileNorm(dx,addr,pal);
+      if (code&0x0800) zero=TileFlip(dx,addr,pal);
+      else             zero=TileNorm(dx,addr,pal);
 
-    if(zero) blank=(short)code;
+      if (zero) blank=(short)code;
+    }
+  }
+  return;
+
+last_cut_tile:
+  {
+    unsigned int t, pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels
+    unsigned char *pd = HighCol+dx;
+    if (!pack) return;
+    if (code&0x0800)
+    {
+      switch (rlim-dx+8)
+      {
+        case 7: t=pack&0x00000f00; if (t) pd[6]=(unsigned char)(pal|(t>> 8)); // "break" is left out intentionally
+        case 6: t=pack&0x000000f0; if (t) pd[5]=(unsigned char)(pal|(t>> 4));
+        case 5: t=pack&0x0000000f; if (t) pd[4]=(unsigned char)(pal|(t    ));
+        case 4: t=pack&0xf0000000; if (t) pd[3]=(unsigned char)(pal|(t>>28));
+        case 3: t=pack&0x0f000000; if (t) pd[2]=(unsigned char)(pal|(t>>24));
+        case 2: t=pack&0x00f00000; if (t) pd[1]=(unsigned char)(pal|(t>>20));
+        case 1: t=pack&0x000f0000; if (t) pd[0]=(unsigned char)(pal|(t>>16));
+        default: break;
+      }
+    }
+    else
+    {
+      switch (rlim-dx+8)
+      {
+        case 7: t=pack&0x00f00000; if (t) pd[6]=(unsigned char)(pal|(t>>20));
+	case 6: t=pack&0x0f000000; if (t) pd[5]=(unsigned char)(pal|(t>>24));
+	case 5: t=pack&0xf0000000; if (t) pd[4]=(unsigned char)(pal|(t>>28));
+	case 4: t=pack&0x0000000f; if (t) pd[3]=(unsigned char)(pal|(t    ));
+	case 3: t=pack&0x000000f0; if (t) pd[2]=(unsigned char)(pal|(t>> 4));
+	case 2: t=pack&0x00000f00; if (t) pd[1]=(unsigned char)(pal|(t>> 8));
+	case 1: t=pack&0x0000f000; if (t) pd[0]=(unsigned char)(pal|(t>>12));
+	default: break;
+      }
+    }
   }
 }
 
@@ -1189,6 +1269,8 @@ static int DrawDisplay(int sh)
   int win=0,edge=0,hvwind=0;
   int maxw, maxcells;
 
+  rendstatus&=~0xc0;
+
   if(pvid->reg[12]&1) {
     maxw = 328; maxcells = 40;
   } else {
@@ -1202,23 +1284,23 @@ static int DrawDisplay(int sh)
   if (win&0x80) { if (Scanline>=edge) hvwind=1; }
   else          { if (Scanline< edge) hvwind=1; }
 
-  if(!hvwind) { // we might have a vertical window here
+  if (!hvwind) { // we might have a vertical window here
     win=pvid->reg[0x11];
     edge=win&0x1f;
-    if(win&0x80) {
-      if(!edge) hvwind=1;
+    if (win&0x80) {
+      if (!edge) hvwind=1;
       else if(edge < (maxcells>>1)) hvwind=2;
     } else {
-      if(!edge);
+      if (!edge);
       else if(edge < (maxcells>>1)) hvwind=2;
       else hvwind=1;
     }
   }
 
   DrawLayer(1, HighCacheB, maxcells, sh);
-  if(hvwind == 1)
+  if (hvwind == 1)
     DrawWindow(0, maxcells>>1, 0, sh); // HighCacheAW
-  else if(hvwind == 2) {
+  else if (hvwind == 2) {
     // ahh, we have vertical window
     DrawLayer(0, HighCacheA, (win&0x80) ? edge<<1 : maxcells, sh);
     DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 0, sh); // HighCacheW
@@ -1226,23 +1308,32 @@ static int DrawDisplay(int sh)
     DrawLayer(0, HighCacheA, maxcells, sh);
   DrawAllSprites(HighCacheS, maxw, 0, sh);
 
-  if(HighCacheB[0])  DrawTilesFromCache(HighCacheB, sh);
-  if(hvwind == 1)
+  if (HighCacheB[0]) DrawTilesFromCache(HighCacheB, sh, 328);
+  if (hvwind == 1)
     DrawWindow(0, maxcells>>1, 1, sh);
-  else if(hvwind == 2) {
-    if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh);
+  else if (hvwind == 2) {
+    if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, (win&0x80) ? edge<<4 : 0);
     DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 1, sh);
   } else
-    if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh);
+    if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, 328);
   DrawAllSprites(HighCacheS, maxw, 1, sh);
 
+#if 0
+  {
+    int *c, a, b;
+    for (a = 0, c = HighCacheA; *c; c++, a++);
+    for (b = 0, c = HighCacheB; *c; c++, b++);
+    printf("%i:%03i: a=%i, b=%i\n", Pico.m.frame_count, Scanline, a, b);
+  }
+#endif
+
   return 0;
 }
 
 
 static int Skip=0;
 
-void PicoFrameStart()
+PICO_INTERNAL void PicoFrameStart(void)
 {
   // prepare to do this frame
   rendstatus = (PicoOpt&0x80)>>5;    // accurate sprites
@@ -1256,7 +1347,7 @@ void PicoFrameStart()
   Skip=0;
 }
 
-int PicoLine(int scan)
+PICO_INTERNAL int PicoLine(int scan)
 {
   int sh;
   if (Skip>0) { Skip--; return 0; } // Skip rendering lines