X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FDraw.c;h=019fdc02bcfa33b805e5c5e3cf207002deb45dfc;hb=5ed2561c910308a0b5a4d4621e35f2a3806c30eb;hp=49f3f401d2b549240413547c5a271f237f9b858e;hpb=b542be4686241c9e0722ff8e452980f9ac2b4d7c;p=picodrive.git diff --git a/Pico/Draw.c b/Pico/Draw.c index 49f3f40..019fdc0 100644 --- a/Pico/Draw.c +++ b/Pico/Draw.c @@ -1,15 +1,27 @@ // This is part of Pico Library // (c) Copyright 2004 Dave, All rights reserved. -// (c) Copyright 2006 notaz, All rights reserved. +// (c) Copyright 2006-2008 notaz, All rights reserved. // Free for non-commercial use. // For commercial use, separate licencing terms must be obtained. +/* + * The renderer has 4 modes now: + * - normal + * - shadow/hilight (s/h) + * - "sonic mode" for midline palette changes + * - accurate sprites (AS) + * + * AS and s/h both use upper bits for both priority and shadow/hilight flags. + * "sonic mode" is autodetected, shadow/hilight is enabled by emulated game. + * AS is enabled by user and takes priority over "sonic mode". + */ #include "PicoInt.h" -int (*PicoScan)(unsigned int num, void *data)=NULL; +int (*PicoScanBegin)(unsigned int num) = NULL; +int (*PicoScanEnd) (unsigned int num) = NULL; #if OVERRIDE_HIGHCOL static unsigned char DefHighCol[8+320+8]; @@ -24,16 +36,19 @@ 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 -char HighSprZ[320+8+8]; // Z-buffer for accurate sprites and shadow/hilight mode - // (if bit 7 == 0, sh caused by tile; if bit 6 == 0 pixel must be shadowed, else hilighted, if bit5 == 1) -// lsb->msb: moved sprites, not all window tiles use same priority, accurate sprites (copied from PicoOpt), interlace -// dirty sprites, sonic mode, have layer with all hi prio tiles (mk3), layer sh/hi already processed -int rendstatus; -int Scanline=0; // Scanline +int *HighCacheS_ptr; + +int rendstatus = 0; +int Scanline = 0; // Scanline 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) @@ -48,12 +63,13 @@ 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); +void DrawSprite(int *sprite, int sh, int as); void DrawTilesFromCache(int *hc, int sh, int rlim); -void DrawSpritesFromCache(int *hc, int sh); +void DrawSpritesFromCache(int *hc, int maxwidth, int prio, int sh); void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells); void FinalizeLineBGR444(int sh); void FinalizeLineRGB555(int sh); +void *blockcpy(void *dst, const void *src, size_t n); void blockcpy_or(void *dst, void *src, size_t n, int pat); #else // utility @@ -63,217 +79,120 @@ void blockcpy_or(void *dst, void *src, size_t n, int pat) for (; n; n--) *pd++ = (unsigned char) (*ps++ | pat); } +#define blockcpy memcpy #endif -#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; - } - - return 1; // Tile blank +#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 */ \ } -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 +#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 */ \ } -#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]&0x3f)|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; - } +#ifdef _ASM_DRAW_C_AMIPS +int TileNorm(int sx,int addr,int pal); +int TileFlip(int sx,int addr,int pal); +#else - return 1; // Tile blank -} +#define pix_just_write(x) \ + if (t) pd[x]=pal|t -static int TileFlipSH(int sx,int addr,int pal) -{ - unsigned int pack=0; unsigned int t=0; - unsigned char *pd = HighCol+sx; +TileNormMaker(TileNorm,pix_just_write) +TileFlipMaker(TileFlip,pix_just_write) - 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 -static int TileNormZ(int sx,int addr,int pal,int zval) -{ - unsigned int pack=0; unsigned int t=0; - unsigned char *pd = HighCol+sx; - char *zb = HighSprZ+sx; - int collision = 0, zb_s; +// 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 - pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels - if (pack) - { - t=pack&0x0000f000; if(t) { zb_s=zb[0]; if(zb_s) collision=1; if(zval>zb_s) { pd[0]=(unsigned char)(pal|(t>>12)); zb[0]=(char)zval; } } - t=pack&0x00000f00; if(t) { zb_s=zb[1]; if(zb_s) collision=1; if(zval>zb_s) { pd[1]=(unsigned char)(pal|(t>> 8)); zb[1]=(char)zval; } } - t=pack&0x000000f0; if(t) { zb_s=zb[2]; if(zb_s) collision=1; if(zval>zb_s) { pd[2]=(unsigned char)(pal|(t>> 4)); zb[2]=(char)zval; } } - t=pack&0x0000000f; if(t) { zb_s=zb[3]; if(zb_s) collision=1; if(zval>zb_s) { pd[3]=(unsigned char)(pal|(t )); zb[3]=(char)zval; } } - t=pack&0xf0000000; if(t) { zb_s=zb[4]; if(zb_s) collision=1; if(zval>zb_s) { pd[4]=(unsigned char)(pal|(t>>28)); zb[4]=(char)zval; } } - t=pack&0x0f000000; if(t) { zb_s=zb[5]; if(zb_s) collision=1; if(zval>zb_s) { pd[5]=(unsigned char)(pal|(t>>24)); zb[5]=(char)zval; } } - t=pack&0x00f00000; if(t) { zb_s=zb[6]; if(zb_s) collision=1; if(zval>zb_s) { pd[6]=(unsigned char)(pal|(t>>20)); zb[6]=(char)zval; } } - t=pack&0x000f0000; if(t) { zb_s=zb[7]; if(zb_s) collision=1; if(zval>zb_s) { pd[7]=(unsigned char)(pal|(t>>16)); zb[7]=(char)zval; } } - if(collision) Pico.video.status|=0x20; - return 0; - } +TileNormMaker(TileNormSH, pix_sh) +TileFlipMaker(TileFlipSH, pix_sh) - return 1; // Tile blank -} +#ifndef _ASM_DRAW_C +// draw a sprite pixel ignoring operator colors +#define pix_sh_noop(x) \ + if (t && t < 0xe) \ + pd[x]=pal|t -static int TileFlipZ(int sx,int addr,int pal,int zval) -{ - unsigned int pack=0; unsigned int t=0; - unsigned char *pd = HighCol+sx; - char *zb = HighSprZ+sx; - int collision = 0, zb_s; +TileNormMaker(TileNormSH_noop, pix_sh_noop) +TileFlipMaker(TileFlipSH_noop, pix_sh_noop) +#endif - pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels - if (pack) - { - t=pack&0x000f0000; if(t) { zb_s=zb[0]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[0]=(unsigned char)(pal|(t>>16)); zb[0]=(char)zval; } } - t=pack&0x00f00000; if(t) { zb_s=zb[1]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[1]=(unsigned char)(pal|(t>>20)); zb[1]=(char)zval; } } - t=pack&0x0f000000; if(t) { zb_s=zb[2]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[2]=(unsigned char)(pal|(t>>24)); zb[2]=(char)zval; } } - t=pack&0xf0000000; if(t) { zb_s=zb[3]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[3]=(unsigned char)(pal|(t>>28)); zb[3]=(char)zval; } } - t=pack&0x0000000f; if(t) { zb_s=zb[4]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[4]=(unsigned char)(pal|(t )); zb[4]=(char)zval; } } - t=pack&0x000000f0; if(t) { zb_s=zb[5]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[5]=(unsigned char)(pal|(t>> 4)); zb[5]=(char)zval; } } - t=pack&0x00000f00; if(t) { zb_s=zb[6]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[6]=(unsigned char)(pal|(t>> 8)); zb[6]=(char)zval; } } - t=pack&0x0000f000; if(t) { zb_s=zb[7]&0x1f; if(zb_s) collision=1; if(zval>zb_s) { pd[7]=(unsigned char)(pal|(t>>12)); zb[7]=(char)zval; } } - if(collision) Pico.video.status|=0x20; - return 0; - } - 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 */ +TileNormMaker(TileNormSH_onlyop_lp, pix_sh_onlyop) +TileFlipMaker(TileFlipSH_onlyop_lp, pix_sh_onlyop) -#define sh_pixZ(x) \ - if(t) { \ - if(zb[x]) collision=1; \ - if(zval>zb[x]) { \ - if (t==0xe) { pd[x]=(unsigned char)((pd[x]&0x3f)|0x80); /* hilight */ } \ - else if(t==0xf) { pd[x]=(unsigned char)((pd[x]&0x3f)|0xc0); /* shadow */ } \ - else { zb[x]=(char)zval; 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 TileNormZSH(int sx,int addr,int pal,int zval) -{ - unsigned int pack=0; unsigned int t=0; - unsigned char *pd = HighCol+sx; - char *zb = HighSprZ+sx; - int collision = 0; +TileNormMaker(TileNormAS, pix_as) +TileFlipMaker(TileFlipAS, pix_as) - pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels - if (pack) - { - t=(pack&0x0000f000)>>12; sh_pixZ(0); - t=(pack&0x00000f00)>> 8; sh_pixZ(1); - t=(pack&0x000000f0)>> 4; sh_pixZ(2); - t=(pack&0x0000000f) ; sh_pixZ(3); - t=(pack&0xf0000000)>>28; sh_pixZ(4); - t=(pack&0x0f000000)>>24; sh_pixZ(5); - t=(pack&0x00f00000)>>20; sh_pixZ(6); - t=(pack&0x000f0000)>>16; sh_pixZ(7); - if(collision) Pico.video.status|=0x20; - 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 TileFlipZSH(int sx,int addr,int pal,int zval) -{ - unsigned int pack=0; unsigned int t=0; - unsigned char *pd = HighCol+sx; - char *zb = HighSprZ+sx; - int collision = 0; +// mark pixel as sprite pixel (AS) +#define pix_sh_as_onlymark(x) \ + if (t) pd[x]|=0x80 + +TileNormMaker(TileNormAS_onlymark, pix_sh_as_onlymark) +TileFlipMaker(TileFlipAS_onlymark, pix_sh_as_onlymark) - pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels - if (pack) - { - t=(pack&0x000f0000)>>16; sh_pixZ(0); - t=(pack&0x00f00000)>>20; sh_pixZ(1); - t=(pack&0x0f000000)>>24; sh_pixZ(2); - t=(pack&0xf0000000)>>28; sh_pixZ(3); - t=(pack&0x0000000f) ; sh_pixZ(4); - t=(pack&0x000000f0)>> 4; sh_pixZ(5); - t=(pack&0x00000f00)>> 8; sh_pixZ(6); - t=(pack&0x0000f000)>>12; sh_pixZ(7); - if(collision) Pico.video.status|=0x20; - return 0; - } - return 1; // Tile blank -} // -------------------------------------------- @@ -325,7 +244,7 @@ static void DrawStrip(struct TileStrip *ts, int plane_sh, int cellskip) // terminate the cache list *ts->hc = 0; // if oldcode wasn't changed, it means all layer is hi priority - if (oldcode == -1) rendstatus|=0x40; + if (oldcode == -1) rendstatus |= PDRAW_PLANE_HI_PRIO; } // this is messy @@ -384,7 +303,7 @@ void DrawStripVSRam(struct TileStrip *ts, int plane_sh, int cellskip) // terminate the cache list *ts->hc = 0; - if (oldcode == -1) rendstatus|=0x40; + if (oldcode == -1) rendstatus |= PDRAW_PLANE_HI_PRIO; } #endif @@ -507,7 +426,7 @@ static void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells) static void DrawWindow(int tstart, int tend, int prio, int sh) // int *hcache { struct PicoVideo *pvid=&Pico.video; - int tilex=0,ty=0,nametab,code=0; + int tilex,ty,nametab,code=0; int blank=-1; // The tile we know is blank // Find name table line: @@ -523,63 +442,94 @@ static void DrawWindow(int tstart, int tend, int prio, int sh) // int *hcache } tilex=tstart<<1; - tend<<=1; - - ty=(Scanline&7)<<1; // Y-Offset into tile - if(!(rendstatus&2)) { + if (!(rendstatus & PDRAW_WND_DIFF_PRIO)) { // check the first tile code code=Pico.vram[nametab+tilex]; // if the whole window uses same priority (what is often the case), we may be able to skip this field - if((code>>15) != prio) return; + if ((code>>15) != prio) return; } + tend<<=1; + ty=(Scanline&7)<<1; // Y-Offset into tile + // Draw tiles across screen: - for (; tilex < tend; tilex++) + if (!sh) { - int addr=0,zero=0; - int pal; + for (; tilex < tend; tilex++) + { + int addr=0,zero=0; + int pal; + + code=Pico.vram[nametab+tilex]; + if (code==blank) continue; + if ((code>>15) != prio) { + rendstatus |= PDRAW_WND_DIFF_PRIO; + continue; + } - code=Pico.vram[nametab+tilex]; - if(code==blank) continue; - if((code>>15) != prio) { - rendstatus|=2; - continue; + pal=((code>>9)&0x30); + + // Get tile address/2: + addr=(code&0x7ff)<<4; + if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip + + if (code&0x0800) zero=TileFlip(8+(tilex<<3),addr,pal); + else zero=TileNorm(8+(tilex<<3),addr,pal); + + if (zero) blank=code; // We know this tile is blank now } + } + else + { + for (; tilex < tend; tilex++) + { + int addr=0,zero=0; + int pal; + + code=Pico.vram[nametab+tilex]; + if(code==blank) continue; + if((code>>15) != prio) { + rendstatus |= PDRAW_WND_DIFF_PRIO; + continue; + } + + pal=((code>>9)&0x30); - pal=((code>>9)&0x30); - - if(sh) { - int tmp, *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; } - } - // Get tile address/2: - addr=(code&0x7ff)<<4; - if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip + // Get tile address/2: + addr=(code&0x7ff)<<4; + if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip - if (code&0x0800) zero=TileFlip(8+(tilex<<3),addr,pal); - else zero=TileNorm(8+(tilex<<3),addr,pal); + if (code&0x0800) zero=TileFlip(8+(tilex<<3),addr,pal); + else zero=TileNorm(8+(tilex<<3),addr,pal); - if (zero) blank=code; // We know this tile is blank now + if (zero) blank=code; // We know this tile is blank now + } } - - // terminate the cache list - //*hcache = 0; } // -------------------------------------------- +static void DrawTilesFromCacheShPrep(void) +{ + // as some layer has covered whole line with hi priority tiles, + // we can process whole line and then act as if sh/hi mode was off. + int c = 320/4, *zb = (int *)(HighCol+8); + rendstatus |= PDRAW_SHHI_DONE; + while (c--) + { + *zb++ &= 0x3f3f3f3f; + } +} + static void DrawTilesFromCache(int *hc, int sh, int rlim) { int code, addr, dx; @@ -587,68 +537,50 @@ static void DrawTilesFromCache(int *hc, int sh, int rlim) // *ts->hc++ = code | (dx<<16) | (ty<<25); // cache it - if (sh && (rendstatus&0xc0)) + if (sh && (rendstatus & (PDRAW_SHHI_DONE|PDRAW_PLANE_HI_PRIO))) { - if (!(rendstatus&0x80)) - { - // as some layer has covered whole line with hi priority tiles, - // we can process whole line and then act as if sh/hi mode was off. - rendstatus|=0x80; - int c = 320/4, *zb = (int *)(HighCol+8); - while (c--) - { - int tmp = *zb; - if (!(tmp & 0x80808080)) *zb=tmp&0x3f3f3f3f; - else { - if(!(tmp&0x00000080)) tmp&=~0x000000c0; if(!(tmp&0x00008000)) tmp&=~0x0000c000; - if(!(tmp&0x00800000)) tmp&=~0x00c00000; if(!(tmp&0x80000000)) tmp&=~0xc0000000; - *zb=tmp; - } - zb++; - } - } + if (!(rendstatus & PDRAW_SHHI_DONE)) + DrawTilesFromCacheShPrep(); sh = 0; } - if (sh) + if (!sh) { + short blank=-1; // The tile we know is blank while ((code=*hc++)) { - unsigned char *zb; + int zero; + if((short)code == blank) continue; // Get tile address/2: addr=(code&0x7ff)<<4; addr+=(unsigned int)code>>25; // y offset into tile dx=(code>>16)&0x1ff; - zb = HighCol+dx; - if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++; - if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++; - if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++; - if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++; pal=((code>>9)&0x30); if (rlim-dx < 0) goto last_cut_tile; - if (code&0x0800) TileFlip(dx,addr,pal); - else TileNorm(dx,addr,pal); + if (code&0x0800) zero=TileFlip(dx,addr,pal); + else zero=TileNorm(dx,addr,pal); + + if (zero) blank=(short)code; } } else { - short blank=-1; // The tile we know is blank while ((code=*hc++)) { - int zero; - if((short)code == blank) continue; + unsigned char *zb; // Get tile address/2: addr=(code&0x7ff)<<4; addr+=(unsigned int)code>>25; // y offset into tile dx=(code>>16)&0x1ff; + zb = HighCol+dx; + *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; - if (code&0x0800) zero=TileFlip(dx,addr,pal); - else zero=TileNorm(dx,addr,pal); - - if (zero) blank=(short)code; + if (code&0x0800) TileFlip(dx,addr,pal); + else TileNorm(dx,addr,pal); } } return; @@ -694,7 +626,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) +static void DrawSprite(int *sprite, int sh, int as) { int width=0,height=0; int row=0,code=0; @@ -715,81 +647,30 @@ static void DrawSprite(int *sprite, int **hc, int sh) 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 + tile &= 0x7ff; 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); - } else { - delta<<=4; // Delta of address - pal=((code>>9)&0x30)|(sh<<6); + pal=(code>>9)&0x30; - if(sh && (code&0x6000) == 0x6000) { - if(code&0x0800) fTileFunc=TileFlipSH; - else fTileFunc=TileNormSH; - } else { - if(code&0x0800) fTileFunc=TileFlip; - else fTileFunc=TileNorm; - } - - for (; width; width--,sx+=8,tile+=delta) - { - if(sx<=0) continue; - if(sx>=328) break; // Offscreen - - tile&=0x7fff; // Clip tile address - fTileFunc(sx,tile,pal); - } + // assume there will be no sprites with both normal and operator pixels.. + if ((code&0x8000) || (sh && pal == 0x30) || as) { + *HighCacheS_ptr++ = ((code&0x8000)<<16)|(tile<<16)|((code&0x0800)<<5)|((sx<<6)&0x0000ffc0)|pal|((sprite[0]>>16)&0xf); + // we need all for accurate sprites, cached will be used to do proper priorities + if (!as && (code&0x8000)) return; } -} -#endif - -// Index + 0 : hhhhvvvv s---hhvv yyyyyyyy yyyyyyyy // s: skip flag, h: horiz. size -// Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8 - -static void DrawSpriteZ(int pack, int pack2, int shpri, int sprio) -{ - int width=0,height=0; - int row=0; - int pal; - int tile=0,delta=0; - int sx, sy; - int (*fTileFunc)(int sx,int addr,int pal,int zval); - - // parse the sprite data - sx=pack2>>16; // X - sy=(pack <<16)>>16; // Y - width=pack>>28; - height=(pack>>24)&7; // Width and height in tiles - - row=Scanline-sy; // Row of the sprite we are on - - if (pack2&0x1000) row=(height<<3)-1-row; // Flip Y - - tile=pack2&0x7ff; // Tile number - tile+=row>>3; // Tile number increases going down - delta=height; // Delta to increase tile by going right - if (pack2&0x0800) { tile+=delta*(width-1); delta=-delta; } // Flip X - - tile<<=4; tile+=(row&7)<<1; // Tile address delta<<=4; // Delta of address - pal=((pack2>>9)&0x30); - if((shpri&1)&&!(shpri&2)) pal|=0x40; - - shpri&=1; - if((pack2&0x6000) != 0x6000) shpri = 0; - shpri |= (pack2&0x0800)>>10; - switch(shpri) { - default: - case 0: fTileFunc=TileNormZ; break; - case 1: fTileFunc=TileNormZSH; break; - case 2: fTileFunc=TileFlipZ; break; - case 3: fTileFunc=TileFlipZSH; break; + pal|=((sh|as)<<6); + + if (sh && (code&0x6000) == 0x6000) { + if(code&0x0800) fTileFunc=TileFlipSH_noop; + else fTileFunc=TileNormSH_noop; + } else { + if(code&0x0800) fTileFunc=TileFlip; + else fTileFunc=TileNorm; } for (; width; width--,sx+=8,tile+=delta) @@ -798,9 +679,10 @@ static void DrawSpriteZ(int pack, int pack2, int shpri, int sprio) if(sx>=328) break; // Offscreen tile&=0x7fff; // Clip tile address - fTileFunc(sx,tile,pal,sprio); + fTileFunc(sx,tile,pal); } } +#endif static void DrawSpriteInterlace(unsigned int *sprite) { @@ -846,7 +728,7 @@ static void DrawSpriteInterlace(unsigned int *sprite) } -static void DrawAllSpritesInterlace(int pri, int maxwidth) +static void DrawAllSpritesInterlace(int *hcache, int maxwidth, int pri, int sh) { struct PicoVideo *pvid=&Pico.video; int i,u,table,link=0,sline=Scanline<<1; @@ -894,27 +776,35 @@ static void DrawAllSpritesInterlace(int pri, int maxwidth) #ifndef _ASM_DRAW_C -static void DrawSpritesFromCache(int *hc, int sh) +static void DrawSpritesFromCache(int *hc, int maxwidth, int prio, int sh) { int code, tile, sx, delta, width; int pal; int (*fTileFunc)(int sx,int addr,int pal); - // *(*hc)++ = (tile<<16)|((code&0x0800)<<5)|((sx<<6)&0x0000ffc0)|((code>>9)&0x30)|((sprite[0]>>24)&0xf); + // prio[31]:tile[30:17]:flipx[16]:sx[15:6]:pal[5:4]:delta_width[3:0] - while((code=*hc++)) { + 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; + tile=((unsigned int)code>>17)<<1; // also has prio 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; + if (sh && pal == 0x30) + { + if (code & 0x80000000) // hi priority + { + if(code&0x10000) fTileFunc=TileFlipSH; + else fTileFunc=TileNormSH; + } else { + if(code&0x10000) fTileFunc=TileFlipSH_onlyop_lp; + else fTileFunc=TileNormSH_onlyop_lp; + } } else { if(code&0x10000) fTileFunc=TileFlip; else fTileFunc=TileNorm; @@ -932,6 +822,101 @@ static void DrawSpritesFromCache(int *hc, int sh) } #endif +static void DrawSpritesFromCacheAS(int *hc, int maxwidth, int prio, int sh) +{ + int code, tile, sx, delta, width; + int pal, *hce, *hco; + int (*fTileFunc)(int sx,int addr,int pal); + + // prio[31]:tile[30:17]:flipx[16]:sx[15:6]:pal[5:4]:delta_width[3:0] + + /* walk the sprite cache backwards.. */ + hco = hce = HighCacheS_ptr; + while (hce > hc) + { + code=*(--hce); + 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 (code & 0x80000000) // hi priority + { + if (sh && pal == 0x30) + { + if(code&0x10000) fTileFunc=TileFlipAS_noop; + else fTileFunc=TileNormAS_noop; + *(--hco) = code; /* save for later */ + } else { + if(code&0x10000) fTileFunc=TileFlipAS; + else fTileFunc=TileNormAS; + } + } else { + if(code&0x10000) fTileFunc=TileFlipAS_onlymark; + else fTileFunc=TileNormAS_onlymark; + } + + pal |= 0x80; + for (; width; width--,sx+=8,tile+=delta) + { + if(sx<=0) continue; + if(sx>=328) break; // Offscreen + + tile&=0x7fff; // Clip tile address + fTileFunc(sx,tile,pal); + } + } + + if (!sh) return; + + /* nasty 1: remove 'sprite' flags */ + { + int c = 320/4, *zb = (int *)(HighCol+8); + while (c--) + { + *zb++ &= 0x7f7f7f7f; + } + } + + /* nasty 2: loop once more and do operator colors */ + while ((code=*hco++)) + { + pal=(code&0x30); + if (pal != 0x30) continue; + delta=code&0xf; + width=delta>>2; delta&=3; + width++; delta++; + if (code&0x10000) delta=-delta; // Flip X + delta<<=4; + tile=((unsigned int)code>>17)<<1; + sx=(code<<16)>>22; + + if (code & 0x80000000) + { + if(code&0x10000) fTileFunc=TileFlipSH; + else fTileFunc=TileNormSH; + } else { + if(code&0x10000) fTileFunc=TileFlipSH_onlyop_lp; + else fTileFunc=TileNormSH_onlyop_lp; + } + + pal |= 0x80; + for (; width; width--,sx+=8,tile+=delta) + { + if(sx<=0) continue; + if(sx>=328) break; // Offscreen + + tile&=0x7fff; // Clip tile address + fTileFunc(sx,tile,pal); + } + } +} + + // Index + 0 : ----hhvv -lllllll -------y yyyyyyyy // Index + 4 : -------x xxxxxxxx pccvhnnn nnnnnnnn @@ -998,7 +983,7 @@ static void PrepareSprites(int full) hv = (code>>24)&0xf; height = (hv&3)+1; - if(sy > 240 || sy + (height<<3) <= 0) skip|=1<<22; + if (sy > 240 || sy + (height<<3) <= 0) skip|=1<<22; // sprite offscreen (completely, y) width = (hv>>2)+1; code2 = sprite[1]; @@ -1006,7 +991,7 @@ static void PrepareSprites(int full) sx -= 0x78; // Get X coordinate + 8 sx_min = 8-(width<<3); - if((sx <= sx_min && sx >= -0x76) || sx >= 328) skip|=1<<23; + if ((sx <= sx_min && sx >= -0x76) || sx >= 328) skip|=1<<23; // offscreen x else if (sx > sx_min && !skip) { int sbl = (2<>3; @@ -1029,39 +1014,33 @@ static void PrepareSprites(int full) static void DrawAllSprites(int *hcache, int maxwidth, int prio, int sh) { int i,u,n; - int sx1seen=0; // sprite with x coord 1 or 0 seen + 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 *ps, pack, rs = rendstatus, scan=Scanline; + int max_line_sprites = 20; // 20 sprites, 40 tiles + int *ps, pack, rs = rendstatus, scan = Scanline; - if(rs&8) { - DrawAllSpritesInterlace(prio, maxwidth); - return; - } - if(rs&0x11) { + if (rs & (PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES)) { //dprintf("PrepareSprites(%i) [%i]", (rs>>4)&1, scan); - PrepareSprites(rs&0x10); - rendstatus=rs&~0x11; + PrepareSprites(rs & PDRAW_DIRTY_SPRITES); + rendstatus = rs & ~(PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES); } - if (!(SpriteBlocks & (1<<(scan>>3)))) return; + if (!(SpriteBlocks & (1<<(scan>>3)))) { *hcache = 0; return; } - if(((rs&4)||sh)&&prio==0) - memset(HighSprZ, 0, 328); - if(!(rs&4)&&prio) { - if(hcache[0]) DrawSpritesFromCache(hcache, sh); - return; - } + if (PicoOpt & POPT_DIS_SPRITE_LIM) + max_line_sprites = 80; + HighCacheS_ptr = hcache; ps = HighPreSpr; // 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 - for(i=u=n=0; (pack = *ps) && n < 20; ps+=2, u++) + for (i=u=n=0; (pack = *ps) && n < max_line_sprites; ps+=2, u++) { int sx, sy, row, pack2; - if(pack & 0x00400000) continue; + if (pack & 0x00400000) continue; // get sprite info pack2 = *(ps+1); @@ -1069,56 +1048,39 @@ static void DrawAllSprites(int *hcache, int maxwidth, int prio, int sh) sy = (pack <<16)>>16; row = scan-sy; - //dprintf("x: %i y: %i %ix%i", sx, sy, (pack>>28)<<3, (pack>>21)&0x38); + // 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 + 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 - n++; // number of sprites on this line (both visible and hidden, max is 20) [broken] - - // sprite limit - ntiles += pack>>28; - if(ntiles > 40) break; - - if(pack & 0x00800000) continue; + if (row < 0 || row >= ((pack>>21)&0x38)) continue; // no // masking sprite? - if(sx == -0x78) { - if(!(sx1seen&1) || sx1seen==3) { - break; // this sprite is not drawn and remaining sprites are masked - } - if((sx1seen>>8) == 0) sx1seen=(i+1)<<8; - continue; - } - else if(sx == -0x77) { - // masking mode2 (Outrun, Galaxy Force II, Shadow of the beast) - if(sx1seen>>8) { i=(sx1seen>>8)-1; break; } // seen both 0 and 1 - sx1seen |= 2; + if (sx == -0x78) { + if (n > 0) break; // masked continue; } - // accurate sprites - //dprintf("P:%i",((sx>>15)&1)); - if(rs&4) { - // might need to skip this sprite - if((pack2&0x8000) ^ (prio<<15)) continue; - DrawSpriteZ(pack,pack2,sh|(prio<<1),(char)(0x1f-n)); - 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; } + n = (rs & PDRAW_ACC_SPRITES) ? 1 : 0; + // Go through sprites backwards: - if(!(rs&4)) { - for (i--; i>=0; i--) - DrawSprite(sprites[i],&hcache,sh); + for (i--; i>=0; i--) + DrawSprite(sprites[i],sh,n); - // terminate cache list - *hcache = 0; - } + // terminate cache list + *HighCacheS_ptr = 0; } @@ -1149,12 +1111,12 @@ static void FinalizeLineBGR444(int sh) unsigned short *pd=DrawLineDest; unsigned char *ps=HighCol+8; unsigned short *pal=Pico.cram; - int len, i, t; + int len, i, t, mask=0xff; if (Pico.video.reg[12]&1) { len = 320; } else { - if(!(PicoOpt&0x100)) pd+=32; + if(!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32; len = 256; } @@ -1174,8 +1136,11 @@ static void FinalizeLineBGR444(int sh) } } + if (!sh && (rendstatus & PDRAW_ACC_SPRITES)) + mask=0x3f; // accurate sprites + for(i = 0; i < len; i++) - pd[i] = pal[ps[i]]; + pd[i] = pal[ps[i] & mask]; } @@ -1216,19 +1181,26 @@ static void FinalizeLineRGB555(int sh) if (Pico.video.reg[12]&1) { len = 320; } else { - if (!(PicoOpt&0x100)) pd+=32; + if (!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32; len = 256; } + { #ifndef PSP - for (i = 0; i < len; i++) - pd[i] = pal[ps[i]]; + int mask=0xff; + if (!sh && (rendstatus & PDRAW_ACC_SPRITES)) + mask=0x3f; // accurate sprites, upper bits are priority stuff + + for (i = 0; i < len; i++) + pd[i] = pal[ps[i] & mask]; #else - { extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count); - amips_clut(pd, ps, pal, len); - } + extern void amips_clut_6bit(unsigned short *dst, unsigned char *src, unsigned short *pal, int count); + if (!sh && (rendstatus & PDRAW_ACC_SPRITES)) + amips_clut_6bit(pd, ps, pal, len); + else amips_clut(pd, ps, pal, len); #endif + } } #endif @@ -1238,12 +1210,13 @@ static void FinalizeLine8bit(int sh) int len, rs = rendstatus; static int dirty_count; - if (!sh && Pico.m.dirtyPal == 1 && Scanline < 222) { + if (!sh && !(rs & PDRAW_ACC_SPRITES) && Pico.m.dirtyPal == 1 && Scanline < 222) + { // a hack for mid-frame palette changes - if (!(rs & 0x20)) + if (!(rs & PDRAW_SONIC_MODE)) dirty_count = 1; else dirty_count++; - rs |= 0x20; + rs |= PDRAW_SONIC_MODE; rendstatus = rs; if (dirty_count == 3) { blockcpy(HighPal, Pico.cram, 0x40*2); @@ -1255,11 +1228,11 @@ static void FinalizeLine8bit(int sh) if (Pico.video.reg[12]&1) { len = 320; } else { - if(!(PicoOpt&0x100)) pd+=32; + if (!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32; len = 256; } - if (!sh && rs & 0x20) { + if (!sh && (rs & PDRAW_SONIC_MODE)) { if (dirty_count >= 11) { blockcpy_or(pd, HighCol+8, len, 0x80); } else { @@ -1272,15 +1245,33 @@ 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) +{ + scanline--; + + if (PicoScanBegin != NULL) + PicoScanBegin(scanline); + + BackFill(Pico.video.reg[7], sh); + + if (FinalizeLine != NULL) + FinalizeLine(sh); + + if (PicoScanEnd != NULL) + PicoScanEnd(scanline); +} + // -------------------------------------------- -static int DrawDisplay(int sh) +static int DrawDisplay(int sh, int as) { struct PicoVideo *pvid=&Pico.video; int win=0,edge=0,hvwind=0; int maxw, maxcells; - rendstatus&=~0xc0; + rendstatus &= ~(PDRAW_SHHI_DONE|PDRAW_PLANE_HI_PRIO); if(pvid->reg[12]&1) { maxw = 328; maxcells = 40; @@ -1308,16 +1299,16 @@ static int DrawDisplay(int sh) } } - DrawLayer(1|(sh<<1), HighCacheB, 0, maxcells); + DrawLayer(1|((sh|as)<<1), HighCacheB, 0, maxcells); if (hvwind == 1) - DrawWindow(0, maxcells>>1, 0, sh); + DrawWindow(0, maxcells>>1, 0, sh|as); else if (hvwind == 2) { // ahh, we have vertical window - 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); + 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); } else - DrawLayer(0|(sh<<1), HighCacheA, 0, maxcells); - DrawAllSprites(HighCacheS, maxw, 0, sh); + DrawLayer(0|((sh|as)<<1), HighCacheA, 0, maxcells); + DrawAllSpritesLoPri(HighCacheS, maxw, 0, sh); if (HighCacheB[0]) DrawTilesFromCache(HighCacheB, sh, 328); if (hvwind == 1) @@ -1327,7 +1318,7 @@ static int DrawDisplay(int sh) DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 1, sh); } else if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, 328); - DrawAllSprites(HighCacheS, maxw, 1, sh); + if (HighCacheS[0]) DrawAllSpritesHiPri(HighCacheS, maxw, 1, sh); #if 0 { @@ -1342,39 +1333,54 @@ static int DrawDisplay(int sh) } -static int Skip=0; - PICO_INTERNAL void PicoFrameStart(void) { // prepare to do this frame - rendstatus = (PicoOpt&0x80)>>5; // accurate sprites - if(rendstatus) - Pico.video.status &= ~0x0020; - else Pico.video.status |= 0x0020; // sprite collision - if((Pico.video.reg[12]&6) == 6) rendstatus |= 8; // interlace mode - if(Pico.m.dirtyPal) Pico.m.dirtyPal = 2; // reset dirty if needed + rendstatus = (PicoOpt&0x80)>>5; // accurate sprites, clear everything else + 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 PrepareSprites(1); - Skip=0; + skip_next_line=0; } PICO_INTERNAL int PicoLine(int scan) { - int sh; - if (Skip>0) { Skip--; return 0; } // Skip rendering lines + int sh, as = 0; + if (skip_next_line>0) { skip_next_line--; return 0; } // skip_next_line 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); // Draw screen: - BackFill(Pico.video.reg[7], sh); + BackFill(Pico.video.reg[7], sh|as); if (Pico.video.reg[1]&0x40) - DrawDisplay(sh); + DrawDisplay(sh, as); if (FinalizeLine != NULL) FinalizeLine(sh); - Skip=PicoScan(Scanline,DrawLineDest); + if (PicoScanEnd != NULL) + PicoScanEnd(scan); return 0; }