static int HighCacheB[41+1];\r
static int HighCacheS[80+1]; // and sprites\r
static int HighPreSpr[80*2+1]; // slightly preprocessed sprites\r
+int *HighCacheS_ptr;\r
+\r
+#define MAX_LINE_SPRITES 30\r
+static unsigned char HighLnSpr[240][2 + MAX_LINE_SPRITES]; // sprite_count, tile_count, [spritep]...\r
\r
int rendstatus = 0;\r
-int Scanline = 0; // Scanline\r
+int DrawScanline = 0;\r
\r
-static int SpriteBlocks;\r
static int skip_next_line=0;\r
\r
//unsigned short ppt[] = { 0x0f11, 0x0ff1, 0x01f1, 0x011f, 0x01ff, 0x0f1f, 0x0f0e, 0x0e7c };\r
#ifdef _ASM_DRAW_C\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, int as);\r
+void DrawSprite(int *sprite, int sh, int as);\r
void DrawTilesFromCache(int *hc, int sh, int rlim);\r
void DrawSpritesFromCache(int *hc, int maxwidth, int prio, int sh);\r
void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells);\r
#endif\r
\r
\r
-#ifdef _ASM_DRAW_C_AMIPS\r
-int TileNorm(int sx,int addr,int pal);\r
-int TileFlip(int sx,int addr,int pal);\r
-#else\r
-static int TileNorm(int sx,int addr,int pal)\r
-{\r
- unsigned char *pd = HighCol+sx;\r
- unsigned int pack=0; unsigned int t=0;\r
-\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- t=pack&0x0000f000; if (t) pd[0]=(unsigned char)(pal|(t>>12));\r
- t=pack&0x00000f00; if (t) pd[1]=(unsigned char)(pal|(t>> 8));\r
- t=pack&0x000000f0; if (t) pd[2]=(unsigned char)(pal|(t>> 4));\r
- t=pack&0x0000000f; if (t) pd[3]=(unsigned char)(pal|(t ));\r
- t=pack&0xf0000000; if (t) pd[4]=(unsigned char)(pal|(t>>28));\r
- t=pack&0x0f000000; if (t) pd[5]=(unsigned char)(pal|(t>>24));\r
- t=pack&0x00f00000; if (t) pd[6]=(unsigned char)(pal|(t>>20));\r
- t=pack&0x000f0000; if (t) pd[7]=(unsigned char)(pal|(t>>16));\r
- return 0;\r
- }\r
-\r
- return 1; // Tile blank\r
+#define TileNormMaker(funcname,pix_func) \\r
+static int funcname(int sx,int addr,int pal) \\r
+{ \\r
+ unsigned char *pd = HighCol+sx; \\r
+ unsigned int pack=0; unsigned int t=0; \\r
+ \\r
+ pack=*(unsigned int *)(Pico.vram+addr); /* Get 8 pixels */ \\r
+ if (pack) \\r
+ { \\r
+ t=(pack&0x0000f000)>>12; pix_func(0); \\r
+ t=(pack&0x00000f00)>> 8; pix_func(1); \\r
+ t=(pack&0x000000f0)>> 4; pix_func(2); \\r
+ t=(pack&0x0000000f) ; pix_func(3); \\r
+ t=(pack&0xf0000000)>>28; pix_func(4); \\r
+ t=(pack&0x0f000000)>>24; pix_func(5); \\r
+ t=(pack&0x00f00000)>>20; pix_func(6); \\r
+ t=(pack&0x000f0000)>>16; pix_func(7); \\r
+ return 0; \\r
+ } \\r
+ \\r
+ return 1; /* Tile blank */ \\r
}\r
\r
-static int TileFlip(int sx,int addr,int pal)\r
-{\r
- unsigned char *pd = HighCol+sx;\r
- unsigned int pack=0; unsigned int t=0;\r
\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- t=pack&0x000f0000; if (t) pd[0]=(unsigned char)(pal|(t>>16));\r
- t=pack&0x00f00000; if (t) pd[1]=(unsigned char)(pal|(t>>20));\r
- t=pack&0x0f000000; if (t) pd[2]=(unsigned char)(pal|(t>>24));\r
- t=pack&0xf0000000; if (t) pd[3]=(unsigned char)(pal|(t>>28));\r
- t=pack&0x0000000f; if (t) pd[4]=(unsigned char)(pal|(t ));\r
- t=pack&0x000000f0; if (t) pd[5]=(unsigned char)(pal|(t>> 4));\r
- t=pack&0x00000f00; if (t) pd[6]=(unsigned char)(pal|(t>> 8));\r
- t=pack&0x0000f000; if (t) pd[7]=(unsigned char)(pal|(t>>12));\r
- return 0;\r
- }\r
- return 1; // Tile blank\r
+#define TileFlipMaker(funcname,pix_func) \\r
+static int funcname(int sx,int addr,int pal) \\r
+{ \\r
+ unsigned char *pd = HighCol+sx; \\r
+ unsigned int pack=0; unsigned int t=0; \\r
+ \\r
+ pack=*(unsigned int *)(Pico.vram+addr); /* Get 8 pixels */ \\r
+ if (pack) \\r
+ { \\r
+ t=(pack&0x000f0000)>>16; pix_func(0); \\r
+ t=(pack&0x00f00000)>>20; pix_func(1); \\r
+ t=(pack&0x0f000000)>>24; pix_func(2); \\r
+ t=(pack&0xf0000000)>>28; pix_func(3); \\r
+ t=(pack&0x0000000f) ; pix_func(4); \\r
+ t=(pack&0x000000f0)>> 4; pix_func(5); \\r
+ t=(pack&0x00000f00)>> 8; pix_func(6); \\r
+ t=(pack&0x0000f000)>>12; pix_func(7); \\r
+ return 0; \\r
+ } \\r
+ \\r
+ return 1; /* Tile blank */ \\r
}\r
-#endif\r
-\r
-// tile renderers for hacky operator sprite support\r
-#define sh_pix(x) \\r
- if(!t); \\r
- else if(t==0xe) pd[x]=(unsigned char)((pd[x]&0x3f)|0x80); /* hilight */ \\r
- else if(t==0xf) pd[x]=(unsigned char)( pd[x] |0xc0); /* shadow */ \\r
- else pd[x]=(unsigned char)(pal|t)\r
\r
-#ifndef _ASM_DRAW_C\r
-static int TileNormSH(int sx,int addr,int pal)\r
-{\r
- unsigned int pack=0; unsigned int t=0;\r
- unsigned char *pd = HighCol+sx;\r
\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- t=(pack&0x0000f000)>>12; sh_pix(0);\r
- t=(pack&0x00000f00)>> 8; sh_pix(1);\r
- t=(pack&0x000000f0)>> 4; sh_pix(2);\r
- t=(pack&0x0000000f) ; sh_pix(3);\r
- t=(pack&0xf0000000)>>28; sh_pix(4);\r
- t=(pack&0x0f000000)>>24; sh_pix(5);\r
- t=(pack&0x00f00000)>>20; sh_pix(6);\r
- t=(pack&0x000f0000)>>16; sh_pix(7);\r
- return 0;\r
- }\r
+#ifdef _ASM_DRAW_C_AMIPS\r
+int TileNorm(int sx,int addr,int pal);\r
+int TileFlip(int sx,int addr,int pal);\r
+#else\r
\r
- return 1; // Tile blank\r
-}\r
+#define pix_just_write(x) \\r
+ if (t) pd[x]=pal|t\r
\r
-static int TileFlipSH(int sx,int addr,int pal)\r
-{\r
- unsigned int pack=0; unsigned int t=0;\r
- unsigned char *pd = HighCol+sx;\r
+TileNormMaker(TileNorm,pix_just_write)\r
+TileFlipMaker(TileFlip,pix_just_write)\r
\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- t=(pack&0x000f0000)>>16; sh_pix(0);\r
- t=(pack&0x00f00000)>>20; sh_pix(1);\r
- t=(pack&0x0f000000)>>24; sh_pix(2);\r
- t=(pack&0xf0000000)>>28; sh_pix(3);\r
- t=(pack&0x0000000f) ; sh_pix(4);\r
- t=(pack&0x000000f0)>> 4; sh_pix(5);\r
- t=(pack&0x00000f00)>> 8; sh_pix(6);\r
- t=(pack&0x0000f000)>>12; sh_pix(7);\r
- return 0;\r
- }\r
- return 1; // Tile blank\r
-}\r
#endif\r
\r
-#define tilepixelAS(mask,index,shift) \\r
- if (!(pd[index]&0xc0)) { t=pack&mask; if (t) pd[index]=(pal|(t>>shift)); }\r
+// draw a sprite pixel, process operator colors\r
+#define pix_sh(x) \\r
+ if (!t); \\r
+ else if (t==0xe) pd[x]=(pd[x]&0x3f)|0x80; /* hilight */ \\r
+ else if (t==0xf) pd[x]= pd[x] |0xc0; /* shadow */ \\r
+ else pd[x]=pal|t\r
\r
-static int TileNormAS(int sx,int addr,int pal)\r
-{\r
- unsigned char *pd = HighCol+sx;\r
- unsigned int pack=0; unsigned int t=0;\r
+TileNormMaker(TileNormSH, pix_sh)\r
+TileFlipMaker(TileFlipSH, pix_sh)\r
\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- tilepixelAS(0x0000f000, 0, 12);\r
- tilepixelAS(0x00000f00, 1, 8);\r
- tilepixelAS(0x000000f0, 2, 4);\r
- tilepixelAS(0x0000000f, 3, 0);\r
- tilepixelAS(0xf0000000, 4, 28);\r
- tilepixelAS(0x0f000000, 5, 24);\r
- tilepixelAS(0x00f00000, 6, 20);\r
- tilepixelAS(0x000f0000, 7, 16);\r
- return 0;\r
- }\r
+#ifndef _ASM_DRAW_C\r
+// draw a sprite pixel ignoring operator colors\r
+#define pix_sh_noop(x) \\r
+ if (t && t < 0xe) \\r
+ pd[x]=pal|t\r
\r
- return 1; // Tile blank\r
-}\r
+TileNormMaker(TileNormSH_noop, pix_sh_noop)\r
+TileFlipMaker(TileFlipSH_noop, pix_sh_noop)\r
+#endif\r
\r
-static int TileFlipAS(int sx,int addr,int pal)\r
-{\r
- unsigned char *pd = HighCol+sx;\r
- unsigned int pack=0; unsigned int t=0;\r
+// process operator pixels only, apply only on low pri tiles\r
+#define pix_sh_onlyop(x) \\r
+ if (t==0xe && (pd[x]&0x40)) pd[x]=(pd[x]&0x3f)|0x80; /* hilight */ \\r
+ else if (t==0xf && (pd[x]&0x40)) pd[x]= pd[x] |0xc0; /* shadow */\r
\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- tilepixelAS(0x000f0000, 0, 16);\r
- tilepixelAS(0x00f00000, 1, 20);\r
- tilepixelAS(0x0f000000, 2, 24);\r
- tilepixelAS(0xf0000000, 3, 28);\r
- tilepixelAS(0x0000000f, 4, 0);\r
- tilepixelAS(0x000000f0, 5, 4);\r
- tilepixelAS(0x00000f00, 6, 8);\r
- tilepixelAS(0x0000f000, 7, 12);\r
- return 0;\r
- }\r
- return 1; // Tile blank\r
-}\r
+TileNormMaker(TileNormSH_onlyop_lp, pix_sh_onlyop)\r
+TileFlipMaker(TileFlipSH_onlyop_lp, pix_sh_onlyop)\r
\r
-// there is a problem with transparent hi pri tiles (on layer), it will clear high bits\r
-// and sprite tiles will be drawn needlessly. Hopefully that won't happen much..\r
-#define sh_pixAS(x) \\r
- if(!t); \\r
- else if(t==0xe) pd[x]=(unsigned char)((pd[x]&0x3f)|0x80); /* hilight */ \\r
- else if(t==0xf) pd[x]=(unsigned char)( pd[x] |0xc0); /* shadow */ \\r
- else if(!(pd[x]&0xc0)) pd[x]=(unsigned char)(pal|t)\r
+// draw a sprite pixel (AS)\r
+#define pix_as(x) \\r
+ if (t && !(pd[x]&0x80)) pd[x]=pal|t\r
\r
-static int TileNormSHAS(int sx,int addr,int pal)\r
-{\r
- unsigned int pack=0; unsigned int t=0;\r
- unsigned char *pd = HighCol+sx;\r
+TileNormMaker(TileNormAS, pix_as)\r
+TileFlipMaker(TileFlipAS, pix_as)\r
\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- t=(pack&0x0000f000)>>12; sh_pixAS(0);\r
- t=(pack&0x00000f00)>> 8; sh_pixAS(1);\r
- t=(pack&0x000000f0)>> 4; sh_pixAS(2);\r
- t=(pack&0x0000000f) ; sh_pixAS(3);\r
- t=(pack&0xf0000000)>>28; sh_pixAS(4);\r
- t=(pack&0x0f000000)>>24; sh_pixAS(5);\r
- t=(pack&0x00f00000)>>20; sh_pixAS(6);\r
- t=(pack&0x000f0000)>>16; sh_pixAS(7);\r
- return 0;\r
- }\r
+// draw a sprite pixel, skip operator colors (AS)\r
+#define pix_sh_as_noop(x) \\r
+ if (t && t < 0xe && !(pd[x]&0x80)) pd[x]=pal|t\r
\r
- return 1; // Tile blank\r
-}\r
+TileNormMaker(TileNormAS_noop, pix_sh_as_noop)\r
+TileFlipMaker(TileFlipAS_noop, pix_sh_as_noop)\r
\r
-static int TileFlipSHAS(int sx,int addr,int pal)\r
-{\r
- unsigned int pack=0; unsigned int t=0;\r
- unsigned char *pd = HighCol+sx;\r
+// mark pixel as sprite pixel (AS)\r
+#define pix_sh_as_onlymark(x) \\r
+ if (t) pd[x]|=0x80\r
\r
- pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
- if (pack)\r
- {\r
- t=(pack&0x000f0000)>>16; sh_pixAS(0);\r
- t=(pack&0x00f00000)>>20; sh_pixAS(1);\r
- t=(pack&0x0f000000)>>24; sh_pixAS(2);\r
- t=(pack&0xf0000000)>>28; sh_pixAS(3);\r
- t=(pack&0x0000000f) ; sh_pixAS(4);\r
- t=(pack&0x000000f0)>> 4; sh_pixAS(5);\r
- t=(pack&0x00000f00)>> 8; sh_pixAS(6);\r
- t=(pack&0x0000f000)>>12; sh_pixAS(7);\r
- return 0;\r
- }\r
- return 1; // Tile blank\r
-}\r
+TileNormMaker(TileNormAS_onlymark, pix_sh_as_onlymark)\r
+TileFlipMaker(TileFlipAS_onlymark, pix_sh_as_onlymark)\r
\r
\r
// --------------------------------------------\r
{\r
int tilex,dx,code=0,addr=0,cell=0;\r
int oldcode=-1,blank=-1; // The tile we know is blank\r
- int pal=0,scan=Scanline;\r
+ int pal=0,scan=DrawScanline;\r
\r
// Draw tiles across screen:\r
tilex=(-ts->hscroll)>>3;\r
else ts.nametab=(pvid->reg[2]&0x38)<< 9; // A\r
\r
htab=pvid->reg[13]<<9; // Horizontal scroll table address\r
- if ( pvid->reg[11]&2) htab+=Scanline<<1; // Offset by line\r
+ if ( pvid->reg[11]&2) htab+=DrawScanline<<1; // Offset by line\r
if ((pvid->reg[11]&1)==0) htab&=~0xf; // Offset by tile\r
htab+=plane_sh&1; // A or B\r
\r
vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value\r
\r
// Find the line in the name table\r
- ts.line=(vscroll+(Scanline<<1))&((ymask<<1)|1);\r
+ ts.line=(vscroll+(DrawScanline<<1))&((ymask<<1)|1);\r
ts.nametab+=(ts.line>>4)<<shift[width];\r
\r
DrawStripInterlace(&ts);\r
vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value\r
\r
// Find the line in the name table\r
- ts.line=(vscroll+Scanline)&ymask;\r
+ ts.line=(vscroll+DrawScanline)&ymask;\r
ts.nametab+=(ts.line>>3)<<shift[width];\r
\r
DrawStrip(&ts, plane_sh, cellskip);\r
static void DrawWindow(int tstart, int tend, int prio, int sh) // int *hcache\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
- int tilex=0,ty=0,nametab,code=0;\r
+ int tilex,ty,nametab,code=0;\r
int blank=-1; // The tile we know is blank\r
\r
// Find name table line:\r
if (pvid->reg[12]&1)\r
{\r
nametab=(pvid->reg[3]&0x3c)<<9; // 40-cell mode\r
- nametab+=(Scanline>>3)<<6;\r
+ nametab+=(DrawScanline>>3)<<6;\r
}\r
else\r
{\r
nametab=(pvid->reg[3]&0x3e)<<9; // 32-cell mode\r
- nametab+=(Scanline>>3)<<5;\r
+ nametab+=(DrawScanline>>3)<<5;\r
}\r
\r
tilex=tstart<<1;\r
- tend<<=1;\r
-\r
- ty=(Scanline&7)<<1; // Y-Offset into tile\r
\r
if (!(rendstatus & PDRAW_WND_DIFF_PRIO)) {\r
// check the first tile code\r
if ((code>>15) != prio) return;\r
}\r
\r
+ tend<<=1;\r
+ ty=(DrawScanline&7)<<1; // Y-Offset into tile\r
+\r
// Draw tiles across screen:\r
if (!sh)\r
{\r
for (; tilex < tend; tilex++)\r
{\r
int addr=0,zero=0;\r
- int pal, tmp, *zb;\r
+ int pal;\r
\r
code=Pico.vram[nametab+tilex];\r
if(code==blank) continue;\r
\r
pal=((code>>9)&0x30);\r
\r
- zb = (int *)(HighCol+8+(tilex<<3));\r
- if(prio) {\r
- tmp = *zb;\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; tmp = *zb;\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
+ if (prio) {\r
+ int *zb = (int *)(HighCol+8+(tilex<<3));\r
+ *zb++ &= 0x3f3f3f3f;\r
+ *zb &= 0x3f3f3f3f;\r
} else {\r
pal |= 0x40;\r
}\r
rendstatus |= PDRAW_SHHI_DONE;\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
+ *zb++ &= 0x3f3f3f3f;\r
}\r
}\r
\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
+ *zb++ &= 0x3f; *zb++ &= 0x3f; *zb++ &= 0x3f; *zb++ &= 0x3f;\r
+ *zb++ &= 0x3f; *zb++ &= 0x3f; *zb++ &= 0x3f; *zb++ &= 0x3f;\r
\r
pal=((code>>9)&0x30);\r
if (rlim-dx < 0) goto last_cut_tile;\r
// Index + 0 : hhhhvvvv ab--hhvv yyyyyyyy yyyyyyyy // a: offscreen h, b: offs. v, h: horiz. size\r
// Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8\r
\r
-static void DrawSprite(int *sprite, int **hc, int sh, int as)\r
+static void DrawSprite(int *sprite, int sh, int as)\r
{\r
int width=0,height=0;\r
int row=0,code=0;\r
height=(sy>>24)&7; // Width and height in tiles\r
sy=(sy<<16)>>16; // Y\r
\r
- row=Scanline-sy; // Row of the sprite we are on\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&0x7ff; // Tile number\r
- tile+=row>>3; // Tile number increases going down\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<<=4; tile+=(row&7)<<1; // Tile address\r
+ tile &= 0x7ff; tile<<=4; tile+=(row&7)<<1; // Tile address\r
+\r
+ pal=(code>>9)&0x30;\r
\r
- if (code&0x8000) { // high priority - cache it\r
- *(*hc)++ = (tile<<16)|((code&0x0800)<<5)|((sx<<6)&0x0000ffc0)|((code>>9)&0x30)|((sprite[0]>>16)&0xf);\r
- // we need all for accurate sprites, cached will be used to recover ones overwritten by high layer\r
- if (!as) return;\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=((code>>9)&0x30)|((sh|as)<<6);\r
+ pal|=((sh|as)<<6);\r
\r
if (sh && (code&0x6000) == 0x6000) {\r
- if(code&0x0800) fTileFunc=TileFlipSH;\r
- else fTileFunc=TileNormSH;\r
+ if(code&0x0800) fTileFunc=TileFlipSH_noop;\r
+ else fTileFunc=TileNormSH_noop;\r
} else {\r
if(code&0x0800) fTileFunc=TileFlip;\r
else fTileFunc=TileNorm;\r
width=(height>>2)&3; height&=3;\r
width++; height++; // Width and height in tiles\r
\r
- row=(Scanline<<1)-sy; // Row of the sprite we are on\r
+ row=(DrawScanline<<1)-sy; // Row of the sprite we are on\r
\r
code=sprite[1];\r
sx=((code>>16)&0x1ff)-0x78; // X\r
static void DrawAllSpritesInterlace(int *hcache, int maxwidth, int pri, int sh)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
- int i,u,table,link=0,sline=Scanline<<1;\r
+ int i,u,table,link=0,sline=DrawScanline<<1;\r
unsigned int *sprites[80]; // Sprite index\r
\r
table=pvid->reg[5]&0x7f;\r
// 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
int pal;\r
int (*fTileFunc)(int sx,int addr,int pal);\r
\r
- // *(*hc)++ = (tile<<16)|((code&0x0800)<<5)|((sx<<6)&0x0000ffc0)|((code>>9)&0x30)|((sprite[0]>>24)&0xf);\r
+ // prio[31]:tile[30:17]:flipx[16]:sx[15:6]:pal[5:4]:delta_width[3:0]\r
\r
- while((code=*hc++)) {\r
+ while ((code=*hc++))\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;\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
\r
- if(sh && pal == 0x30) { //\r
- if(code&0x10000) fTileFunc=TileFlipSH;\r
- else fTileFunc=TileNormSH;\r
+ if (sh && pal == 0x30)\r
+ {\r
+ if (code & 0x80000000) // hi priority\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
} else {\r
if(code&0x10000) fTileFunc=TileFlip;\r
else fTileFunc=TileNorm;\r
static void DrawSpritesFromCacheAS(int *hc, int maxwidth, int prio, int sh)\r
{\r
int code, tile, sx, delta, width;\r
- int pal;\r
+ int pal, *hce, *hco;\r
int (*fTileFunc)(int sx,int addr,int pal);\r
\r
- // *(*hc)++ = (tile<<16)|((code&0x0800)<<5)|((sx<<6)&0x0000ffc0)|((code>>9)&0x30)|((sprite[0]>>24)&0xf);\r
+ // prio[31]:tile[30:17]:flipx[16]:sx[15:6]:pal[5:4]:delta_width[3:0]\r
\r
- while((code=*hc++)) {\r
+ /* walk the sprite cache backwards.. */\r
+ hco = hce = HighCacheS_ptr;\r
+ while (hce > hc)\r
+ {\r
+ code=*(--hce);\r
pal=(code&0x30);\r
delta=code&0xf;\r
width=delta>>2; delta&=3;\r
tile=((unsigned int)code>>17)<<1;\r
sx=(code<<16)>>22; // sx can be negative (start offscreen), so sign extend\r
\r
- if(sh && pal == 0x30) { //\r
- if(code&0x10000) fTileFunc=TileFlipSHAS;\r
- else fTileFunc=TileNormSHAS;\r
+ if (code & 0x80000000) // hi priority\r
+ {\r
+ if (sh && pal == 0x30)\r
+ {\r
+ if(code&0x10000) fTileFunc=TileFlipAS_noop;\r
+ else fTileFunc=TileNormAS_noop;\r
+ } else {\r
+ if(code&0x10000) fTileFunc=TileFlipAS;\r
+ else fTileFunc=TileNormAS;\r
+ }\r
+ } else {\r
+ if(code&0x10000) fTileFunc=TileFlipAS_onlymark;\r
+ else fTileFunc=TileNormAS_onlymark;\r
+ }\r
+ if (sh && pal == 0x30)\r
+ *(--hco) = code; /* save for later */\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
+\r
+ if (!sh) return;\r
+\r
+ /* nasty 1: remove 'sprite' flags */\r
+ {\r
+ int c = 320/4, *zb = (int *)(HighCol+8);\r
+ while (c--)\r
+ {\r
+ *zb++ &= 0x7f7f7f7f;\r
+ }\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=TileFlipAS;\r
- else fTileFunc=TileNormAS;\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
}\r
\r
\r
+\r
// Index + 0 : ----hhvv -lllllll -------y yyyyyyyy\r
// Index + 4 : -------x xxxxxxxx pccvhnnn nnnnnnnn\r
// v\r
-// Index + 0 : hhhhvvvv ab--hhvv yyyyyyyy yyyyyyyy // a: offscreen h, b: offs. v, h: horiz. size\r
+// Index + 0 : hhhhvvvv ----hhvv yyyyyyyy yyyyyyyy // v, h: vert./horiz. size\r
// Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8\r
\r
static void PrepareSprites(int full)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
- int u=0,link=0,sblocks=0;\r
+ int u,link=0;\r
int table=0;\r
int *pd = HighPreSpr;\r
+ int max_lines = 224, max_sprites = 80;\r
+ int max_line_sprites = 20; // 20 sprites, 40 tiles\r
+\r
+ if (!(Pico.video.reg[12]&1))\r
+ max_sprites = 64, max_line_sprites = 16;\r
+ if (PicoOpt & POPT_DIS_SPRITE_LIM)\r
+ max_line_sprites = MAX_LINE_SPRITES;\r
+\r
+ if (pvid->reg[1]&8) max_lines = 240;\r
\r
table=pvid->reg[5]&0x7f;\r
if (pvid->reg[12]&1) table&=0x7e; // Lowest bit 0 in 40-cell mode\r
{\r
int pack;\r
// updates: tilecode, sx\r
- for (u=0; u < 80 && (pack = *pd); u++, pd+=2)\r
+ for (u=0; u < max_lines && (pack = *pd); u++, pd+=2)\r
{\r
unsigned int *sprite;\r
- int code, code2, sx, sy, skip=0;\r
+ int code2, sx, sy, height;\r
\r
sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite\r
\r
// parse sprite info\r
- code = sprite[0];\r
code2 = sprite[1];\r
- code2 &= ~0xfe000000;\r
- code2 -= 0x00780000; // Get X coordinate + 8 in upper 16 bits\r
- sx = code2>>16;\r
+ sx = (code2>>16)&0x1ff;\r
+ sx -= 0x78; // Get X coordinate + 8\r
+ sy = (pack << 16) >> 16;\r
+ height = pack >> 28;\r
\r
- if((sx <= 8-((pack>>28)<<3) && sx >= -0x76) || sx >= 328) skip=1<<23;\r
- else if ((sy = (pack<<16)>>16) < 240 && sy > -32) {\r
- int sbl = (2<<(pack>>28))-1;\r
- sblocks |= sbl<<(sy>>3);\r
+ if (sy < max_lines && sy + (height<<3) > DrawScanline && // sprite onscreen (y)?\r
+ (sx > -24 || sx < 328)) // onscreen x\r
+ {\r
+ int y = (sy >= DrawScanline) ? sy : DrawScanline;\r
+ for (; y < sy + (height<<3) && y < max_lines; y++)\r
+ {\r
+ int i, cnt, offs;\r
+ cnt = HighLnSpr[y][0] & 0x7f;\r
+ if (cnt >= max_line_sprites) continue; // sprite limit?\r
+ offs = (pd - HighPreSpr) / 2;\r
+\r
+ for (i = 0; i < cnt; i++)\r
+ if (HighLnSpr[y][2+i] == offs) goto found;\r
+\r
+ // this sprite was previously missing\r
+ HighLnSpr[y][2+cnt] = offs;\r
+ HighLnSpr[y][0] = cnt + 1;\r
+found:;\r
+ }\r
}\r
\r
- *pd = (pack&~(1<<23))|skip;\r
- *(pd+1) = code2;\r
+ code2 &= ~0xfe000000;\r
+ code2 -= 0x00780000; // Get X coordinate + 8 in upper 16 bits\r
+ pd[1] = code2;\r
\r
// Find next sprite\r
- link=(code>>16)&0x7f;\r
- if(!link) break; // End of sprites\r
+ link=(sprite[0]>>16)&0x7f;\r
+ if (!link) break; // End of sprites\r
}\r
- SpriteBlocks |= sblocks;\r
}\r
else\r
{\r
- for (; u < 80; u++)\r
+ for (u = 0; u < max_lines; u++)\r
+ *((int *)&HighLnSpr[u][0]) = 0;\r
+\r
+ for (u = 0; u < max_lines; u++)\r
{\r
unsigned int *sprite;\r
- int code, code2, sx, sy, hv, height, width, skip=0, sx_min;\r
+ int code, code2, sx, sy, hv, height, width;\r
+ int sx_min, offscr_x;\r
\r
sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite\r
\r
hv = (code>>24)&0xf;\r
height = (hv&3)+1;\r
\r
- if (sy > 240 || sy + (height<<3) <= 0) skip|=1<<22; // sprite offscreen (completely, y)\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
- if ((sx <= sx_min && sx >= -0x76) || sx >= 328) skip|=1<<23; // offscreen x\r
- else if (sx > sx_min && !skip) {\r
- int sbl = (2<<height)-1;\r
- int shi = sy>>3;\r
- if(shi < 0) shi=0; // negative sy\r
- sblocks |= sbl<<shi;\r
+ offscr_x = (sx <= sx_min) || sx >= 328;\r
+\r
+ if (sy < max_lines && sy + (height<<3) > DrawScanline) // sprite onscreen (y)?\r
+ {\r
+ int y = (sy >= DrawScanline) ? sy : DrawScanline;\r
+ for (; y < sy + (height<<3) && y < max_lines; y++)\r
+ {\r
+ int cnt = HighLnSpr[y][0];\r
+ if (cnt >= max_line_sprites) continue; // sprite limit?\r
+\r
+ if (HighLnSpr[y][1] >= max_line_sprites*2) { // tile limit?\r
+ HighLnSpr[y][0] |= 0x80;\r
+ continue;\r
+ }\r
+ HighLnSpr[y][1] += width;\r
+\r
+ if (sx == -0x78) {\r
+ if (cnt > 0)\r
+ HighLnSpr[y][0] |= 0x80; // masked, no more sprites for this line\r
+ continue;\r
+ }\r
+ // must keep the first sprite even if it's offscreen, for masking\r
+ if (cnt > 0 && (sx <= sx_min || sx >= 328)) continue; // offscreen x\r
+\r
+ HighLnSpr[y][2+cnt] = ((pd - HighPreSpr) / 2); // | prio;\r
+ HighLnSpr[y][0] = cnt + 1;\r
+ }\r
}\r
\r
- *pd++ = (width<<28)|(height<<24)|skip|(hv<<16)|((unsigned short)sy);\r
+ *pd++ = (width<<28)|(height<<24)|(hv<<16)|((unsigned short)sy);\r
*pd++ = (sx<<16)|((unsigned short)code2);\r
\r
// Find next sprite\r
link=(code>>16)&0x7f;\r
- if(!link) break; // End of sprites\r
+ if (!link) break; // End of sprites\r
+ }\r
+ *pd = 0;\r
+\r
+#if 0\r
+ for (u = 0; u < max_lines; u++)\r
+ {\r
+ int y;\r
+ printf("c%03i: %2i, %2i: ", u, HighLnSpr[u][0] & 0x7f, HighLnSpr[u][1]);\r
+ for (y = 0; y < HighLnSpr[u][0] & 0x7f; y++)\r
+ printf(" %i", HighLnSpr[u][y+2]);\r
+ printf("\n");\r
}\r
- SpriteBlocks = sblocks;\r
- *pd = 0; // terminate\r
+#endif\r
}\r
}\r
\r
static void DrawAllSprites(int *hcache, int maxwidth, int prio, int sh)\r
{\r
- int i,u,n;\r
- int sx1seen = 0; // sprite with x coord 1 or 0 seen\r
- int ntiles = 0; // tile counter for sprite limit emulation\r
- int *sprites[40]; // Sprites to draw in fast mode\r
- int max_line_sprites = 20; // 20 sprites, 40 tiles\r
- int *ps, pack, rs = rendstatus, scan = Scanline;\r
+ int rs = rendstatus, scan = DrawScanline;\r
+ unsigned char *p;\r
+ int cnt, as;\r
\r
if (rs & (PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES)) {\r
- //dprintf("PrepareSprites(%i) [%i]", (rs>>4)&1, scan);\r
+ //elprintf(EL_STATUS, "PrepareSprites(%i)", (rs>>4)&1);\r
PrepareSprites(rs & PDRAW_DIRTY_SPRITES);\r
rendstatus = rs & ~(PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES);\r
}\r
- if (!(SpriteBlocks & (1<<(scan>>3)))) { *hcache = 0; return; }\r
-\r
- if (PicoOpt & POPT_DIS_SPRITE_LIM)\r
- max_line_sprites = 80;\r
-\r
- ps = HighPreSpr;\r
\r
- // Index + 0 : hhhhvvvv ab--hhvv yyyyyyyy yyyyyyyy // a: offscreen h, b: offs. v, h: horiz. size\r
- // Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8\r
+ HighCacheS_ptr = hcache;\r
+ cnt = HighLnSpr[scan][0] & 0x7f;\r
\r
- for (i=u=n=0; (pack = *ps) && n < max_line_sprites; ps+=2, u++)\r
+ if (cnt != 0)\r
{\r
- int sx, sy, row, pack2;\r
-\r
- if (pack & 0x00400000) continue;\r
-\r
- // get sprite info\r
- pack2 = *(ps+1);\r
- sx = pack2>>16;\r
- sy = (pack <<16)>>16;\r
- row = scan-sy;\r
-\r
- // elprintf(EL_ANOMALY, "x: %4i y: %4i p %i %ix%i", sx, sy, (pack2>>15)&1, (pack>>28)<<3, (pack>>21)&0x38);\r
-\r
- if (sx == -0x77) sx1seen|=1; // for masking mode 2\r
+ p = &HighLnSpr[scan][2];\r
+ as = (rs & PDRAW_ACC_SPRITES) ? 1 : 0;\r
\r
- // check if it is on this line\r
- if (row < 0 || row >= ((pack>>21)&0x38)) continue; // no\r
-\r
- // masking sprite?\r
- if (sx == -0x78) {\r
- if (n > 0) break; // masked\r
- continue;\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
-\r
- n++; // number of sprites on this line (both visible and hidden, except of x=0)\r
-\r
- // sprite limit\r
- ntiles += pack>>28;\r
- if (ntiles > max_line_sprites*2) break;\r
-\r
- if (pack & 0x00800000) continue;\r
-\r
- // sprite is good, save it's pointer\r
- sprites[i++]=ps;\r
}\r
\r
- n = (rs & PDRAW_ACC_SPRITES) ? 1 : 0;\r
-\r
- // Go through sprites backwards:\r
- for (i--; i>=0; i--)\r
- DrawSprite(sprites[i],&hcache,sh,n);\r
-\r
- // terminate cache list\r
- *hcache = 0;\r
+ *HighCacheS_ptr = 0;\r
}\r
\r
\r
int len, rs = rendstatus;\r
static int dirty_count;\r
\r
- if (!sh && !(rs & PDRAW_ACC_SPRITES) && Pico.m.dirtyPal == 1 && Scanline < 222)\r
+ if (!sh && !(rs & PDRAW_ACC_SPRITES) && Pico.m.dirtyPal == 1 && DrawScanline < 222)\r
{\r
// a hack for mid-frame palette changes\r
if (!(rs & PDRAW_SONIC_MODE))\r
\r
static void (*FinalizeLine)(int sh) = FinalizeLineBGR444;\r
\r
-// hblank was enabled early during prev line processng -\r
-// it should have been blanked\r
-static void handle_early_blank(int scanline, int sh)\r
+// --------------------------------------------\r
+\r
+static void DrawBlankedLine(void)\r
{\r
- scanline--;\r
+ int sh=(Pico.video.reg[0xC]&8)>>3; // shadow/hilight?\r
\r
if (PicoScanBegin != NULL)\r
- PicoScanBegin(scanline);\r
+ PicoScanBegin(DrawScanline);\r
\r
BackFill(Pico.video.reg[7], sh);\r
\r
FinalizeLine(sh);\r
\r
if (PicoScanEnd != NULL)\r
- PicoScanEnd(scanline);\r
+ PicoScanEnd(DrawScanline);\r
}\r
\r
-// --------------------------------------------\r
-\r
static int DrawDisplay(int sh, int as)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
win=pvid->reg[0x12];\r
edge=(win&0x1f)<<3;\r
\r
- if (win&0x80) { if (Scanline>=edge) hvwind=1; }\r
- else { if (Scanline< edge) hvwind=1; }\r
+ if (win&0x80) { if (DrawScanline>=edge) hvwind=1; }\r
+ else { if (DrawScanline< edge) hvwind=1; }\r
\r
if (!hvwind) { // we might have a vertical window here\r
win=pvid->reg[0x11];\r
DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 1, sh);\r
} else\r
if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, 328);\r
- DrawAllSpritesHiPri(HighCacheS, maxw, 1, sh);\r
+ if (HighCacheS[0]) DrawAllSpritesHiPri(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
+ printf("%i:%03i: a=%i, b=%i\n", Pico.m.frame_count, DrawScanline, a, b);\r
}\r
#endif\r
\r
\r
if (Pico.m.dirtyPal) Pico.m.dirtyPal = 2; // reset dirty if needed\r
\r
+ DrawScanline=0;\r
PrepareSprites(1);\r
skip_next_line=0;\r
}\r
\r
-PICO_INTERNAL int PicoLine(int scan)\r
+static void PicoLine(void)\r
{\r
int sh, as = 0;\r
- if (skip_next_line>0) { skip_next_line--; return 0; } // skip_next_line rendering lines\r
+ if (skip_next_line>0) { skip_next_line--; return; } // skip rendering lines\r
\r
- Scanline=scan;\r
sh=(Pico.video.reg[0xC]&8)>>3; // shadow/hilight?\r
if (rendstatus & PDRAW_ACC_SPRITES) as|=1; // accurate sprites\r
\r
- if (rendstatus & PDRAW_EARLY_BLANK) {\r
- if (scan > 0) handle_early_blank(scan, sh);\r
- rendstatus &= ~PDRAW_EARLY_BLANK;\r
- }\r
-\r
if (PicoScanBegin != NULL)\r
- skip_next_line = PicoScanBegin(scan);\r
+ skip_next_line = PicoScanBegin(DrawScanline);\r
\r
// Draw screen:\r
BackFill(Pico.video.reg[7], sh|as);\r
FinalizeLine(sh);\r
\r
if (PicoScanEnd != NULL)\r
- PicoScanEnd(scan);\r
-\r
- return 0;\r
+ PicoScanEnd(DrawScanline);\r
}\r
\r
+void PicoDrawSync(int to, int blank_last_line)\r
+{\r
+ for (; DrawScanline < to; DrawScanline++)\r
+ {\r
+#if !CAN_HANDLE_240_LINES\r
+ if (DrawScanline >= 224) break;\r
+#endif\r
+ PicoLine();\r
+ }\r
+\r
+#if !CAN_HANDLE_240_LINES\r
+ if (DrawScanline >= 224) DrawScanline = 240, return;\r
+#endif\r
+\r
+ // last line\r
+ if (DrawScanline <= to)\r
+ {\r
+ if (blank_last_line)\r
+ DrawBlankedLine();\r
+ else PicoLine();\r
+ DrawScanline++;\r
+ }\r
+}\r
\r
void PicoDrawSetColorFormat(int which)\r
{\r
notaz.gp2x.de / picodrive.git / blobdiff