X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FDraw.c;h=acdd15d156976acaa28d2cfad7d3ebee4f18d1a0;hb=e55f0cbba1c4eef80e488e2bd8c090acb1acf057;hp=dec7abd156ce2f6822d571e308238c4e0b874c2b;hpb=7a7c6476f31d4b88b0aae876e94bc49733b36e83;p=picodrive.git diff --git a/Pico/Draw.c b/Pico/Draw.c index dec7abd..acdd15d 100644 --- a/Pico/Draw.c +++ b/Pico/Draw.c @@ -1,34 +1,53 @@ // 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" -#ifndef __GNUC__ -#pragma warning (disable:4706) // Disable assignment within conditional -#endif -int (*PicoScan)(unsigned int num, void *data)=NULL; +int (*PicoScanBegin)(unsigned int num) = NULL; +int (*PicoScanEnd) (unsigned int num) = NULL; -unsigned short DefOutBuff[320*2]; +#if OVERRIDE_HIGHCOL +static unsigned char DefHighCol[8+320+8]; +unsigned char *HighCol=DefHighCol; +#else unsigned char HighCol[8+320+8]; +#endif +unsigned short DefOutBuff[320*2]; +void *DrawLineDest=DefOutBuff; // pointer to dest buffer where to draw this line to + 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; -void *DrawLineDest=DefOutBuff; // pointer to dest buffer where to draw this line to -int Scanline=0; // Scanline +int HighPreSpr[80*2+1]; // slightly preprocessed sprites + +#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 DrawScanline = 0; +int PicoDrawMask = -1; + +static int skip_next_line=0; -static int SpriteBlocks; //unsigned short ppt[] = { 0x0f11, 0x0ff1, 0x01f1, 0x011f, 0x01ff, 0x0f1f, 0x0f0e, 0x0e7c }; struct TileStrip @@ -45,12 +64,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 DrawAllSprites(unsigned char *sprited, int prio, int sh); void DrawTilesFromCache(int *hc, int sh, int rlim); -void DrawSpritesFromCache(int *hc, int sh); -void DrawLayer(int plane, int *hcache, int maxcells, 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); +void *blockcpy(void *dst, const void *src, size_t n); void blockcpy_or(void *dst, void *src, size_t n, int pat); #else // utility @@ -60,231 +80,142 @@ void blockcpy_or(void *dst, void *src, size_t n, int pat) for (; n; n--) *pd++ = (unsigned char) (*ps++ | pat); } +#define blockcpy memcpy #endif -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 */ \ } -// 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) +#ifdef _ASM_DRAW_C_AMIPS +int TileNorm(int sx,int addr,int pal); +int TileFlip(int sx,int addr,int pal); +#else -#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; +#define pix_just_write(x) \ + if (t) pd[x]=pal|t - 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; - } +TileNormMaker(TileNorm,pix_just_write) +TileFlipMaker(TileFlip,pix_just_write) - return 1; // Tile blank -} +#endif -static int TileFlipSH(int sx,int addr,int pal) -{ - unsigned int pack=0; unsigned int t=0; - unsigned char *pd = HighCol+sx; +#ifndef _ASM_DRAW_C - 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 -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; +TileNormMaker(TileNormSH, pix_sh) +TileFlipMaker(TileFlipSH, pix_sh) - 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; - } +// draw a sprite pixel ignoring operator colors +#define pix_sh_noop(x) \ + if (t && t < 0xe) \ + pd[x]=pal|t - return 1; // Tile blank -} +TileNormMaker(TileNormSH_noop, pix_sh_noop) +TileFlipMaker(TileFlipSH_noop, pix_sh_noop) -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; +// 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 */ - 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 -} +TileNormMaker(TileNormSH_onlyop_lp, pix_sh_onlyop) +TileFlipMaker(TileFlipSH_onlyop_lp, pix_sh_onlyop) +#endif -#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 -} // -------------------------------------------- #ifndef _ASM_DRAW_C -static void DrawStrip(struct TileStrip *ts, int sh) +static void DrawStrip(struct TileStrip *ts, int plane_sh, int cellskip) { - int tilex=0,dx=0,ty=0,code=0,addr=0,cells; + int tilex,dx,ty,code=0,addr=0,cells; int oldcode=-1,blank=-1; // The tile we know is blank - int pal=0; + int pal=0,sh; // Draw tiles across screen: - tilex=(-ts->hscroll)>>3; + sh=(plane_sh<<5)&0x40; + tilex=((-ts->hscroll)>>3)+cellskip; ty=(ts->line&7)<<1; // Y-Offset into tile dx=((ts->hscroll-1)&7)+1; - cells = ts->cells; + cells = ts->cells - cellskip; if(dx != 8) cells++; // have hscroll, need to draw 1 cell more + dx+=cellskip<<3; - for (; cells; dx+=8,tilex++,cells--) + for (; cells > 0; dx+=8,tilex++,cells--) { int zero=0; @@ -304,8 +235,7 @@ static void DrawStrip(struct TileStrip *ts, int sh) addr+=ty; if (code&0x1000) addr^=0xe; // Y-flip -// pal=Pico.cram+((code>>9)&0x30); - pal=((code>>9)&0x30)|(sh<<6); + pal=((code>>9)&0x30)|sh; } if (code&0x0800) zero=TileFlip(dx,addr,pal); @@ -317,38 +247,32 @@ static void DrawStrip(struct TileStrip *ts, int sh) // 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 -void DrawStripVSRam(struct TileStrip *ts, int plane) +void DrawStripVSRam(struct TileStrip *ts, int plane_sh, int cellskip) { - int tilex=0,dx=0,ty=0,code=0,addr=0,cell=0,nametabadd=0; + 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; dx=((ts->hscroll-1)&7)+1; - if(dx != 8) { - int vscroll, line; - cell--; // have hscroll, start with negative cell - // also calculate intial VS stuff - vscroll=Pico.vsram[plane]; - - // Find the line in the name table - line=(vscroll+scan)&ts->line&0xffff; // ts->line is really ymask .. - nametabadd=(line>>3)<<(ts->line>>24); // .. and shift[width] - ty=(line&7)<<1; // Y-Offset into tile - } + if(dx != 8) cell--; // have hscroll, start with negative cell + cell+=cellskip; + tilex+=cellskip; + dx+=cellskip<<3; for (; cell < ts->cells; dx+=8,tilex++,cell++) { - int zero=0; + int zero=0,nametabadd,ty; - if((cell&1)==0) { + //if((cell&1)==0) + { int line,vscroll; - vscroll=Pico.vsram[plane+(cell&~1)]; + vscroll=Pico.vsram[(plane_sh&1)+(cell&~1)]; // Find the line in the name table line=(vscroll+scan)&ts->line&0xffff; // ts->line is really ymask .. @@ -371,8 +295,7 @@ void DrawStripVSRam(struct TileStrip *ts, int plane) addr=(code&0x7ff)<<4; if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip -// pal=Pico.cram+((code>>9)&0x30); - pal=((code>>9)&0x30); + pal=((code>>9)&0x30)|((plane_sh<<5)&0x40); } if (code&0x0800) zero=TileFlip(dx,addr,pal); @@ -383,7 +306,7 @@ void DrawStripVSRam(struct TileStrip *ts, int plane) // terminate the cache list *ts->hc = 0; - if (oldcode == -1) rendstatus|=0x40; + if (oldcode == -1) rendstatus |= PDRAW_PLANE_HI_PRIO; } #endif @@ -440,7 +363,7 @@ void DrawStripInterlace(struct TileStrip *ts) // -------------------------------------------- #ifndef _ASM_DRAW_C -static void DrawLayer(int plane, int *hcache, int maxcells, int sh) +static void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells) { struct PicoVideo *pvid=&Pico.video; const char shift[4]={5,6,5,7}; // 32,64 or 128 sized tilemaps (2 is invalid) @@ -463,23 +386,23 @@ static void DrawLayer(int plane, int *hcache, int maxcells, int sh) else if(width>1) ymask =0x0ff; // Find name table: - if (plane==0) ts.nametab=(pvid->reg[2]&0x38)<< 9; // A - else ts.nametab=(pvid->reg[4]&0x07)<<12; // B + if (plane_sh&1) ts.nametab=(pvid->reg[4]&0x07)<<12; // B + 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; // A or B + htab+=plane_sh&1; // A or B // Get horizontal scroll value, will be masked later ts.hscroll=Pico.vram[htab&0x7fff]; if((pvid->reg[12]&6) == 6) { // interlace mode 2 - vscroll=Pico.vsram[plane]; // Get vertical scroll value + 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&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=(DrawScanline&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); - - 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; + pal=((code>>9)&0x30); + + 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; @@ -586,68 +540,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; @@ -676,13 +612,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; } } } @@ -693,7 +629,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 width=0,height=0; int row=0,code=0; @@ -710,85 +646,26 @@ static void DrawSprite(int *sprite, int **hc, int sh) 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); - } else { - delta<<=4; // Delta of address - pal=((code>>9)&0x30)|(sh<<6); - - 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); - } - } -} -#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 &= 0x7ff; tile<<=4; tile+=(row&7)<<1; // Tile address + delta<<=4; // Delta of address - 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 + pal=(code>>9)&0x30; + pal|=sh<<6; - 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; + 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) @@ -797,9 +674,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) { @@ -816,7 +694,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 @@ -845,10 +723,10 @@ static void DrawSpriteInterlace(unsigned int *sprite) } -static void DrawAllSpritesInterlace(int pri, int maxwidth) +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; @@ -875,7 +753,7 @@ static void DrawAllSpritesInterlace(int pri, int maxwidth) // 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; @@ -893,32 +771,64 @@ static void DrawAllSpritesInterlace(int pri, int maxwidth) #ifndef _ASM_DRAW_C -static void DrawSpritesFromCache(int *hc, 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; + + cnt = sprited[0] & 0x7f; + if (cnt == 0) return; + + p = &sprited[3]; - // *(*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; + // 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; @@ -931,19 +841,113 @@ static void DrawSpritesFromCache(int *hc, int sh) } #endif +static void DrawSpritesHiAS(unsigned char *sprited, int sh) +{ + 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; + + 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&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; + if(sx>=328) break; // Offscreen + + tile&=0x7fff; // Clip tile address + 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 @@ -953,41 +957,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_sprites && (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_sprites; 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 @@ -997,137 +1022,107 @@ static void PrepareSprites(int full) hv = (code>>24)&0xf; height = (hv&3)+1; - if(sy > 240 || sy + (height<<3) <= 0) skip|=1<<22; - 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; - 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 } - SpriteBlocks = sblocks; - *pd = 0; // terminate + *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"); + } +#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 *ps, pack, rs = rendstatus, scan=Scanline; - - if(rs&8) { - DrawAllSpritesInterlace(prio, maxwidth); - return; - } - if(rs&0x11) { - //dprintf("PrepareSprites(%i) [%i]", (rs>>4)&1, scan); - PrepareSprites(rs&0x10); - rendstatus=rs&~0x11; - } - if (!(SpriteBlocks & (1<<(scan>>3)))) return; - - if(((rs&4)||sh)&&prio==0) - memset(HighSprZ, 0, 328); - if(!(rs&4)&&prio) { - if(hcache[0]) DrawSpritesFromCache(hcache, sh); - return; + int rs = rendstatus; + unsigned char *p; + int cnt; + + if (rs & (PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES)) { + //elprintf(EL_STATUS, "PrepareSprites(%i)", (rs>>4)&1); + PrepareSprites(rs & PDRAW_DIRTY_SPRITES); + rendstatus = rs & ~(PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES); } - 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++) - { - int sx, sy, row, pack2; - - if(pack & 0x00400000) continue; + cnt = sprited[0] & 0x7f; + if (cnt == 0) return; - // get sprite info - pack2 = *(ps+1); - sx = pack2>>16; - sy = (pack <<16)>>16; - row = scan-sy; - - //dprintf("x: %i y: %i %ix%i", sx, sy, (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 - 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; - - // 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; - 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; - } - - // sprite is good, save it's pointer - sprites[i++]=ps; - } + p = &sprited[3]; // Go through sprites backwards: - if(!(rs&4)) { - for (i--; i>=0; i--) - DrawSprite(sprites[i],&hcache,sh); - - // terminate cache list - *hcache = 0; + for (cnt--; cnt >= 0; cnt--) + { + int offs; + if ((p[cnt] >> 7) != prio) continue; + offs = (p[cnt]&0x7f) * 2; + DrawSprite(HighPreSpr + offs, sh); } } // -------------------------------------------- -#ifndef _ASM_DRAW_C static void BackFill(int reg7, int sh) { - unsigned int back=0; - unsigned int *pd=NULL,*end=NULL; + unsigned int back; // Start with a blank scanline (background colour): back=reg7&0x3f; @@ -1135,10 +1130,7 @@ static void BackFill(int reg7, int sh) back|=back<<8; back|=back<<16; - pd= (unsigned int *)(HighCol+8); - end=(unsigned int *)(HighCol+8+320); - - do { pd[0]=pd[1]=pd[2]=pd[3]=back; pd+=4; } while (pd= 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 + } + + if (sh) + { + // shadowed pixels + for (i = 0x3f; i >= 0; i--) + pal[0x40|i] = pal[0xc0|i] = (unsigned short)((pal[i]>>1)&0x738e); + // hilighted pixels + for (i = 0x3f; i >= 0; i--) { + t=pal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c; + pal[0x80|i]=(unsigned short)t; + } + } +} + #ifndef _ASM_DRAW_C 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; } @@ -1177,8 +1200,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]; } @@ -1187,37 +1213,34 @@ static void FinalizeLineRGB555(int sh) unsigned short *pd=DrawLineDest; unsigned char *ps=HighCol+8; unsigned short *pal=HighPal; - int len, i, t, dirtyPal = Pico.m.dirtyPal; + int len; - if(dirtyPal) { - unsigned short *ppal=Pico.cram; - for(i = 0x3f; i >= 0; i--) - pal[i] = (unsigned short) (((ppal[i]&0x00f)<<12)|((ppal[i]&0x0f0)<<3)|((ppal[i]&0xf00)>>7)); - Pico.m.dirtyPal = 0; - } + if (Pico.m.dirtyPal) + PicoDoHighPal555(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) { - if(dirtyPal) { - // shadowed pixels - for(i = 0x3f; i >= 0; i--) - pal[0x40|i] = pal[0xc0|i] = (unsigned short)((pal[i]>>1)&0x738e); - // hilighted pixels - for(i = 0x3f; i >= 0; i--) { - t=pal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c; - pal[0x80|i]=(unsigned short)t; - } - } - } + { +#ifndef PSP + int i, 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]]; + 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); + 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 @@ -1227,12 +1250,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 && DrawScanline < 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); @@ -1244,11 +1268,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 { @@ -1259,19 +1283,36 @@ static void FinalizeLine8bit(int sh) } } -void (*FinalizeLine)(int sh) = FinalizeLineBGR444; +static void (*FinalizeLine)(int sh) = FinalizeLineBGR444; // -------------------------------------------- +static void DrawBlankedLine(void) +{ + int sh=(Pico.video.reg[0xC]&8)>>3; // shadow/hilight? + + if (PicoScanBegin != NULL) + PicoScanBegin(DrawScanline); + + BackFill(Pico.video.reg[7], sh); + + if (FinalizeLine != NULL) + FinalizeLine(sh); + + if (PicoScanEnd != NULL) + PicoScanEnd(DrawScanline); +} + 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&=~0xc0; + 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; @@ -1281,10 +1322,11 @@ static int DrawDisplay(int sh) 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) { @@ -1297,33 +1339,55 @@ static int DrawDisplay(int sh) } } - DrawLayer(1, HighCacheB, maxcells, sh); - if (hvwind == 1) - DrawWindow(0, maxcells>>1, 0, sh); // HighCacheAW + /* - 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, HighCacheA, (win&0x80) ? edge<<1 : maxcells, sh); - DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 0, sh); // HighCacheW + 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, HighCacheA, maxcells, sh); - DrawAllSprites(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 : 0); + 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); - DrawAllSprites(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 @@ -1331,49 +1395,79 @@ 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 = 0; + if (PicoOpt & POPT_ACC_SPRITES) + rendstatus |= PDRAW_ACC_SPRITES; + if ((Pico.video.reg[12]&6) == 6) + rendstatus |= PDRAW_INTERLACE; // interlace mode + if (Pico.m.dirtyPal) Pico.m.dirtyPal = 2; // reset dirty if needed + + DrawScanline=0; PrepareSprites(1); - Skip=0; + skip_next_line=0; } -PICO_INTERNAL int PicoLine(int scan) +static void PicoLine(void) { int sh; - if (Skip>0) { Skip--; return 0; } // Skip rendering lines + if (skip_next_line>0) { skip_next_line--; return; } // skip rendering lines - Scanline=scan; sh=(Pico.video.reg[0xC]&8)>>3; // shadow/hilight? + if (PicoScanBegin != NULL) + skip_next_line = PicoScanBegin(DrawScanline); + // Draw screen: BackFill(Pico.video.reg[7], sh); if (Pico.video.reg[1]&0x40) DrawDisplay(sh); - FinalizeLine(sh); - //if (SpriteBlocks & (1<<(scan>>3))) for (sh=0; sh < 30; sh++) DrawLineDest[sh] = 0xf; - - Skip=PicoScan(Scanline,DrawLineDest); + if (FinalizeLine != NULL) + FinalizeLine(sh); - return 0; + if (PicoScanEnd != NULL) + 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) { - if (which == 2) - FinalizeLine = FinalizeLine8bit; - else if (which == 1) - FinalizeLine = FinalizeLineRGB555; - else FinalizeLine = FinalizeLineBGR444; + switch (which) + { + case 2: FinalizeLine = FinalizeLine8bit; break; + case 1: FinalizeLine = FinalizeLineRGB555; break; + case 0: FinalizeLine = FinalizeLineBGR444; break; + default:FinalizeLine = NULL; break; + } +#if OVERRIDE_HIGHCOL + if (which) HighCol=DefHighCol; +#endif } +