sprite cache removed

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@517 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/Draw.c b/Pico/Draw.c
index 0cb8687..aea679f 100644 (file)
--- a/Pico/Draw.c
+++ b/Pico/Draw.c
@@ -34,9 +34,7 @@ void *DrawLineDest=DefOutBuff; // pointer to dest buffer where to draw this line
 \r
 static int  HighCacheA[41+1];   // caches for high layers\r
 static int  HighCacheB[41+1];\r
-static int  HighCacheS[80+1];   // and sprites\r
 int  HighPreSpr[80*2+1]; // slightly preprocessed sprites\r
-int *HighCacheS_ptr;\r
 \r
 #define MAX_LINE_SPRITES 30\r
 unsigned char HighLnSpr[240][2 + MAX_LINE_SPRITES]; // sprite_count, tile_count, [spritep]...\r
@@ -48,8 +46,8 @@ static int skip_next_line=0;
 \r
 //unsigned short ppt[] = { 0x0f11, 0x0ff1, 0x01f1, 0x011f, 0x01ff, 0x0f1f, 0x0f0e, 0x0e7c };\r
 \r
-static void (*DrawAllSpritesLoPri)(int *hcache, int prio, int sh) = NULL;\r
-static void (*DrawAllSpritesHiPri)(int *hcache, int prio, int sh) = NULL;\r
+static void (*DrawAllSpritesLoPri)(int prio, int sh) = NULL;\r
+static void (*DrawAllSpritesHiPri)(int prio, int sh) = NULL;\r
 \r
 struct TileStrip\r
 {\r
@@ -65,9 +63,9 @@ struct TileStrip
 #ifdef _ASM_DRAW_C\r
 void DrawWindow(int tstart, int tend, int prio, int sh);\r
 void BackFill(int reg7, int sh);\r
-void DrawAllSprites(int *hcache, int prio, int sh);\r
+void DrawAllSprites(int prio, int sh);\r
 void DrawTilesFromCache(int *hc, int sh, int rlim);\r
-void DrawSpritesFromCache(int *hc, int prio, int sh);\r
+void DrawSpritesSHi(int prio, int sh);\r
 void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells);\r
 void FinalizeLineBGR444(int sh);\r
 void FinalizeLineRGB555(int sh);\r
@@ -654,17 +652,9 @@ static void DrawSprite(int *sprite, int sh, int as)
   if (code&0x0800) { tile+=delta*(width-1); delta=-delta; } // Flip X\r
 \r
   tile &= 0x7ff; tile<<=4; tile+=(row&7)<<1; // Tile address\r
+  delta<<=4; // Delta of address\r
 \r
   pal=(code>>9)&0x30;\r
-\r
-  // assume there will be no sprites with both normal and operator pixels..\r
-  if ((code&0x8000) || (sh && pal == 0x30) || as) {\r
-    *HighCacheS_ptr++ = ((code&0x8000)<<16)|(tile<<16)|((code&0x0800)<<5)|((sx<<6)&0x0000ffc0)|pal|((sprite[0]>>16)&0xf);\r
-    // we need all for accurate sprites, cached will be used to do proper priorities\r
-    if (!as && (code&0x8000)) return;\r
-  }\r
-\r
-  delta<<=4; // Delta of address\r
   pal|=((sh|as)<<6);\r
 \r
   if (sh && (code&0x6000) == 0x6000) {\r
@@ -730,7 +720,7 @@ static void DrawSpriteInterlace(unsigned int *sprite)
 }\r
 \r
 \r
-static void DrawAllSpritesInterlace(int *hcache, int pri, int sh)\r
+static void DrawAllSpritesInterlace(int pri, int sh)\r
 {\r
   struct PicoVideo *pvid=&Pico.video;\r
   int i,u,table,link=0,sline=DrawScanline<<1;\r
@@ -774,46 +764,68 @@ static void DrawAllSpritesInterlace(int *hcache, int pri, int sh)
   // Go through sprites backwards:\r
   for (i-- ;i>=0; i--)\r
     DrawSpriteInterlace(sprites[i]);\r
-\r
-  HighCacheS[0] = 1; // just to fool main code\r
 }\r
 \r
 \r
 #ifndef _ASM_DRAW_C\r
