X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FDraw.c;h=c07662495f1ba95a97fd46a4d5ac8a5c497e0d64;hb=c060a9ab9c428e1ed9c4159b56529a2a36031e44;hp=7c092de76d1f0650c577acb5184bd73e76c44378;hpb=e5fa9817777032758511868c8aaa9ff780786c3f;p=picodrive.git diff --git a/Pico/Draw.c b/Pico/Draw.c index 7c092de..c076624 100644 --- a/Pico/Draw.c +++ b/Pico/Draw.c @@ -34,20 +34,23 @@ void *DrawLineDest=DefOutBuff; // pointer to dest buffer where to draw this line static int HighCacheA[41+1]; // caches for high layers static int HighCacheB[41+1]; -static int HighCacheS[80+1]; // and sprites -static int HighPreSpr[80*2+1]; // slightly preprocessed sprites +int HighPreSpr[80*2+1]; // slightly preprocessed sprites + +#define MAX_LINE_SPRITES 29 +#define SPRL_HAVE_HI 0x80 // have hi priority sprites +#define SPRL_HAVE_LO 0x40 // *lo* +#define SPRL_MAY_HAVE_OP 0x20 // may have operator sprites on the line +#define SPRL_LO_ABOVE_HI 0x10 // low priority sprites may be on top of hi +unsigned char HighLnSpr[240][3 + MAX_LINE_SPRITES]; // sprite_count, ^flags, tile_count, [spritep]... int rendstatus = 0; -int Scanline = 0; // Scanline +int DrawScanline = 0; +int PicoDrawMask = -1; -static int SpriteBlocks; static int skip_next_line=0; //unsigned short ppt[] = { 0x0f11, 0x0ff1, 0x01f1, 0x011f, 0x01ff, 0x0f1f, 0x0f0e, 0x0e7c }; -static void (*DrawAllSpritesLoPri)(int *hcache, int maxwidth, int prio, int sh) = NULL; -static void (*DrawAllSpritesHiPri)(int *hcache, int maxwidth, int prio, int sh) = NULL; - struct TileStrip { int nametab; // Position in VRAM of name table (for this tile line) @@ -62,9 +65,9 @@ struct TileStrip #ifdef _ASM_DRAW_C void DrawWindow(int tstart, int tend, int prio, int sh); void BackFill(int reg7, int sh); -void DrawSprite(int *sprite, int **hc, int sh, int as); +void DrawAllSprites(unsigned char *sprited, int prio, int sh); void DrawTilesFromCache(int *hc, int sh, int rlim); -void DrawSpritesFromCache(int *hc, int maxwidth, int prio, int sh); +void DrawSpritesSHi(unsigned char *sprited); void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells); void FinalizeLineBGR444(int sh); void FinalizeLineRGB555(int sh); @@ -82,202 +85,117 @@ void blockcpy_or(void *dst, void *src, size_t n, int pat) #endif +#define TileNormMaker(funcname,pix_func) \ +static int funcname(int sx,int addr,int pal) \ +{ \ + unsigned char *pd = HighCol+sx; \ + unsigned int pack=0; unsigned int t=0; \ + \ + pack=*(unsigned int *)(Pico.vram+addr); /* Get 8 pixels */ \ + if (pack) \ + { \ + t=(pack&0x0000f000)>>12; pix_func(0); \ + t=(pack&0x00000f00)>> 8; pix_func(1); \ + t=(pack&0x000000f0)>> 4; pix_func(2); \ + t=(pack&0x0000000f) ; pix_func(3); \ + t=(pack&0xf0000000)>>28; pix_func(4); \ + t=(pack&0x0f000000)>>24; pix_func(5); \ + t=(pack&0x00f00000)>>20; pix_func(6); \ + t=(pack&0x000f0000)>>16; pix_func(7); \ + return 0; \ + } \ + \ + return 1; /* Tile blank */ \ +} + + +#define TileFlipMaker(funcname,pix_func) \ +static int funcname(int sx,int addr,int pal) \ +{ \ + unsigned char *pd = HighCol+sx; \ + unsigned int pack=0; unsigned int t=0; \ + \ + pack=*(unsigned int *)(Pico.vram+addr); /* Get 8 pixels */ \ + if (pack) \ + { \ + t=(pack&0x000f0000)>>16; pix_func(0); \ + t=(pack&0x00f00000)>>20; pix_func(1); \ + t=(pack&0x0f000000)>>24; pix_func(2); \ + t=(pack&0xf0000000)>>28; pix_func(3); \ + t=(pack&0x0000000f) ; pix_func(4); \ + t=(pack&0x000000f0)>> 4; pix_func(5); \ + t=(pack&0x00000f00)>> 8; pix_func(6); \ + t=(pack&0x0000f000)>>12; pix_func(7); \ + return 0; \ + } \ + \ + return 1; /* Tile blank */ \ +} + + #ifdef _ASM_DRAW_C_AMIPS int TileNorm(int sx,int addr,int pal); int TileFlip(int sx,int addr,int pal); #else -static int TileNorm(int sx,int addr,int pal) -{ - unsigned char *pd = HighCol+sx; - unsigned int pack=0; unsigned int t=0; - pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels - if (pack) - { - t=pack&0x0000f000; if (t) pd[0]=(unsigned char)(pal|(t>>12)); - t=pack&0x00000f00; if (t) pd[1]=(unsigned char)(pal|(t>> 8)); - t=pack&0x000000f0; if (t) pd[2]=(unsigned char)(pal|(t>> 4)); - t=pack&0x0000000f; if (t) pd[3]=(unsigned char)(pal|(t )); - t=pack&0xf0000000; if (t) pd[4]=(unsigned char)(pal|(t>>28)); - t=pack&0x0f000000; if (t) pd[5]=(unsigned char)(pal|(t>>24)); - t=pack&0x00f00000; if (t) pd[6]=(unsigned char)(pal|(t>>20)); - t=pack&0x000f0000; if (t) pd[7]=(unsigned char)(pal|(t>>16)); - return 0; - } +#define pix_just_write(x) \ + if (t) pd[x]=pal|t - return 1; // Tile blank -} +TileNormMaker(TileNorm,pix_just_write) +TileFlipMaker(TileFlip,pix_just_write) -static int TileFlip(int sx,int addr,int pal) -{ - unsigned char *pd = HighCol+sx; - unsigned int pack=0; unsigned int t=0; - - pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels - if (pack) - { - t=pack&0x000f0000; if (t) pd[0]=(unsigned char)(pal|(t>>16)); - t=pack&0x00f00000; if (t) pd[1]=(unsigned char)(pal|(t>>20)); - t=pack&0x0f000000; if (t) pd[2]=(unsigned char)(pal|(t>>24)); - t=pack&0xf0000000; if (t) pd[3]=(unsigned char)(pal|(t>>28)); - t=pack&0x0000000f; if (t) pd[4]=(unsigned char)(pal|(t )); - t=pack&0x000000f0; if (t) pd[5]=(unsigned char)(pal|(t>> 4)); - t=pack&0x00000f00; if (t) pd[6]=(unsigned char)(pal|(t>> 8)); - t=pack&0x0000f000; if (t) pd[7]=(unsigned char)(pal|(t>>12)); - return 0; - } - return 1; // Tile blank -} #endif -// tile renderers for hacky operator sprite support -#define sh_pix(x) \ - if(!t); \ - else if(t==0xe) pd[x]=(unsigned char)((pd[x]&0x3f)|0x80); /* hilight */ \ - else if(t==0xf) pd[x]=(unsigned char)( pd[x] |0xc0); /* shadow */ \ - else pd[x]=(unsigned char)(pal|t) - #ifndef _ASM_DRAW_C -static int TileNormSH(int sx,int addr,int pal) -{ - unsigned int pack=0; unsigned int t=0; - unsigned char *pd = HighCol+sx; - - pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels - if (pack) - { - t=(pack&0x0000f000)>>12; sh_pix(0); - t=(pack&0x00000f00)>> 8; sh_pix(1); - t=(pack&0x000000f0)>> 4; sh_pix(2); - t=(pack&0x0000000f) ; sh_pix(3); - t=(pack&0xf0000000)>>28; sh_pix(4); - t=(pack&0x0f000000)>>24; sh_pix(5); - t=(pack&0x00f00000)>>20; sh_pix(6); - t=(pack&0x000f0000)>>16; sh_pix(7); - return 0; - } - - return 1; // Tile blank -} - -static int TileFlipSH(int sx,int addr,int pal) -{ - unsigned int pack=0; unsigned int t=0; - unsigned char *pd = HighCol+sx; - pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels - if (pack) - { - t=(pack&0x000f0000)>>16; sh_pix(0); - t=(pack&0x00f00000)>>20; sh_pix(1); - t=(pack&0x0f000000)>>24; sh_pix(2); - t=(pack&0xf0000000)>>28; sh_pix(3); - t=(pack&0x0000000f) ; sh_pix(4); - t=(pack&0x000000f0)>> 4; sh_pix(5); - t=(pack&0x00000f00)>> 8; sh_pix(6); - t=(pack&0x0000f000)>>12; sh_pix(7); - return 0; - } - return 1; // Tile blank -} -#endif +// draw a sprite pixel, process operator colors +#define pix_sh(x) \ + if (!t); \ + else if (t==0xe) pd[x]=(pd[x]&0x3f)|0x80; /* hilight */ \ + else if (t==0xf) pd[x]= pd[x] |0xc0; /* shadow */ \ + else pd[x]=pal|t -#define tilepixelAS(mask,index,shift) \ - if (!(pd[index]&0xc0)) { t=pack&mask; if (t) pd[index]=(pal|(t>>shift)); } +TileNormMaker(TileNormSH, pix_sh) +TileFlipMaker(TileFlipSH, pix_sh) -static int TileNormAS(int sx,int addr,int pal) -{ - unsigned char *pd = HighCol+sx; - unsigned int pack=0; unsigned int t=0; +// draw a sprite pixel ignoring operator colors +#define pix_sh_noop(x) \ + if (t && t < 0xe) \ + pd[x]=pal|t - pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels - if (pack) - { - tilepixelAS(0x0000f000, 0, 12); - tilepixelAS(0x00000f00, 1, 8); - tilepixelAS(0x000000f0, 2, 4); - tilepixelAS(0x0000000f, 3, 0); - tilepixelAS(0xf0000000, 4, 28); - tilepixelAS(0x0f000000, 5, 24); - tilepixelAS(0x00f00000, 6, 20); - tilepixelAS(0x000f0000, 7, 16); - return 0; - } +TileNormMaker(TileNormSH_noop, pix_sh_noop) +TileFlipMaker(TileFlipSH_noop, pix_sh_noop) - return 1; // Tile blank -} +// process operator pixels only, apply only on low pri tiles +#define pix_sh_onlyop(x) \ + if (t==0xe && (pd[x]&0x40)) pd[x]=(pd[x]&0x3f)|0x80; /* hilight */ \ + else if (t==0xf && (pd[x]&0x40)) pd[x]= pd[x] |0xc0; /* shadow */ -static int TileFlipAS(int sx,int addr,int pal) -{ - unsigned char *pd = HighCol+sx; - unsigned int pack=0; unsigned int t=0; +TileNormMaker(TileNormSH_onlyop_lp, pix_sh_onlyop) +TileFlipMaker(TileFlipSH_onlyop_lp, pix_sh_onlyop) - pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels - if (pack) - { - tilepixelAS(0x000f0000, 0, 16); - tilepixelAS(0x00f00000, 1, 20); - tilepixelAS(0x0f000000, 2, 24); - tilepixelAS(0xf0000000, 3, 28); - tilepixelAS(0x0000000f, 4, 0); - tilepixelAS(0x000000f0, 5, 4); - tilepixelAS(0x00000f00, 6, 8); - tilepixelAS(0x0000f000, 7, 12); - return 0; - } - return 1; // Tile blank -} +#endif -// there is a problem with transparent hi pri tiles (on layer), it will clear high bits -// and sprite tiles will be drawn needlessly. Hopefully that won't happen much.. -#define sh_pixAS(x) \ - if(!t); \ - else if(t==0xe) pd[x]=(unsigned char)((pd[x]&0x3f)|0x80); /* hilight */ \ - else if(t==0xf) pd[x]=(unsigned char)( pd[x] |0xc0); /* shadow */ \ - else if(!(pd[x]&0xc0)) pd[x]=(unsigned char)(pal|t) +// draw a sprite pixel (AS) +#define pix_as(x) \ + if (t && !(pd[x]&0x80)) pd[x]=pal|t -static int TileNormSHAS(int sx,int addr,int pal) -{ - unsigned int pack=0; unsigned int t=0; - unsigned char *pd = HighCol+sx; +TileNormMaker(TileNormAS, pix_as) +TileFlipMaker(TileFlipAS, pix_as) - pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels - if (pack) - { - t=(pack&0x0000f000)>>12; sh_pixAS(0); - t=(pack&0x00000f00)>> 8; sh_pixAS(1); - t=(pack&0x000000f0)>> 4; sh_pixAS(2); - t=(pack&0x0000000f) ; sh_pixAS(3); - t=(pack&0xf0000000)>>28; sh_pixAS(4); - t=(pack&0x0f000000)>>24; sh_pixAS(5); - t=(pack&0x00f00000)>>20; sh_pixAS(6); - t=(pack&0x000f0000)>>16; sh_pixAS(7); - return 0; - } +// draw a sprite pixel, skip operator colors (AS) +#define pix_sh_as_noop(x) \ + if (t && t < 0xe && !(pd[x]&0x80)) pd[x]=pal|t - return 1; // Tile blank -} +TileNormMaker(TileNormAS_noop, pix_sh_as_noop) +TileFlipMaker(TileFlipAS_noop, pix_sh_as_noop) -static int TileFlipSHAS(int sx,int addr,int pal) -{ - unsigned int pack=0; unsigned int t=0; - unsigned char *pd = HighCol+sx; +// mark pixel as sprite pixel (AS) +#define pix_sh_as_onlymark(x) \ + if (t) pd[x]|=0x80 - pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels - if (pack) - { - t=(pack&0x000f0000)>>16; sh_pixAS(0); - t=(pack&0x00f00000)>>20; sh_pixAS(1); - t=(pack&0x0f000000)>>24; sh_pixAS(2); - t=(pack&0xf0000000)>>28; sh_pixAS(3); - t=(pack&0x0000000f) ; sh_pixAS(4); - t=(pack&0x000000f0)>> 4; sh_pixAS(5); - t=(pack&0x00000f00)>> 8; sh_pixAS(6); - t=(pack&0x0000f000)>>12; sh_pixAS(7); - return 0; - } - return 1; // Tile blank -} +TileNormMaker(TileNormAS_onlymark, pix_sh_as_onlymark) +TileFlipMaker(TileFlipAS_onlymark, pix_sh_as_onlymark) // -------------------------------------------- @@ -338,7 +256,7 @@ void DrawStripVSRam(struct TileStrip *ts, int plane_sh, int cellskip) { int tilex,dx,code=0,addr=0,cell=0; int oldcode=-1,blank=-1; // The tile we know is blank - int pal=0,scan=Scanline; + int pal=0,scan=DrawScanline; // Draw tiles across screen: tilex=(-ts->hscroll)>>3; @@ -473,7 +391,7 @@ static void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells) else ts.nametab=(pvid->reg[2]&0x38)<< 9; // A htab=pvid->reg[13]<<9; // Horizontal scroll table address - if ( pvid->reg[11]&2) htab+=Scanline<<1; // Offset by line + if ( pvid->reg[11]&2) htab+=DrawScanline<<1; // Offset by line if ((pvid->reg[11]&1)==0) htab&=~0xf; // Offset by tile htab+=plane_sh&1; // A or B @@ -485,7 +403,7 @@ static void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells) vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value // Find the line in the name table - ts.line=(vscroll+(Scanline<<1))&((ymask<<1)|1); + ts.line=(vscroll+(DrawScanline<<1))&((ymask<<1)|1); ts.nametab+=(ts.line>>4)<>3)<reg[12]&1) { nametab=(pvid->reg[3]&0x3c)<<9; // 40-cell mode - nametab+=(Scanline>>3)<<6; + nametab+=(DrawScanline>>3)<<6; } else { nametab=(pvid->reg[3]&0x3e)<<9; // 32-cell mode - nametab+=(Scanline>>3)<<5; + nametab+=(DrawScanline>>3)<<5; } tilex=tstart<<1; - tend<<=1; - - ty=(Scanline&7)<<1; // Y-Offset into tile if (!(rendstatus & PDRAW_WND_DIFF_PRIO)) { // check the first tile code @@ -539,6 +454,9 @@ static void DrawWindow(int tstart, int tend, int prio, int sh) // int *hcache if ((code>>15) != prio) return; } + tend<<=1; + ty=(DrawScanline&7)<<1; // Y-Offset into tile + // Draw tiles across screen: if (!sh) { @@ -571,7 +489,7 @@ static void DrawWindow(int tstart, int tend, int prio, int sh) // int *hcache for (; tilex < tend; tilex++) { int addr=0,zero=0; - int pal, tmp, *zb; + int pal; code=Pico.vram[nametab+tilex]; if(code==blank) continue; @@ -582,15 +500,10 @@ static void DrawWindow(int tstart, int tend, int prio, int sh) // int *hcache pal=((code>>9)&0x30); - zb = (int *)(HighCol+8+(tilex<<3)); - if(prio) { - tmp = *zb; - if(!(tmp&0x00000080)) tmp&=~0x000000c0; if(!(tmp&0x00008000)) tmp&=~0x0000c000; - if(!(tmp&0x00800000)) tmp&=~0x00c00000; if(!(tmp&0x80000000)) tmp&=~0xc0000000; - *zb++=tmp; tmp = *zb; - if(!(tmp&0x00000080)) tmp&=~0x000000c0; if(!(tmp&0x00008000)) tmp&=~0x0000c000; - if(!(tmp&0x00800000)) tmp&=~0x00c00000; if(!(tmp&0x80000000)) tmp&=~0xc0000000; - *zb++=tmp; + if (prio) { + int *zb = (int *)(HighCol+8+(tilex<<3)); + *zb++ &= 0x3f3f3f3f; + *zb &= 0x3f3f3f3f; } else { pal |= 0x40; } @@ -617,14 +530,7 @@ static void DrawTilesFromCacheShPrep(void) rendstatus |= PDRAW_SHHI_DONE; 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++; + *zb++ &= 0x3f3f3f3f; } } @@ -671,10 +577,8 @@ static void DrawTilesFromCache(int *hc, int sh, int rlim) 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++; + *zb++ &= 0x3f; *zb++ &= 0x3f; *zb++ &= 0x3f; *zb++ &= 0x3f; + *zb++ &= 0x3f; *zb++ &= 0x3f; *zb++ &= 0x3f; *zb++ &= 0x3f; pal=((code>>9)&0x30); if (rlim-dx < 0) goto last_cut_tile; @@ -709,13 +613,13 @@ last_cut_tile: 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; + 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; } } } @@ -726,7 +630,7 @@ last_cut_tile: // Index + 0 : hhhhvvvv ab--hhvv yyyyyyyy yyyyyyyy // a: offscreen h, b: offs. v, h: horiz. size // Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8 -static void DrawSprite(int *sprite, int **hc, int sh, int as) +static void DrawSprite(int *sprite, int sh) { int width=0,height=0; int row=0,code=0; @@ -743,29 +647,23 @@ static void DrawSprite(int *sprite, int **hc, int sh, int as) height=(sy>>24)&7; // Width and height in tiles sy=(sy<<16)>>16; // Y - row=Scanline-sy; // Row of the sprite we are on + row=DrawScanline-sy; // Row of the sprite we are on if (code&0x1000) row=(height<<3)-1-row; // Flip Y - tile=code&0x7ff; // Tile number - tile+=row>>3; // Tile number increases going down + tile=code + (row>>3); // Tile number increases going down delta=height; // Delta to increase tile by going right if (code&0x0800) { tile+=delta*(width-1); delta=-delta; } // Flip X - tile<<=4; tile+=(row&7)<<1; // Tile address - - if (code&0x8000) { // high priority - cache it - *(*hc)++ = (tile<<16)|((code&0x0800)<<5)|((sx<<6)&0x0000ffc0)|((code>>9)&0x30)|((sprite[0]>>16)&0xf); - // we need all for accurate sprites, cached will be used to recover ones overwritten by high layer - if (!as) return; - } - + tile &= 0x7ff; tile<<=4; tile+=(row&7)<<1; // Tile address delta<<=4; // Delta of address - pal=((code>>9)&0x30)|((sh|as)<<6); + + pal=(code>>9)&0x30; + pal|=sh<<6; if (sh && (code&0x6000) == 0x6000) { - if(code&0x0800) fTileFunc=TileFlipSH; - else fTileFunc=TileNormSH; + if(code&0x0800) fTileFunc=TileFlipSH_noop; + else fTileFunc=TileNormSH_noop; } else { if(code&0x0800) fTileFunc=TileFlip; else fTileFunc=TileNorm; @@ -797,7 +695,7 @@ static void DrawSpriteInterlace(unsigned int *sprite) width=(height>>2)&3; height&=3; width++; height++; // Width and height in tiles - row=(Scanline<<1)-sy; // Row of the sprite we are on + row=(DrawScanline<<1)-sy; // Row of the sprite we are on code=sprite[1]; sx=((code>>16)&0x1ff)-0x78; // X @@ -826,10 +724,10 @@ static void DrawSpriteInterlace(unsigned int *sprite) } -static void DrawAllSpritesInterlace(int *hcache, int maxwidth, int pri, int sh) +static void DrawAllSpritesInterlace(int pri, int sh) { struct PicoVideo *pvid=&Pico.video; - int i,u,table,link=0,sline=Scanline<<1; + int i,u,table,link=0,sline=DrawScanline<<1; unsigned int *sprites[80]; // Sprite index table=pvid->reg[5]&0x7f; @@ -856,7 +754,7 @@ static void DrawAllSpritesInterlace(int *hcache, int maxwidth, int pri, int sh) // check if sprite is not hidden offscreen sx = (sx>>16)&0x1ff; sx -= 0x78; // Get X coordinate + 8 - if(sx <= -8*3 || sx >= maxwidth) goto nextsprite; + if(sx <= -8*3 || sx >= 328) goto nextsprite; // sprite is good, save it's pointer sprites[i++]=sprite; @@ -874,32 +772,64 @@ static void DrawAllSpritesInterlace(int *hcache, int maxwidth, int pri, int sh) #ifndef _ASM_DRAW_C -static void DrawSpritesFromCache(int *hc, int maxwidth, int prio, int sh) +// Index + 0 : hhhhvvvv ----hhvv yyyyyyyy yyyyyyyy // v, h: vert./horiz. size +// Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8 +static void DrawSpritesSHi(unsigned char *sprited) { - int code, tile, sx, delta, width; - int pal; int (*fTileFunc)(int sx,int addr,int pal); + unsigned char *p; + int cnt; - // *(*hc)++ = (tile<<16)|((code&0x0800)<<5)|((sx<<6)&0x0000ffc0)|((code>>9)&0x30)|((sprite[0]>>24)&0xf); - - while((code=*hc++)) { - pal=(code&0x30); - delta=code&0xf; - width=delta>>2; delta&=3; - width++; delta++; // Width and height in tiles - if (code&0x10000) delta=-delta; // Flip X - delta<<=4; - tile=((unsigned int)code>>17)<<1; - sx=(code<<16)>>22; // sx can be negative (start offscreen), so sign extend - - if(sh && pal == 0x30) { // - if(code&0x10000) fTileFunc=TileFlipSH; - else fTileFunc=TileNormSH; + cnt = sprited[0] & 0x7f; + if (cnt == 0) return; + + p = &sprited[3]; + + // Go through sprites backwards: + for (cnt--; cnt >= 0; cnt--) + { + int *sprite, code, pal, tile, sx, sy; + int offs, delta, width, height, row; + + offs = (p[cnt] & 0x7f) * 2; + sprite = HighPreSpr + offs; + code = sprite[1]; + pal = (code>>9)&0x30; + + if (pal == 0x30) + { + if (code & 0x8000) // hi priority + { + if (code&0x800) fTileFunc=TileFlipSH; + else fTileFunc=TileNormSH; + } else { + if (code&0x800) fTileFunc=TileFlipSH_onlyop_lp; + else fTileFunc=TileNormSH_onlyop_lp; + } } else { - if(code&0x10000) fTileFunc=TileFlip; - else fTileFunc=TileNorm; + if (!(code & 0x8000)) continue; // non-operator low sprite, already drawn + if (code&0x800) fTileFunc=TileFlip; + else fTileFunc=TileNorm; } + // parse remaining sprite data + sy=sprite[0]; + sx=code>>16; // X + width=sy>>28; + height=(sy>>24)&7; // Width and height in tiles + sy=(sy<<16)>>16; // Y + + row=DrawScanline-sy; // Row of the sprite we are on + + if (code&0x1000) row=(height<<3)-1-row; // Flip Y + + tile=code + (row>>3); // Tile number increases going down + delta=height; // Delta to increase tile by going right + if (code&0x0800) { tile+=delta*(width-1); delta=-delta; } // Flip X + + tile &= 0x7ff; tile<<=4; tile+=(row&7)<<1; // Tile address + delta<<=4; // Delta of address + for (; width; width--,sx+=8,tile+=delta) { if(sx<=0) continue; @@ -912,32 +842,64 @@ static void DrawSpritesFromCache(int *hc, int maxwidth, int prio, int sh) } #endif -static void DrawSpritesFromCacheAS(int *hc, int maxwidth, int prio, int sh) +static void DrawSpritesHiAS(unsigned char *sprited, int sh) { - int code, tile, sx, delta, width; - int pal; int (*fTileFunc)(int sx,int addr,int pal); + unsigned char *p; + int entry, cnt, sh_cnt = 0; + + cnt = sprited[0] & 0x7f; + if (cnt == 0) return; - // *(*hc)++ = (tile<<16)|((code&0x0800)<<5)|((sx<<6)&0x0000ffc0)|((code>>9)&0x30)|((sprite[0]>>24)&0xf); - - while((code=*hc++)) { - pal=(code&0x30); - delta=code&0xf; - width=delta>>2; delta&=3; - width++; delta++; // Width and height in tiles - if (code&0x10000) delta=-delta; // Flip X - delta<<=4; - tile=((unsigned int)code>>17)<<1; - sx=(code<<16)>>22; // sx can be negative (start offscreen), so sign extend - - if(sh && pal == 0x30) { // - if(code&0x10000) fTileFunc=TileFlipSHAS; - else fTileFunc=TileNormSHAS; + p = &sprited[3]; + + // Go through sprites: + for (entry = 0; entry < cnt; entry++) + { + int *sprite, code, pal, tile, sx, sy; + int offs, delta, width, height, row; + + offs = (p[entry] & 0x7f) * 2; + sprite = HighPreSpr + offs; + code = sprite[1]; + pal = (code>>9)&0x30; + + if (code & 0x8000) // hi priority + { + if (sh && pal == 0x30) + { + if (code&0x800) fTileFunc=TileFlipAS_noop; + else fTileFunc=TileNormAS_noop; + } else { + if (code&0x800) fTileFunc=TileFlipAS; + else fTileFunc=TileNormAS; + } } else { - if(code&0x10000) fTileFunc=TileFlipAS; - else fTileFunc=TileNormAS; + if (code&0x800) fTileFunc=TileFlipAS_onlymark; + else fTileFunc=TileNormAS_onlymark; } + if (sh && pal == 0x30) + p[sh_cnt++] = offs / 2; // re-save for sh/hi pass + + // parse remaining sprite data + sy=sprite[0]; + sx=code>>16; // X + width=sy>>28; + height=(sy>>24)&7; // Width and height in tiles + sy=(sy<<16)>>16; // Y + + row=DrawScanline-sy; // Row of the sprite we are on + + if (code&0x1000) row=(height<<3)-1-row; // Flip Y + tile=code + (row>>3); // Tile number increases going down + delta=height; // Delta to increase tile by going right + if (code&0x0800) { tile+=delta*(width-1); delta=-delta; } // Flip X + + tile &= 0x7ff; tile<<=4; tile+=(row&7)<<1; // Tile address + delta<<=4; // Delta of address + + pal |= 0x80; for (; width; width--,sx+=8,tile+=delta) { if(sx<=0) continue; @@ -947,21 +909,46 @@ static void DrawSpritesFromCacheAS(int *hc, int maxwidth, int prio, int sh) fTileFunc(sx,tile,pal); } } + + if (!sh || !(sprited[1]&SPRL_MAY_HAVE_OP)) return; + + /* nasty 1: remove 'sprite' flags */ + { + int c = 320/4, *zb = (int *)(HighCol+8); + while (c--) + { + *zb++ &= 0x7f7f7f7f; + } + } + + /* nasty 2: sh operator pass */ + sprited[0] = sh_cnt; + DrawSpritesSHi(sprited); } // Index + 0 : ----hhvv -lllllll -------y yyyyyyyy // Index + 4 : -------x xxxxxxxx pccvhnnn nnnnnnnn // v -// Index + 0 : hhhhvvvv ab--hhvv yyyyyyyy yyyyyyyy // a: offscreen h, b: offs. v, h: horiz. size +// Index + 0 : hhhhvvvv ----hhvv yyyyyyyy yyyyyyyy // v, h: vert./horiz. size // Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8 -static void PrepareSprites(int full) +void PrepareSprites(int full) { struct PicoVideo *pvid=&Pico.video; - int u=0,link=0,sblocks=0; + int u,link=0,sh; int table=0; int *pd = HighPreSpr; + int max_lines = 224, max_sprites = 80, max_width = 328; + int max_line_sprites = 20; // 20 sprites, 40 tiles + + if (!(Pico.video.reg[12]&1)) + max_sprites = 64, max_line_sprites = 16, max_width = 264; + if (PicoOpt & POPT_DIS_SPRITE_LIM) + max_line_sprites = MAX_LINE_SPRITES; + + if (pvid->reg[1]&8) max_lines = 240; + sh = Pico.video.reg[0xC]&8; // shadow/hilight? table=pvid->reg[5]&0x7f; if (pvid->reg[12]&1) table&=0x7e; // Lowest bit 0 in 40-cell mode @@ -971,41 +958,62 @@ static void PrepareSprites(int full) { int pack; // updates: tilecode, sx - for (u=0; u < 80 && (pack = *pd); u++, pd+=2) + for (u=0; u < max_lines && (pack = *pd); u++, pd+=2) { unsigned int *sprite; - int code, code2, sx, sy, skip=0; + int code2, sx, sy, height; sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite // parse sprite info - code = sprite[0]; code2 = sprite[1]; - code2 &= ~0xfe000000; - code2 -= 0x00780000; // Get X coordinate + 8 in upper 16 bits - sx = code2>>16; + sx = (code2>>16)&0x1ff; + sx -= 0x78; // Get X coordinate + 8 + sy = (pack << 16) >> 16; + height = (pack >> 24) & 0xf; - if((sx <= 8-((pack>>28)<<3) && sx >= -0x76) || sx >= 328) skip=1<<23; - else if ((sy = (pack<<16)>>16) < 240 && sy > -32) { - int sbl = (2<<(pack>>28))-1; - sblocks |= sbl<<(sy>>3); + if (sy < max_lines && sy + (height<<3) > DrawScanline && // sprite onscreen (y)? + (sx > -24 || sx < max_width)) // onscreen x + { + int y = (sy >= DrawScanline) ? sy : DrawScanline; + int entry = ((pd - HighPreSpr) / 2) | ((code2>>8)&0x80); + for (; y < sy + (height<<3) && y < max_lines; y++) + { + int i, cnt; + cnt = HighLnSpr[y][0] & 0x7f; + if (cnt >= max_line_sprites) continue; // sprite limit? + + for (i = 0; i < cnt; i++) + if (((HighLnSpr[y][3+i] ^ entry) & 0x7f) == 0) goto found; + + // this sprite was previously missing + HighLnSpr[y][3+cnt] = entry; + HighLnSpr[y][0] = cnt + 1; +found:; + if (entry & 0x80) + HighLnSpr[y][1] |= SPRL_HAVE_HI; + else HighLnSpr[y][1] |= SPRL_HAVE_LO; + } } - *pd = (pack&~(1<<23))|skip; - *(pd+1) = code2; + code2 &= ~0xfe000000; + code2 -= 0x00780000; // Get X coordinate + 8 in upper 16 bits + pd[1] = code2; // Find next sprite - link=(code>>16)&0x7f; - if(!link) break; // End of sprites + link=(sprite[0]>>16)&0x7f; + if (!link) break; // End of sprites } - SpriteBlocks |= sblocks; } else { - for (; u < 80; u++) + for (u = 0; u < max_lines; u++) + *((int *)&HighLnSpr[u][0]) = 0; + + for (u = 0; u < max_lines; u++) { unsigned int *sprite; - int code, code2, sx, sy, hv, height, width, skip=0, sx_min; + int code, code2, sx, sy, hv, height, width; sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite @@ -1015,109 +1023,104 @@ static void PrepareSprites(int full) hv = (code>>24)&0xf; height = (hv&3)+1; - if (sy > 240 || sy + (height<<3) <= 0) skip|=1<<22; // sprite offscreen (completely, y) - width = (hv>>2)+1; code2 = sprite[1]; sx = (code2>>16)&0x1ff; sx -= 0x78; // Get X coordinate + 8 - sx_min = 8-(width<<3); - - if ((sx <= sx_min && sx >= -0x76) || sx >= 328) skip|=1<<23; // offscreen x - else if (sx > sx_min && !skip) { - int sbl = (2<>3; - if(shi < 0) shi=0; // negative sy - sblocks |= sbl< DrawScanline) // sprite onscreen (y)? + { + int entry, y, sx_min, onscr_x, maybe_op = 0; + + sx_min = 8-(width<<3); + onscr_x = sx_min < sx && sx < max_width; + if (sh && (code2 & 0x6000) == 0x6000) + maybe_op = SPRL_MAY_HAVE_OP; + + entry = ((pd - HighPreSpr) / 2) | ((code2>>8)&0x80); + y = (sy >= DrawScanline) ? sy : DrawScanline; + for (; y < sy + (height<<3) && y < max_lines; y++) + { + unsigned char *p = &HighLnSpr[y][0]; + int cnt = p[0]; + if (cnt >= max_line_sprites) continue; // sprite limit? + + if (p[2] >= max_line_sprites*2) { // tile limit? + p[0] |= 0x80; + continue; + } + p[2] += width; + + if (sx == -0x78) { + if (cnt > 0) + p[0] |= 0x80; // masked, no more sprites for this line + continue; + } + // must keep the first sprite even if it's offscreen, for masking + if (cnt > 0 && !onscr_x) continue; // offscreen x + + p[3+cnt] = entry; + p[0] = cnt + 1; + p[1] |= (entry & 0x80) ? SPRL_HAVE_HI : SPRL_HAVE_LO; + p[1] |= maybe_op; // there might be op sprites on this line + if (cnt > 0 && (code2 & 0x8000) && !(p[3+cnt-1]&0x80)) + p[1] |= SPRL_LO_ABOVE_HI; + } } - *pd++ = (width<<28)|(height<<24)|skip|(hv<<16)|((unsigned short)sy); + *pd++ = (width<<28)|(height<<24)|(hv<<16)|((unsigned short)sy); *pd++ = (sx<<16)|((unsigned short)code2); // Find next sprite link=(code>>16)&0x7f; - if(!link) break; // End of sprites + if (!link) break; // End of sprites + } + *pd = 0; + +#if 0 + for (u = 0; u < max_lines; u++) + { + int y; + printf("c%03i: %2i, %2i: ", u, HighLnSpr[u][0] & 0x7f, HighLnSpr[u][2]); + for (y = 0; y < HighLnSpr[u][0] & 0x7f; y++) + printf(" %i", HighLnSpr[u][y+3]); + printf("\n"); } - SpriteBlocks = sblocks; - *pd = 0; // terminate +#endif } } -static void DrawAllSprites(int *hcache, int maxwidth, int prio, int sh) +#ifndef _ASM_DRAW_C +static void DrawAllSprites(unsigned char *sprited, int prio, int sh) { - int i,u,n; - int sx1seen = 0; // sprite with x coord 1 or 0 seen - int ntiles = 0; // tile counter for sprite limit emulation - int *sprites[40]; // Sprites to draw in fast mode - int max_line_sprites = 20; // 20 sprites, 40 tiles - int *ps, pack, rs = rendstatus, scan = Scanline; + int rs = rendstatus; + unsigned char *p; + int cnt; if (rs & (PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES)) { - //dprintf("PrepareSprites(%i) [%i]", (rs>>4)&1, scan); + //elprintf(EL_STATUS, "PrepareSprites(%i)", (rs>>4)&1); PrepareSprites(rs & PDRAW_DIRTY_SPRITES); rendstatus = rs & ~(PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES); } - if (!(SpriteBlocks & (1<<(scan>>3)))) { *hcache = 0; return; } - - if (PicoOpt & POPT_DIS_SPRITE_LIM) - max_line_sprites = 80; - ps = HighPreSpr; + cnt = sprited[0] & 0x7f; + if (cnt == 0) return; - // Index + 0 : hhhhvvvv ab--hhvv yyyyyyyy yyyyyyyy // a: offscreen h, b: offs. v, h: horiz. size - // Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8 + p = &sprited[3]; - for (i=u=n=0; (pack = *ps) && n < max_line_sprites; ps+=2, u++) + // Go through sprites backwards: + for (cnt--; cnt >= 0; cnt--) { - int sx, sy, row, pack2; - - if (pack & 0x00400000) continue; - - // get sprite info - pack2 = *(ps+1); - sx = pack2>>16; - sy = (pack <<16)>>16; - row = scan-sy; - - // elprintf(EL_ANOMALY, "x: %4i y: %4i p %i %ix%i", sx, sy, (pack2>>15)&1, (pack>>28)<<3, (pack>>21)&0x38); - - if (sx == -0x77) sx1seen|=1; // for masking mode 2 - - // check if it is on this line - if (row < 0 || row >= ((pack>>21)&0x38)) continue; // no - - // masking sprite? - if (sx == -0x78) { - if (n > 0) break; // masked - continue; - } - - n++; // number of sprites on this line (both visible and hidden, except of x=0) - - // sprite limit - ntiles += pack>>28; - if (ntiles > max_line_sprites*2) break; - - if (pack & 0x00800000) continue; - - // sprite is good, save it's pointer - sprites[i++]=ps; + int offs; + if ((p[cnt] >> 7) != prio) continue; + offs = (p[cnt]&0x7f) * 2; + DrawSprite(HighPreSpr + offs, sh); } - - n = (rs & PDRAW_ACC_SPRITES) ? 1 : 0; - - // Go through sprites backwards: - for (i--; i>=0; i--) - DrawSprite(sprites[i],&hcache,sh,n); - - // terminate cache list - *hcache = 0; } // -------------------------------------------- -#ifndef _ASM_DRAW_C static void BackFill(int reg7, int sh) { unsigned int back; @@ -1241,7 +1244,7 @@ static void FinalizeLine8bit(int sh) int len, rs = rendstatus; static int dirty_count; - if (!sh && !(rs & PDRAW_ACC_SPRITES) && Pico.m.dirtyPal == 1 && Scanline < 222) + if (!sh && !(rs & PDRAW_ACC_SPRITES) && Pico.m.dirtyPal == 1 && DrawScanline < 222) { // a hack for mid-frame palette changes if (!(rs & PDRAW_SONIC_MODE)) @@ -1276,14 +1279,14 @@ static void FinalizeLine8bit(int sh) static void (*FinalizeLine)(int sh) = FinalizeLineBGR444; -// hblank was enabled early during prev line processng - -// it should have been blanked -static void handle_early_blank(int scanline, int sh) +// -------------------------------------------- + +static void DrawBlankedLine(void) { - scanline--; + int sh=(Pico.video.reg[0xC]&8)>>3; // shadow/hilight? if (PicoScanBegin != NULL) - PicoScanBegin(scanline); + PicoScanBegin(DrawScanline); BackFill(Pico.video.reg[7], sh); @@ -1291,20 +1294,19 @@ static void handle_early_blank(int scanline, int sh) FinalizeLine(sh); if (PicoScanEnd != NULL) - PicoScanEnd(scanline); + PicoScanEnd(DrawScanline); } -// -------------------------------------------- - -static int DrawDisplay(int sh, int as) +static int DrawDisplay(int sh) { + unsigned char *sprited = &HighLnSpr[DrawScanline][0]; struct PicoVideo *pvid=&Pico.video; int win=0,edge=0,hvwind=0; - int maxw, maxcells; + int maxw,maxcells; rendstatus &= ~(PDRAW_SHHI_DONE|PDRAW_PLANE_HI_PRIO); - if(pvid->reg[12]&1) { + if (pvid->reg[12]&1) { maxw = 328; maxcells = 40; } else { maxw = 264; maxcells = 32; @@ -1314,10 +1316,11 @@ static int DrawDisplay(int sh, int as) win=pvid->reg[0x12]; edge=(win&0x1f)<<3; - if (win&0x80) { if (Scanline>=edge) hvwind=1; } - else { if (Scanline< edge) hvwind=1; } + if (win&0x80) { if (DrawScanline>=edge) hvwind=1; } + else { if (DrawScanline< 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) { @@ -1330,33 +1333,55 @@ static int DrawDisplay(int sh, int as) } } - DrawLayer(1|((sh|as)<<1), HighCacheB, 0, maxcells); - if (hvwind == 1) - DrawWindow(0, maxcells>>1, 0, sh|as); + /* - layer B low - */ + if (PicoDrawMask & PDRAW_LAYERB_ON) + DrawLayer(1|(sh<<1), HighCacheB, 0, maxcells); + /* - layer A low - */ + if (!(PicoDrawMask & PDRAW_LAYERA_ON)); + else if (hvwind == 1) + DrawWindow(0, maxcells>>1, 0, sh); else if (hvwind == 2) { - // ahh, we have vertical window - DrawLayer(0|((sh|as)<<1), HighCacheA, (win&0x80) ? 0 : edge<<1, (win&0x80) ? edge<<1 : maxcells); - DrawWindow( (win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 0, sh|as); + DrawLayer(0|(sh<<1), HighCacheA, (win&0x80) ? 0 : edge<<1, (win&0x80) ? edge<<1 : maxcells); + DrawWindow( (win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 0, sh); } else - DrawLayer(0|((sh|as)<<1), HighCacheA, 0, maxcells); - DrawAllSpritesLoPri(HighCacheS, maxw, 0, sh); - - if (HighCacheB[0]) DrawTilesFromCache(HighCacheB, sh, 328); - if (hvwind == 1) + DrawLayer(0|(sh<<1), HighCacheA, 0, maxcells); + /* - sprites low - */ + if (!(PicoDrawMask & PDRAW_SPRITES_LOW_ON)); + else if (rendstatus & PDRAW_INTERLACE) + DrawAllSpritesInterlace(0, sh); + else if (sprited[1] & SPRL_HAVE_LO) + DrawAllSprites(sprited, 0, sh); + + /* - layer B hi - */ + if ((PicoDrawMask & PDRAW_LAYERB_ON) && HighCacheB[0]) + DrawTilesFromCache(HighCacheB, sh, maxw); + /* - layer A hi - */ + if (!(PicoDrawMask & PDRAW_LAYERA_ON)); + else if (hvwind == 1) DrawWindow(0, maxcells>>1, 1, sh); else if (hvwind == 2) { - if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, (win&0x80) ? edge<<4 : 328); + if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, (win&0x80) ? edge<<4 : maxw); DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 1, sh); } else - if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, 328); - DrawAllSpritesHiPri(HighCacheS, maxw, 1, sh); + if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, maxw); + /* - sprites hi - */ + 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)) + DrawSpritesHiAS(sprited, sh); + else if (sh && (sprited[1] & SPRL_MAY_HAVE_OP)) + DrawSpritesSHi(sprited); + else if (sprited[1] & SPRL_HAVE_HI) + DrawAllSprites(sprited, 1, 0); #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); + printf("%i:%03i: a=%i, b=%i\n", Pico.m.frame_count, DrawScanline, a, b); } #endif @@ -1367,55 +1392,64 @@ static int DrawDisplay(int sh, int as) PICO_INTERNAL void PicoFrameStart(void) { // prepare to do this frame - rendstatus = (PicoOpt&0x80)>>5; // accurate sprites, clear everything else - if ((Pico.video.reg[12]&6) == 6) { + rendstatus = 0; + if (PicoOpt & POPT_ACC_SPRITES) + rendstatus |= PDRAW_ACC_SPRITES; + if ((Pico.video.reg[12]&6) == 6) rendstatus |= PDRAW_INTERLACE; // interlace mode - DrawAllSpritesLoPri = DrawAllSpritesInterlace; - DrawAllSpritesHiPri = DrawAllSpritesInterlace; - } - else - { - DrawAllSpritesLoPri = DrawAllSprites; - DrawAllSpritesHiPri = rendstatus ? DrawSpritesFromCacheAS : DrawSpritesFromCache; - } if (Pico.m.dirtyPal) Pico.m.dirtyPal = 2; // reset dirty if needed + DrawScanline=0; PrepareSprites(1); skip_next_line=0; } -PICO_INTERNAL int PicoLine(int scan) +static void PicoLine(void) { - int sh, as = 0; - if (skip_next_line>0) { skip_next_line--; return 0; } // skip_next_line rendering lines + int sh; + if (skip_next_line>0) { skip_next_line--; return; } // skip rendering lines - Scanline=scan; sh=(Pico.video.reg[0xC]&8)>>3; // shadow/hilight? - if (rendstatus & PDRAW_ACC_SPRITES) as|=1; // accurate sprites - - if (rendstatus & PDRAW_EARLY_BLANK) { - if (scan > 0) handle_early_blank(scan, sh); - rendstatus &= ~PDRAW_EARLY_BLANK; - } if (PicoScanBegin != NULL) - skip_next_line = PicoScanBegin(scan); + skip_next_line = PicoScanBegin(DrawScanline); // Draw screen: - BackFill(Pico.video.reg[7], sh|as); + BackFill(Pico.video.reg[7], sh); if (Pico.video.reg[1]&0x40) - DrawDisplay(sh, as); + DrawDisplay(sh); if (FinalizeLine != NULL) FinalizeLine(sh); if (PicoScanEnd != NULL) - PicoScanEnd(scan); - - return 0; + PicoScanEnd(DrawScanline); } +void PicoDrawSync(int to, int blank_last_line) +{ + for (; DrawScanline < to; DrawScanline++) + { +#if !CAN_HANDLE_240_LINES + if (DrawScanline >= 224) break; +#endif + PicoLine(); + } + +#if !CAN_HANDLE_240_LINES + if (DrawScanline >= 224) DrawScanline = 240, return; +#endif + + // last line + if (DrawScanline <= to) + { + if (blank_last_line) + DrawBlankedLine(); + else PicoLine(); + DrawScanline++; + } +} void PicoDrawSetColorFormat(int which) { @@ -1431,3 +1465,95 @@ void PicoDrawSetColorFormat(int which) #endif } +/* debug and fun */ +#define GREEN1 0x0700 +#ifdef USE_BGR555 + #define YELLOW1 0x071c + #define BLUE1 0xf000 + #define RED1 0x001e +#else + #define YELLOW1 0xe700 + #define BLUE1 0x001e + #define RED1 0xf000 +#endif + +static void set16(unsigned short *p, unsigned short d, int cnt) +{ + while (cnt-- > 0) + *p++ = d; +} + +void PicoDrawShowSpriteStats(unsigned short *screen, int stride) +{ + int lines, i, u, step; + unsigned short *dest; + unsigned char *p; + + step = (320-4*4-1) / MAX_LINE_SPRITES; + lines = 240; + if (!Pico.m.pal || !(Pico.video.reg[1]&8)) + lines = 224, screen += stride*8; + + for (i = 0; i < lines; i++) + { + dest = screen + stride*i; + p = &HighLnSpr[i][0]; + + // sprite graphs + for (u = 0; u < (p[0] & 0x7f); u++) { + set16(dest, (p[3+u] & 0x80) ? YELLOW1 : GREEN1, step); + dest += step; + } + + // flags + dest = screen + stride*i + 320-4*4; + if (p[1] & SPRL_HAVE_LO) set16(dest+4*0, GREEN1, 4); + if (p[1] & SPRL_HAVE_HI) set16(dest+4*1, YELLOW1, 4); + if (p[1] & SPRL_MAY_HAVE_OP) set16(dest+4*2, BLUE1, 4); + if (p[1] & SPRL_LO_ABOVE_HI) set16(dest+4*3, RED1, 4); + } + + // draw grid + for (i = step*5; i <= 320-4*4-1; i += step*5) { + for (u = 0; u < lines; u++) + screen[i + u*stride] = 0x182; + } +} + +void PicoDrawShowPalette(unsigned short *screen, int stride) +{ + unsigned int *spal=(void *)Pico.cram; + unsigned int *dpal=(void *)HighPal; + int x, y, i; + + 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 + for (i = 0x3f; i >= 0; i--) + HighPal[0x40|i] = (unsigned short)((HighPal[i]>>1)&0x738e); + for (i = 0x3f; i >= 0; i--) { + int t=HighPal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c; + HighPal[0x80|i] = (unsigned short)t; + } + + screen += 16*stride+8; + for (y = 0; y < 8*4; y++) + for (x = 0; x < 8*16; x++) + screen[x + y*stride] = HighPal[x/8 + (y/8)*16]; + + screen += 160; + for (y = 0; y < 8*4; y++) + for (x = 0; x < 8*16; x++) + screen[x + y*stride] = HighPal[(x/8 + (y/8)*16) | 0x40]; + + screen += stride*48; + for (y = 0; y < 8*4; y++) + for (x = 0; x < 8*16; x++) + screen[x + y*stride] = HighPal[(x/8 + (y/8)*16) | 0x80]; + + Pico.m.dirtyPal = 1; +} +