X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FDraw.c;h=0d7f89be935821c3a893c9326cb6b2d78a531684;hb=582890c000105f81c34c88d18924f7a3dc3b66b2;hp=ff2a48cc93c9e5de01f9e3a85f25d123473543d6;hpb=ea8c405fa721a8658b1f7c51cf6238ba2bba8a17;p=picodrive.git diff --git a/Pico/Draw.c b/Pico/Draw.c index ff2a48c..0d7f89b 100644 --- a/Pico/Draw.c +++ b/Pico/Draw.c @@ -1,7 +1,7 @@ // 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. @@ -9,7 +9,8 @@ #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,14 +25,15 @@ 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 + +static unsigned char HighSprZ[320+8+8]; // Z-buffer for accurate sprites + +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 }; struct TileStrip @@ -54,6 +56,7 @@ void DrawSpritesFromCache(int *hc, 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,9 +66,14 @@ 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; @@ -108,7 +116,7 @@ static int TileFlip(int sx,int addr,int pal) } return 1; // Tile blank } - +#endif // tile renderers for hacky operator sprite support #define sh_pix(x) \ @@ -166,21 +174,21 @@ 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; + unsigned char *zb = HighSprZ+sx; + int collision = 0; 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; + t=pack&0x0000f000; if(t) { if(zb[0]) collision=1; if(zval>zb[0]) { pd[0]=(unsigned char)(pal|(t>>12)); zb[0]=(char)zval; } } + t=pack&0x00000f00; if(t) { if(zb[1]) collision=1; if(zval>zb[1]) { pd[1]=(unsigned char)(pal|(t>> 8)); zb[1]=(char)zval; } } + t=pack&0x000000f0; if(t) { if(zb[2]) collision=1; if(zval>zb[2]) { pd[2]=(unsigned char)(pal|(t>> 4)); zb[2]=(char)zval; } } + t=pack&0x0000000f; if(t) { if(zb[3]) collision=1; if(zval>zb[3]) { pd[3]=(unsigned char)(pal|(t )); zb[3]=(char)zval; } } + t=pack&0xf0000000; if(t) { if(zb[4]) collision=1; if(zval>zb[4]) { pd[4]=(unsigned char)(pal|(t>>28)); zb[4]=(char)zval; } } + t=pack&0x0f000000; if(t) { if(zb[5]) collision=1; if(zval>zb[5]) { pd[5]=(unsigned char)(pal|(t>>24)); zb[5]=(char)zval; } } + t=pack&0x00f00000; if(t) { if(zb[6]) collision=1; if(zval>zb[6]) { pd[6]=(unsigned char)(pal|(t>>20)); zb[6]=(char)zval; } } + t=pack&0x000f0000; if(t) { if(zb[7]) collision=1; if(zval>zb[7]) { pd[7]=(unsigned char)(pal|(t>>16)); zb[7]=(char)zval; } } + if (collision) Pico.video.status|=0x20; return 0; } @@ -191,21 +199,21 @@ 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; + unsigned char *zb = HighSprZ+sx; + int collision = 0; 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; + t=pack&0x000f0000; if(t) { if(zb[0]) collision=1; if(zval>zb[0]) { pd[0]=(unsigned char)(pal|(t>>16)); zb[0]=(char)zval; } } + t=pack&0x00f00000; if(t) { if(zb[1]) collision=1; if(zval>zb[1]) { pd[1]=(unsigned char)(pal|(t>>20)); zb[1]=(char)zval; } } + t=pack&0x0f000000; if(t) { if(zb[2]) collision=1; if(zval>zb[2]) { pd[2]=(unsigned char)(pal|(t>>24)); zb[2]=(char)zval; } } + t=pack&0xf0000000; if(t) { if(zb[3]) collision=1; if(zval>zb[3]) { pd[3]=(unsigned char)(pal|(t>>28)); zb[3]=(char)zval; } } + t=pack&0x0000000f; if(t) { if(zb[4]) collision=1; if(zval>zb[4]) { pd[4]=(unsigned char)(pal|(t )); zb[4]=(char)zval; } } + t=pack&0x000000f0; if(t) { if(zb[5]) collision=1; if(zval>zb[5]) { pd[5]=(unsigned char)(pal|(t>> 4)); zb[5]=(char)zval; } } + t=pack&0x00000f00; if(t) { if(zb[6]) collision=1; if(zval>zb[6]) { pd[6]=(unsigned char)(pal|(t>> 8)); zb[6]=(char)zval; } } + t=pack&0x0000f000; if(t) { if(zb[7]) collision=1; if(zval>zb[7]) { pd[7]=(unsigned char)(pal|(t>>12)); zb[7]=(char)zval; } } + if (collision) Pico.video.status|=0x20; return 0; } return 1; // Tile blank @@ -226,7 +234,7 @@ 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; + unsigned char *zb = HighSprZ+sx; int collision = 0; pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels @@ -251,7 +259,7 @@ 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; + unsigned char *zb = HighSprZ+sx; int collision = 0; pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels @@ -321,7 +329,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 @@ -380,7 +388,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 @@ -523,30 +531,57 @@ static void DrawWindow(int tstart, int tend, int prio, int sh) // int *hcache 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; } // 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, tmp, *zb; + + 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)); + zb = (int *)(HighCol+8+(tilex<<3)); if(prio) { tmp = *zb; if(!(tmp&0x00000080)) tmp&=~0x000000c0; if(!(tmp&0x00008000)) tmp&=~0x0000c000; @@ -558,24 +593,40 @@ static void DrawWindow(int tstart, int tend, int prio, int sh) // int *hcache } 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--) + { + 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++; + } +} + static void DrawTilesFromCache(int *hc, int sh, int rlim) { int code, addr, dx; @@ -583,68 +634,52 @@ 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; + 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) 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; @@ -994,7 +1029,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]; @@ -1002,7 +1037,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; @@ -1025,39 +1060,43 @@ 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(((rs&4)||sh)&&prio==0) + if (((rs&PDRAW_ACC_SPRITES)||sh) && prio==0) memset(HighSprZ, 0, 328); - if(!(rs&4)&&prio) { + if (!(rs&PDRAW_ACC_SPRITES)&&prio) { if(hcache[0]) DrawSpritesFromCache(hcache, sh); return; } + if (PicoOpt & POPT_DIS_SPRITE_LIM) + max_line_sprites = 80; + 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); @@ -1065,41 +1104,33 @@ 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; } + 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; + // accurate sprites //dprintf("P:%i",((sx>>15)&1)); - if(rs&4) { + if (rs & PDRAW_ACC_SPRITES) { // might need to skip this sprite - if((pack2&0x8000) ^ (prio<<15)) continue; - DrawSpriteZ(pack,pack2,sh|(prio<<1),(char)(0x1f-n)); + if ((pack2&0x8000) ^ (prio<<15)) continue; + DrawSpriteZ(pack, pack2, sh|(prio<<1), n^0xff); continue; } @@ -1108,7 +1139,7 @@ static void DrawAllSprites(int *hcache, int maxwidth, int prio, int sh) } // Go through sprites backwards: - if(!(rs&4)) { + if (!(rs & PDRAW_ACC_SPRITES)) { for (i--; i>=0; i--) DrawSprite(sprites[i],&hcache,sh); @@ -1123,8 +1154,7 @@ static void DrawAllSprites(int *hcache, int maxwidth, int prio, int 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; @@ -1132,10 +1162,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--) - pal[i] = (unsigned short) (((ppal[i]&0x00f)<<12)|((ppal[i]&0x0f0)<<3)|((ppal[i]&0xf00)>>7)); + if (dirtyPal) + { + unsigned int *spal=(void *)Pico.cram; + unsigned int *dpal=(void *)HighPal; + 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 Pico.m.dirtyPal = 0; } - if (Pico.video.reg[12]&1) { - len = 320; - } else { - if(!(PicoOpt&0x100)) pd+=32; - len = 256; - } - - if(sh) { - if(dirtyPal) { + if (sh) + { + if (dirtyPal) { // shadowed pixels - for(i = 0x3f; i >= 0; i--) + 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--) { + 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; } } } - for(i = 0; i < len; i++) + if (Pico.video.reg[12]&1) { + len = 320; + } else { + if (!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32; + len = 256; + } + +#ifndef PSP + for (i = 0; i < len; i++) pd[i] = pal[ps[i]]; +#else + { + extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count); + amips_clut(pd, ps, pal, len); + } +#endif } #endif @@ -1224,12 +1265,13 @@ static void FinalizeLine8bit(int sh) int len, rs = rendstatus; static int dirty_count; - if (!sh && Pico.m.dirtyPal == 1 && Scanline < 222) { + if (!sh && 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); @@ -1241,11 +1283,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 { @@ -1258,6 +1300,24 @@ 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) @@ -1266,7 +1326,7 @@ static int DrawDisplay(int sh) 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; @@ -1328,30 +1388,36 @@ 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) + rendstatus = (PicoOpt&0x80)>>5; // accurate sprites, clear everything else + 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 + if ((Pico.video.reg[12]&6) == 6) rendstatus |= PDRAW_INTERLACE; // interlace mode + 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 + 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_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); if (Pico.video.reg[1]&0x40) @@ -1360,7 +1426,8 @@ PICO_INTERNAL int PicoLine(int scan) if (FinalizeLine != NULL) FinalizeLine(sh); - Skip=PicoScan(Scanline,DrawLineDest); + if (PicoScanEnd != NULL) + PicoScanEnd(scan); return 0; } @@ -1375,5 +1442,8 @@ void PicoDrawSetColorFormat(int which) case 0: FinalizeLine = FinalizeLineBGR444; break; default:FinalizeLine = NULL; break; } +#if OVERRIDE_HIGHCOL + if (which) HighCol=DefHighCol; +#endif }