-static void DrawSpritesFromCache(int *hc, int prio, int sh)\r
+// Index + 0  :    hhhhvvvv ----hhvv yyyyyyyy yyyyyyyy // v, h: vert./horiz. size\r
+// Index + 4  :    xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8\r
+static void DrawSpritesSHi(int prio, int sh)\r
 {\r
-  int code, tile, sx, delta, width;\r
-  int pal;\r
   int (*fTileFunc)(int sx,int addr,int pal);\r
+  unsigned char *p;\r
+  int cnt;\r
+\r
+  cnt = HighLnSpr[DrawScanline][0] & 0x7f;\r
+  if (cnt == 0) return;\r
 \r
-  // prio[31]:tile[30:17]:flipx[16]:sx[15:6]:pal[5:4]:delta_width[3:0]\r
+  p = &HighLnSpr[DrawScanline][2];\r
 \r
-  while ((code=*hc++))\r
+  // Go through sprites backwards:\r
+  for (cnt--; cnt >= 0; cnt--)\r
   {\r
-    pal=(code&0x30);\r
-    delta=code&0xf;\r
-    width=delta>>2; delta&=3;\r
-    width++; delta++; // Width and height in tiles\r
-    if (code&0x10000) delta=-delta; // Flip X\r
-    delta<<=4;\r
-    tile=((unsigned int)code>>17)<<1; // also has prio\r
-    sx=(code<<16)>>22; // sx can be negative (start offscreen), so sign extend\r
+    int *sprite, code, pal, tile, sx, sy;\r
+    int offs, delta, width, height, row;\r
+\r
+    offs = (p[cnt] & 0x7f) * 2;\r
+    sprite = HighPreSpr + offs;\r
+    code = sprite[1];\r
+    pal = (code>>9)&0x30;\r
 \r
     if (sh && pal == 0x30)\r
     {\r
-      if (code & 0x80000000) // hi priority\r
+      if (code & 0x8000) // hi priority\r
       {\r
-        if(code&0x10000) fTileFunc=TileFlipSH;\r
-        else             fTileFunc=TileNormSH;\r
+        if (code&0x800) fTileFunc=TileFlipSH;\r
+        else            fTileFunc=TileNormSH;\r
       } else {\r
-        if(code&0x10000) fTileFunc=TileFlipSH_onlyop_lp;\r
-        else             fTileFunc=TileNormSH_onlyop_lp;\r
+        if (code&0x800) fTileFunc=TileFlipSH_onlyop_lp;\r
+        else            fTileFunc=TileNormSH_onlyop_lp;\r
       }\r
     } else {\r
-      if(code&0x10000) fTileFunc=TileFlip;\r
-      else             fTileFunc=TileNorm;\r
+      if (!(code & 0x8000)) continue; // non-operator low sprite, already drawn\r
+      if (code&0x800) fTileFunc=TileFlip;\r
+      else            fTileFunc=TileNorm;\r
     }\r
 \r
+    // parse remaining sprite data\r
+    sy=sprite[0];\r
+    sx=code>>16; // X\r
+    width=sy>>28;\r
+    height=(sy>>24)&7; // Width and height in tiles\r
+    sy=(sy<<16)>>16; // Y\r
+\r
+    row=DrawScanline-sy; // Row of the sprite we are on\r
+\r
+    if (code&0x1000) row=(height<<3)-1-row; // Flip Y\r
+\r
+    tile=code + (row>>3); // Tile number increases going down\r
+    delta=height; // Delta to increase tile by going right\r
+    if (code&0x0800) { tile+=delta*(width-1); delta=-delta; } // Flip X\r
+\r
+    tile &= 0x7ff; tile<<=4; tile+=(row&7)<<1; // Tile address\r
+    delta<<=4; // Delta of address\r
+\r
     for (; width; width--,sx+=8,tile+=delta)\r
     {\r
       if(sx<=0)   continue;\r
@@ -826,44 +838,62 @@ static void DrawSpritesFromCache(int *hc, int prio, int sh)
 }\r
 #endif\r
 \r
-static void DrawSpritesFromCacheAS(int *hc, int prio, int sh)\r
+static void DrawSpritesHiAS(int prio, int sh)\r
 {\r
-  int code, tile, sx, delta, width;\r
-  int pal, *hce, *hco;\r
   int (*fTileFunc)(int sx,int addr,int pal);\r
+  unsigned char *p;\r
+  int entry, cnt, sh_cnt = 0;\r
+\r
+  cnt = HighLnSpr[DrawScanline][0] & 0x7f;\r
+  if (cnt == 0) return;\r
 \r
-  // prio[31]:tile[30:17]:flipx[16]:sx[15:6]:pal[5:4]:delta_width[3:0]\r
+  p = &HighLnSpr[DrawScanline][2];\r
 \r
-  /* walk the sprite cache backwards.. */\r
-  hco = hce = HighCacheS_ptr;\r
-  while (hce > hc)\r
+  // Go through sprites:\r
+  for (entry = 0; entry < cnt; entry++)\r
   {\r
-    code=*(--hce);\r
-    pal=(code&0x30);\r
-    delta=code&0xf;\r
-    width=delta>>2; delta&=3;\r
-    width++; delta++; // Width and height in tiles\r
-    if (code&0x10000) delta=-delta; // Flip X\r
-    delta<<=4;\r
-    tile=((unsigned int)code>>17)<<1;\r
-    sx=(code<<16)>>22; // sx can be negative (start offscreen), so sign extend\r
-\r
-    if (code & 0x80000000) // hi priority\r
+    int *sprite, code, pal, tile, sx, sy;\r
+    int offs, delta, width, height, row;\r
+\r
+    offs = (p[entry] & 0x7f) * 2;\r
+    sprite = HighPreSpr + offs;\r
+    code = sprite[1];\r
+    pal = (code>>9)&0x30;\r
+\r
+    if (code & 0x8000) // hi priority\r
     {\r
       if (sh && pal == 0x30)\r
       {\r
-        if(code&0x10000) fTileFunc=TileFlipAS_noop;\r
-        else             fTileFunc=TileNormAS_noop;\r
+        if (code&0x800) fTileFunc=TileFlipAS_noop;\r
+        else            fTileFunc=TileNormAS_noop;\r
       } else {\r
-        if(code&0x10000) fTileFunc=TileFlipAS;\r
-        else             fTileFunc=TileNormAS;\r
+        if (code&0x800) fTileFunc=TileFlipAS;\r
+        else            fTileFunc=TileNormAS;\r
       }\r
     } else {\r
-      if(code&0x10000) fTileFunc=TileFlipAS_onlymark;\r
-      else             fTileFunc=TileNormAS_onlymark;\r
+      if (code&0x800) fTileFunc=TileFlipAS_onlymark;\r
+      else            fTileFunc=TileNormAS_onlymark;\r
     }\r
     if (sh && pal == 0x30)\r
-      *(--hco) = code; /* save for later */\r
+      p[sh_cnt++] = offs / 2; // re-save for sh/hi pass\r
+\r
+    // parse remaining sprite data\r
+    sy=sprite[0];\r
+    sx=code>>16; // X\r
+    width=sy>>28;\r
+    height=(sy>>24)&7; // Width and height in tiles\r
+    sy=(sy<<16)>>16; // Y\r
+\r
+    row=DrawScanline-sy; // Row of the sprite we are on\r
+\r
+    if (code&0x1000) row=(height<<3)-1-row; // Flip Y\r
+\r
+    tile=code + (row>>3); // Tile number increases going down\r
+    delta=height; // Delta to increase tile by going right\r
+    if (code&0x0800) { tile+=delta*(width-1); delta=-delta; } // Flip X\r
+\r
+    tile &= 0x7ff; tile<<=4; tile+=(row&7)<<1; // Tile address\r
+    delta<<=4; // Delta of address\r
 \r
     pal |= 0x80;\r
     for (; width; width--,sx+=8,tile+=delta)\r
@@ -887,42 +917,12 @@ static void DrawSpritesFromCacheAS(int *hc, int prio, int sh)
     }\r
   }\r
 \r
-  /* nasty 2: loop once more and do operator colors */\r
-  while ((code=*hco++))\r
-  {\r
-    pal=(code&0x30);\r
-    if (pal != 0x30) continue;\r
-    delta=code&0xf;\r
-    width=delta>>2; delta&=3;\r
-    width++; delta++;\r
-    if (code&0x10000) delta=-delta; // Flip X\r
-    delta<<=4;\r
-    tile=((unsigned int)code>>17)<<1;\r
-    sx=(code<<16)>>22;\r
-\r
-    if (code & 0x80000000)\r
-    {\r
-      if(code&0x10000) fTileFunc=TileFlipSH;\r
-      else             fTileFunc=TileNormSH;\r
-    } else {\r
-      if(code&0x10000) fTileFunc=TileFlipSH_onlyop_lp;\r
-      else             fTileFunc=TileNormSH_onlyop_lp;\r
-    }\r
-\r
-    pal |= 0x80;\r
-    for (; width; width--,sx+=8,tile+=delta)\r
-    {\r
-      if(sx<=0)   continue;\r
-      if(sx>=328) break; // Offscreen\r
-\r
-      tile&=0x7fff; // Clip tile address\r
-      fTileFunc(sx,tile,pal);\r
-    }\r
-  }\r
+  /* nasty 2: sh operator pass */\r
+  HighLnSpr[DrawScanline][0] = sh_cnt;\r
+  DrawSpritesSHi(1, 1);\r
 }\r
 \r
 \r
-\r
 // Index + 0  :    ----hhvv -lllllll -------y yyyyyyyy\r
 // Index + 4  :    -------x xxxxxxxx pccvhnnn nnnnnnnn\r
 // v\r
@@ -971,7 +971,7 @@ void PrepareSprites(int full)
           (sx > -24 || sx < max_width))                   // onscreen x\r
       {\r
         int y = (sy >= DrawScanline) ? sy : DrawScanline;\r
-        int offs = (pd - HighPreSpr) / 2;\r
+        int entry = ((pd - HighPreSpr) / 2) | ((code2>>8)&0x80);\r
         for (; y < sy + (height<<3) && y < max_lines; y++)\r
         {\r
           int i, cnt;\r
@@ -979,10 +979,10 @@ void PrepareSprites(int full)
           if (cnt >= max_line_sprites) continue;              // sprite limit?\r
 \r
           for (i = 0; i < cnt; i++)\r
-            if (HighLnSpr[y][2+i] == offs) goto found;\r
+            if (((HighLnSpr[y][2+i] ^ entry) & 0x7f) == 0) goto found;\r
 \r
           // this sprite was previously missing\r
-          HighLnSpr[y][2+cnt] = offs;\r
+          HighLnSpr[y][2+cnt] = entry;\r
           HighLnSpr[y][0] = cnt + 1;\r
 found:;\r
         }\r
@@ -1025,6 +1025,7 @@ found:;
       if (sy < max_lines && sy + (height<<3) > DrawScanline) // sprite onscreen (y)?\r
       {\r
         int y = (sy >= DrawScanline) ? sy : DrawScanline;\r
+        int entry = ((pd - HighPreSpr) / 2) | ((code2>>8)&0x80);\r
         for (; y < sy + (height<<3) && y < max_lines; y++)\r
         {\r
           int cnt = HighLnSpr[y][0];\r
@@ -1044,8 +1045,11 @@ found:;
           // must keep the first sprite even if it's offscreen, for masking\r
           if (cnt > 0 && (sx <= sx_min || sx >= max_width)) continue; // offscreen x\r
 \r
-          HighLnSpr[y][2+cnt] = ((pd - HighPreSpr) / 2); // | prio;\r
+          HighLnSpr[y][2+cnt] = entry;\r
           HighLnSpr[y][0] = cnt + 1;\r
+          if (entry & 0x80)\r
+               rendstatus |= PDRAW_HAVE_HI_SPR;\r
+          else rendstatus |= PDRAW_HAVE_LO_SPR;\r
         }\r
       }\r
 \r
@@ -1072,7 +1076,7 @@ found:;
 }\r
 \r
 #ifndef _ASM_DRAW_C\r
