static int HighPreSpr[80*2+1]; // slightly preprocessed sprites\r
char HighSprZ[320+8+8]; // Z-buffer for accurate sprites and shadow/hilight mode\r
// (if bit 7 == 0, sh caused by tile; if bit 6 == 0 pixel must be shadowed, else hilighted, if bit5 == 1)\r
-// lsb->msb: moved sprites, all window tiles don't use same priority, accurate sprites (copied from PicoOpt), interlace\r
-// dirty sprites, sonic mode\r
+// lsb->msb: moved sprites, not all window tiles use same priority, accurate sprites (copied from PicoOpt), interlace\r
+// dirty sprites, sonic mode, have layer with all hi prio tiles (mk3), layer sh/hi already processed\r
int rendstatus;\r
void *DrawLineDest=DefOutBuff; // pointer to dest buffer where to draw this line to\r
int Scanline=0; // Scanline\r
struct TileStrip\r
{\r
int nametab; // Position in VRAM of name table (for this tile line)\r
- int line; // Line number in pixels 0x000-0x3ff within the virtual tilemap \r
+ int line; // Line number in pixels 0x000-0x3ff within the virtual tilemap\r
int hscroll; // Horizontal scroll value in pixels for the line\r
int xmask; // X-Mask (0x1f - 0x7f) for horizontal wraparound in the tilemap\r
int *hc; // cache for high tile codes and their positions\r
void DrawWindow(int tstart, int tend, int prio, int sh);\r
void BackFill(int reg7, int sh);\r
void DrawSprite(int *sprite, int **hc, int sh);\r
-void DrawTilesFromCache(int *hc, int sh);\r
+void DrawTilesFromCache(int *hc, int sh, int rlim);\r
void DrawSpritesFromCache(int *hc, int sh);\r
void DrawLayer(int plane, int *hcache, int maxcells, int sh);\r
void FinalizeLineBGR444(int sh);\r
\r
// terminate the cache list\r
*ts->hc = 0;\r
+ // if oldcode wasn't changed, it means all layer is hi priority\r
+ if (oldcode == -1) rendstatus|=0x40;\r
}\r
-#endif\r
\r
// this is messy\r
-#ifndef _ASM_DRAW_C\r
-static\r
-#endif\r
void DrawStripVSRam(struct TileStrip *ts, int plane)\r
{\r
int tilex=0,dx=0,ty=0,code=0,addr=0,cell=0,nametabadd=0;\r
\r
// terminate the cache list\r
*ts->hc = 0;\r
+ if (oldcode == -1) rendstatus|=0x40;\r
}\r
+#endif\r
\r
#ifndef _ASM_DRAW_C\r
static\r
\r
// --------------------------------------------\r
\r
-static void DrawTilesFromCache(int *hc, int sh)\r
+static void DrawTilesFromCache(int *hc, int sh, int rlim)\r
{\r
- int code, addr, zero, dx;\r
+ int code, addr, dx;\r
int pal;\r
- short blank=-1; // The tile we know is blank\r
\r
// *ts->hc++ = code | (dx<<16) | (ty<<25); // cache it\r
\r
- while((code=*hc++)) {\r
- if(!sh && (short)code == blank) continue;\r
+ if (sh && (rendstatus&0xc0))\r
+ {\r
+ if (!(rendstatus&0x80))\r
+ {\r
+ // as some layer has covered whole line with hi priority tiles,\r
+ // we can process whole line and then act as if sh/hi mode was off.\r
+ rendstatus|=0x80;\r
+ int c = 320/4, *zb = (int *)(HighCol+8);\r
+ while (c--)\r
+ {\r
+ int tmp = *zb;\r
+ if (!(tmp & 0x80808080)) *zb=tmp&0x3f3f3f3f;\r
+ else {\r
+ if(!(tmp&0x00000080)) tmp&=~0x000000c0; if(!(tmp&0x00008000)) tmp&=~0x0000c000;\r
+ if(!(tmp&0x00800000)) tmp&=~0x00c00000; if(!(tmp&0x80000000)) tmp&=~0xc0000000;\r
+ *zb=tmp;\r
+ }\r
+ zb++;\r
+ }\r
+ }\r
+ sh = 0;\r
+ }\r
\r
- // Get tile address/2:\r
- addr=(code&0x7ff)<<4;\r
- addr+=(unsigned int)code>>25; // y offset into tile\r
- dx=(code>>16)&0x1ff;\r
- if(sh) {\r
- unsigned char *zb = HighCol+dx;\r
+ if (sh)\r
+ {\r
+ while ((code=*hc++)) {\r
+ unsigned char *zb;\r
+ // Get tile address/2:\r
+ addr=(code&0x7ff)<<4;\r
+ addr+=(unsigned int)code>>25; // y offset into tile\r
+ dx=(code>>16)&0x1ff;\r
+ zb = HighCol+dx;\r
if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
+\r
+ pal=((code>>9)&0x30);\r
+ if (rlim-dx < 0) goto last_cut_tile;\r
+\r
+ if (code&0x0800) TileFlip(dx,addr,pal);\r
+ else TileNorm(dx,addr,pal);\r
}\r
+ }\r
+ else\r
+ {\r
+ short blank=-1; // The tile we know is blank\r
+ while ((code=*hc++)) {\r
+ int zero;\r
+ if((short)code == blank) continue;\r
+ // Get tile address/2:\r
+ addr=(code&0x7ff)<<4;\r
+ addr+=(unsigned int)code>>25; // y offset into tile\r
+ dx=(code>>16)&0x1ff;\r
\r
- pal=((code>>9)&0x30);\r
+ pal=((code>>9)&0x30);\r
+ if (rlim-dx < 0) goto last_cut_tile;\r
\r
- if (code&0x0800) zero=TileFlip(dx,addr,pal);\r
- else zero=TileNorm(dx,addr,pal);\r
+ if (code&0x0800) zero=TileFlip(dx,addr,pal);\r
+ else zero=TileNorm(dx,addr,pal);\r
+\r
+ if (zero) blank=(short)code;\r
+ }\r
+ }\r
+ return;\r
\r
- if(zero) blank=(short)code;\r
+last_cut_tile:\r
+ {\r
+ unsigned int t, pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
+ unsigned char *pd = HighCol+dx;\r
+ if (!pack) return;\r
+ if (code&0x0800)\r
+ {\r
+ switch (rlim-dx+8)\r
+ {\r
+ case 7: t=pack&0x00000f00; if (t) pd[6]=(unsigned char)(pal|(t>> 8)); // "break" is left out intentionally\r
+ case 6: t=pack&0x000000f0; if (t) pd[5]=(unsigned char)(pal|(t>> 4));\r
+ case 5: t=pack&0x0000000f; if (t) pd[4]=(unsigned char)(pal|(t ));\r
+ case 4: t=pack&0xf0000000; if (t) pd[3]=(unsigned char)(pal|(t>>28));\r
+ case 3: t=pack&0x0f000000; if (t) pd[2]=(unsigned char)(pal|(t>>24));\r
+ case 2: t=pack&0x00f00000; if (t) pd[1]=(unsigned char)(pal|(t>>20));\r
+ case 1: t=pack&0x000f0000; if (t) pd[0]=(unsigned char)(pal|(t>>16));\r
+ default: break;\r
+ }\r
+ }\r
+ else\r
+ {\r
+ switch (rlim-dx+8)\r
+ {\r
+ case 7: t=pack&0x00f00000; if (t) pd[6]=(unsigned char)(pal|(t>>20));\r
+ case 6: t=pack&0x0f000000; if (t) pd[5]=(unsigned char)(pal|(t>>24));\r
+ case 5: t=pack&0xf0000000; if (t) pd[4]=(unsigned char)(pal|(t>>28));\r
+ case 4: t=pack&0x0000000f; if (t) pd[3]=(unsigned char)(pal|(t ));\r
+ case 3: t=pack&0x000000f0; if (t) pd[2]=(unsigned char)(pal|(t>> 4));\r
+ case 2: t=pack&0x00000f00; if (t) pd[1]=(unsigned char)(pal|(t>> 8));\r
+ case 1: t=pack&0x0000f000; if (t) pd[0]=(unsigned char)(pal|(t>>12));\r
+ default: break;\r
+ }\r
+ }\r
}\r
}\r
\r
height = (hv&3)+1;\r
\r
if(sy > 240 || sy + (height<<3) <= 0) skip|=1<<22;\r
- \r
+\r
width = (hv>>2)+1;\r
code2 = sprite[1];\r
sx = (code2>>16)&0x1ff;\r
sx -= 0x78; // Get X coordinate + 8\r
sx_min = 8-(width<<3);\r
- \r
+\r
if((sx <= sx_min && sx >= -0x76) || sx >= 328) skip|=1<<23;\r
else if (sx > sx_min && !skip) {\r
int sbl = (2<<height)-1;\r
if(shi < 0) shi=0; // negative sy\r
sblocks |= sbl<<shi;\r
}\r
- \r
+\r
*pd++ = (width<<28)|(height<<24)|skip|(hv<<16)|((unsigned short)sy);\r
*pd++ = (sx<<16)|((unsigned short)code2);\r
- \r
+\r
// Find next sprite\r
link=(code>>16)&0x7f;\r
if(!link) break; // End of sprites\r
int win=0,edge=0,hvwind=0;\r
int maxw, maxcells;\r
\r
+ rendstatus&=~0xc0;\r
+\r
if(pvid->reg[12]&1) {\r
maxw = 328; maxcells = 40;\r
} else {\r
if (win&0x80) { if (Scanline>=edge) hvwind=1; }\r
else { if (Scanline< edge) hvwind=1; }\r
\r
- if(!hvwind) { // we might have a vertical window here \r
+ if (!hvwind) { // we might have a vertical window here\r
win=pvid->reg[0x11];\r
edge=win&0x1f;\r
- if(win&0x80) {\r
- if(!edge) hvwind=1;\r
+ if (win&0x80) {\r
+ if (!edge) hvwind=1;\r
else if(edge < (maxcells>>1)) hvwind=2;\r
} else {\r
- if(!edge);\r
+ if (!edge);\r
else if(edge < (maxcells>>1)) hvwind=2;\r
else hvwind=1;\r
}\r
}\r
\r
DrawLayer(1, HighCacheB, maxcells, sh);\r
- if(hvwind == 1)\r
+ if (hvwind == 1)\r
DrawWindow(0, maxcells>>1, 0, sh); // HighCacheAW\r
- else if(hvwind == 2) {\r
+ else if (hvwind == 2) {\r
// ahh, we have vertical window\r
DrawLayer(0, HighCacheA, (win&0x80) ? edge<<1 : maxcells, sh);\r
DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 0, sh); // HighCacheW\r
DrawLayer(0, HighCacheA, maxcells, sh);\r
DrawAllSprites(HighCacheS, maxw, 0, sh);\r
\r
- if(HighCacheB[0]) DrawTilesFromCache(HighCacheB, sh);\r
- if(hvwind == 1)\r
+ if (HighCacheB[0]) DrawTilesFromCache(HighCacheB, sh, 328);\r
+ if (hvwind == 1)\r
DrawWindow(0, maxcells>>1, 1, sh);\r
- else if(hvwind == 2) {\r
- if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh);\r
+ else if (hvwind == 2) {\r
+ if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, (win&0x80) ? edge<<4 : 0);\r
DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 1, sh);\r
} else\r
- if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh);\r
+ if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, 328);\r
DrawAllSprites(HighCacheS, maxw, 1, sh);\r
\r
+#if 0\r
+ {\r
+ int *c, a, b;\r
+ for (a = 0, c = HighCacheA; *c; c++, a++);\r
+ for (b = 0, c = HighCacheB; *c; c++, b++);\r
+ printf("%i:%03i: a=%i, b=%i\n", Pico.m.frame_count, Scanline, a, b);\r
+ }\r
+#endif\r
+\r
return 0;\r
}\r
\r
\r
static int Skip=0;\r
\r
-void PicoFrameStart()\r
+PICO_INTERNAL void PicoFrameStart(void)\r
{\r
// prepare to do this frame\r
rendstatus = (PicoOpt&0x80)>>5; // accurate sprites\r
Skip=0;\r
}\r
\r
-int PicoLine(int scan)\r
+PICO_INTERNAL int PicoLine(int scan)\r
{\r
int sh;\r
if (Skip>0) { Skip--; return 0; } // Skip rendering lines\r
notaz.gp2x.de / picodrive.git / blobdiff