-static void DrawAllSprites(int *hcache, int prio, int sh)\r
+static void DrawAllSprites(int prio, int sh)\r
 {\r
   int rs = rendstatus, scan = DrawScanline;\r
   unsigned char *p;\r
@@ -1084,24 +1088,20 @@ static void DrawAllSprites(int *hcache, int prio, int sh)
     rendstatus = rs & ~(PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES);\r
   }\r
 \r
-  HighCacheS_ptr = hcache;\r
   cnt = HighLnSpr[scan][0] & 0x7f;\r
+  if (cnt == 0) return;\r
 \r
-  if (cnt != 0)\r
-  {\r
-    p = &HighLnSpr[scan][2];\r
-    as = (rs & PDRAW_ACC_SPRITES) ? 1 : 0;\r
+  p = &HighLnSpr[scan][2];\r
+  as = (rs & PDRAW_ACC_SPRITES) ? 1 : 0;\r
 \r
-    // Go through sprites backwards:\r
-    for (cnt--; cnt >= 0; cnt--)\r
-    {\r
-      int offs = p[cnt] * 2;\r
-      //if ((p[cnt] & 0x80) && !as) continue;\r
-      DrawSprite(HighPreSpr + offs, sh, as);\r
-    }\r
+  // Go through sprites backwards:\r
+  for (cnt--; cnt >= 0; cnt--)\r
+  {\r
+    int offs;\r
+    if ((p[cnt] >> 7) != prio && !as) continue;\r
+    offs = (p[cnt]&0x7f) * 2;\r
+    DrawSprite(HighPreSpr + offs, sh, as);\r
   }\r
-\r
-  *HighCacheS_ptr = 0;\r
 }\r
 \r
 \r
@@ -1326,7 +1326,8 @@ static int DrawDisplay(int sh, int as)
     DrawWindow(                           (win&0x80) ? edge :       0, (win&0x80) ? maxcells>>1 : edge, 0, sh|as);\r
   } else\r
     DrawLayer(0|((sh|as)<<1), HighCacheA, 0, maxcells);\r
-  DrawAllSpritesLoPri(HighCacheS, 0, sh);\r
+  if ((rendstatus & PDRAW_HAVE_LO_SPR) || as)\r
+    DrawAllSpritesLoPri(0, sh);\r
 \r
   if (HighCacheB[0]) DrawTilesFromCache(HighCacheB, sh, maxw);\r
   if (hvwind == 1)\r
@@ -1336,7 +1337,8 @@ static int DrawDisplay(int sh, int as)
     DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 1, sh);\r
   } else\r
     if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, maxw);\r
-  if (HighCacheS[0]) DrawAllSpritesHiPri(HighCacheS, 1, sh);\r
+  if ((rendstatus & PDRAW_HAVE_HI_SPR) || sh)\r
+    DrawAllSpritesHiPri(1, sh);\r
 \r
 #if 0\r
   {\r
@@ -1354,17 +1356,28 @@ static int DrawDisplay(int sh, int as)
 PICO_INTERNAL void PicoFrameStart(void)\r
 {\r
   // prepare to do this frame\r
-  rendstatus = (PicoOpt&0x80)>>5;    // accurate sprites, clear everything else\r
+  int sh = Pico.video.reg[0xC] & 8; // shadow/hilight?\r
+  rendstatus = 0;\r
+  if (PicoOpt & POPT_ACC_SPRITES)\r
+    rendstatus |= PDRAW_ACC_SPRITES;\r
+\r
   if ((Pico.video.reg[12]&6) == 6) {\r
     rendstatus |= PDRAW_INTERLACE; // interlace mode\r
-    DrawAllSpritesLoPri = DrawAllSpritesInterlace;\r
+    DrawAllSpritesLoPri =\r
     DrawAllSpritesHiPri = DrawAllSpritesInterlace;\r
   }\r
-  else\r
+  else if (sh)\r
   {\r
     DrawAllSpritesLoPri = DrawAllSprites;\r
-    DrawAllSpritesHiPri = rendstatus ? DrawSpritesFromCacheAS : DrawSpritesFromCache;\r
+    DrawAllSpritesHiPri = DrawSpritesSHi;\r
+  }\r
+  else\r
+  {\r
+    DrawAllSpritesLoPri =\r
+    DrawAllSpritesHiPri = DrawAllSprites;\r
   }\r
+  if (rendstatus & PDRAW_ACC_SPRITES)\r
+    DrawAllSpritesHiPri = DrawSpritesHiAS;\r
 \r
   if (Pico.m.dirtyPal) Pico.m.dirtyPal = 2; // reset dirty if needed\r
 \r

diff --git a/Pico/Pico.c b/Pico/Pico.c
index 268fb75..aae914b 100644 (file)
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -364,10 +364,19 @@ char *debugString(void)
   static char dstr[1024];\r
   struct PicoVideo *pv=&Pico.video;\r
   unsigned char *reg=pv->reg, r;\r
+  extern int HighPreSpr[];\r
+  int i, sprites_lo, sprites_hi;\r
   char *dstrp;\r
 \r
+  sprites_lo = sprites_hi = 0;\r
+  for (i = 0; HighPreSpr[i] != 0; i+=2)\r
+    if (HighPreSpr[i+1] & 0x8000)\r
+         sprites_hi++;\r
+    else sprites_lo++;\r
+\r
   dstrp = dstr;\r
-  sprintf(dstrp, "mode set 1: %02x\n", (r=reg[0])); dstrp+=strlen(dstrp);\r
+  sprintf(dstrp, "mode set 1: %02x       spr lo: %2i, spr hi: %2i\n", (r=reg[0]), sprites_lo, sprites_hi);\r
+  dstrp+=strlen(dstrp);\r
   sprintf(dstrp, "display_disable: %i, M3: %i, palette: %i, ?, hints: %i\n", bit(r,0), bit(r,1), bit(r,2), bit(r,4));\r
   dstrp+=strlen(dstrp);\r
   sprintf(dstrp, "mode set 2: %02x\n", (r=reg[1])); dstrp+=strlen(dstrp);\r

diff --git a/Pico/Pico.h b/Pico/Pico.h
index 435685f..f630505 100644 (file)
--- a/Pico/Pico.h
+++ b/Pico/Pico.h
@@ -166,6 +166,8 @@ void vidConvCpyRGB565(void *to, void *from, int pixels);
 #define PDRAW_SONIC_MODE    (1<<5) // mid-frame palette changes for 8bit renderer\r
 #define PDRAW_PLANE_HI_PRIO (1<<6) // have layer with all hi prio tiles (mk3)\r
 #define PDRAW_SHHI_DONE     (1<<7) // layer sh/hi already processed\r
+#define PDRAW_HAVE_LO_SPR   (1<<8)\r
+#define PDRAW_HAVE_HI_SPR   (1<<9)\r
 extern int rendstatus;\r
 extern unsigned short HighPal[0x100];\r
 \r