\r
// For commercial use, separate licencing terms must be obtained.\r
\r
+/*\r
+ * The renderer has 4 modes now:\r
+ * - normal\r
+ * - shadow/hilight (s/h)\r
+ * - "sonic mode" for midline palette changes\r
+ * - accurate sprites (AS)\r
+ *\r
+ * AS and s/h both use upper bits for both priority and shadow/hilight flags.\r
+ * "sonic mode" is autodetected, shadow/hilight is enabled by emulated game.\r
+ * AS is enabled by user and takes priority over "sonic mode".\r
+ */\r
\r
#include "PicoInt.h"\r
\r
static int HighCacheS[80+1]; // and sprites\r
static int HighPreSpr[80*2+1]; // slightly preprocessed sprites\r
\r
-static unsigned char HighSprZ[320+8+8]; // Z-buffer for accurate sprites\r
-\r
int rendstatus = 0;\r
int Scanline = 0; // Scanline\r
\r
\r
//unsigned short ppt[] = { 0x0f11, 0x0ff1, 0x01f1, 0x011f, 0x01ff, 0x0f1f, 0x0f0e, 0x0e7c };\r
\r
+static void (*DrawAllSpritesLoPri)(int *hcache, int maxwidth, int prio, int sh) = NULL;\r
+static void (*DrawAllSpritesHiPri)(int *hcache, int maxwidth, int prio, int sh) = NULL;\r
+\r
struct TileStrip\r
{\r
int nametab; // Position in VRAM of name table (for this tile line)\r
#ifdef _ASM_DRAW_C\r
void DrawWindow(int tstart, int tend, int prio, int sh);\r
void BackFill(int reg7, int sh);\r
-void DrawSprite(int *sprite, int **hc, int sh);\r
+void DrawSprite(int *sprite, int **hc, int sh, int as);\r
void DrawTilesFromCache(int *hc, int sh, int rlim);\r
-void DrawSpritesFromCache(int *hc, int sh);\r
+void DrawSpritesFromCache(int *hc, int maxwidth, int prio, int sh);\r
void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells);\r
void FinalizeLineBGR444(int sh);\r
void FinalizeLineRGB555(int sh);\r
#define sh_pix(x) \\r
if(!t); \\r
else if(t==0xe) pd[x]=(unsigned char)((pd[x]&0x3f)|0x80); /* hilight */ \\r
- else if(t==0xf) pd[x]=(unsigned char)((pd[x]&0x3f)|0xc0); /* shadow */ \\r
+ else if(t==0xf) pd[x]=(unsigned char)( pd[x] |0xc0); /* shadow */ \\r
else pd[x]=(unsigned char)(pal|t)\r
\r
#ifndef _ASM_DRAW_C\r
}\r
#endif\r
\r
-static int TileNormZ(int sx,int addr,int pal,int zval)\r
+#define tilepixelAS(mask,index,shift) \\r
+ if (!(pd[index]&0xc0)) { t=pack&mask; if (t) pd[index]=(pal|(t>>shift)); }\r
+\r
+static int TileNormAS(int sx,int addr,int pal)\r
{\r
- unsigned int pack=0; unsigned int t=0;\r
unsigned char *pd = HighCol+sx;\r
- unsigned char *zb = HighSprZ+sx;\r
- int collision = 0;\r
+ unsigned int pack=0; unsigned int t=0;\r
\r
pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
if (pack)\r
{\r
- t=pack&0x0000f000; if(t) { if(zb[0]) collision=1; if(zval>zb[0]) { pd[0]=(unsigned char)(pal|(t>>12)); zb[0]=(char)zval; } }\r
- 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; } }\r
- 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; } }\r
- t=pack&0x0000000f; if(t) { if(zb[3]) collision=1; if(zval>zb[3]) { pd[3]=(unsigned char)(pal|(t )); zb[3]=(char)zval; } }\r
- 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; } }\r
- 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; } }\r
- 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; } }\r
- 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; } }\r
- if (collision) Pico.video.status|=0x20;\r
+ tilepixelAS(0x0000f000, 0, 12);\r
+ tilepixelAS(0x00000f00, 1, 8);\r
+ tilepixelAS(0x000000f0, 2, 4);\r
+ tilepixelAS(0x0000000f, 3, 0);\r
+ tilepixelAS(0xf0000000, 4, 28);\r
+ tilepixelAS(0x0f000000, 5, 24);\r
+ tilepixelAS(0x00f00000, 6, 20);\r
+ tilepixelAS(0x000f0000, 7, 16);\r
return 0;\r
}\r
\r
return 1; // Tile blank\r
}\r
\r
-static int TileFlipZ(int sx,int addr,int pal,int zval)\r
+static int TileFlipAS(int sx,int addr,int pal)\r
{\r
- unsigned int pack=0; unsigned int t=0;\r
unsigned char *pd = HighCol+sx;\r
- unsigned char *zb = HighSprZ+sx;\r
- int collision = 0;\r
+ unsigned int pack=0; unsigned int t=0;\r
\r
pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
if (pack)\r
{\r
- t=pack&0x000f0000; if(t) { if(zb[0]) collision=1; if(zval>zb[0]) { pd[0]=(unsigned char)(pal|(t>>16)); zb[0]=(char)zval; } }\r
- 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; } }\r
- 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; } }\r
- 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; } }\r
- t=pack&0x0000000f; if(t) { if(zb[4]) collision=1; if(zval>zb[4]) { pd[4]=(unsigned char)(pal|(t )); zb[4]=(char)zval; } }\r
- 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; } }\r
- 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; } }\r
- 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; } }\r
- if (collision) Pico.video.status|=0x20;\r
+ tilepixelAS(0x000f0000, 0, 16);\r
+ tilepixelAS(0x00f00000, 1, 20);\r
+ tilepixelAS(0x0f000000, 2, 24);\r
+ tilepixelAS(0xf0000000, 3, 28);\r
+ tilepixelAS(0x0000000f, 4, 0);\r
+ tilepixelAS(0x000000f0, 5, 4);\r
+ tilepixelAS(0x00000f00, 6, 8);\r
+ tilepixelAS(0x0000f000, 7, 12);\r
return 0;\r
}\r
return 1; // Tile blank\r
}\r
\r
+// there is a problem with transparent hi pri tiles (on layer), it will clear high bits\r
+// and sprite tiles will be drawn needlessly. Hopefully that won't happen much..\r
+#define sh_pixAS(x) \\r
+ if(!t); \\r
+ else if(t==0xe) pd[x]=(unsigned char)((pd[x]&0x3f)|0x80); /* hilight */ \\r
+ else if(t==0xf) pd[x]=(unsigned char)( pd[x] |0xc0); /* shadow */ \\r
+ else if(!(pd[x]&0xc0)) pd[x]=(unsigned char)(pal|t)\r
\r
-#define sh_pixZ(x) \\r
- if(t) { \\r
- if(zb[x]) collision=1; \\r
- if(zval>zb[x]) { \\r
- if (t==0xe) { pd[x]=(unsigned char)((pd[x]&0x3f)|0x80); /* hilight */ } \\r
- else if(t==0xf) { pd[x]=(unsigned char)((pd[x]&0x3f)|0xc0); /* shadow */ } \\r
- else { zb[x]=(char)zval; pd[x]=(unsigned char)(pal|t); } \\r
- } \\r
- }\r
-\r
-static int TileNormZSH(int sx,int addr,int pal,int zval)\r
+static int TileNormSHAS(int sx,int addr,int pal)\r
{\r
unsigned int pack=0; unsigned int t=0;\r
unsigned char *pd = HighCol+sx;\r
- unsigned char *zb = HighSprZ+sx;\r
- int collision = 0;\r
\r
pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
if (pack)\r
{\r
- t=(pack&0x0000f000)>>12; sh_pixZ(0);\r
- t=(pack&0x00000f00)>> 8; sh_pixZ(1);\r
- t=(pack&0x000000f0)>> 4; sh_pixZ(2);\r
- t=(pack&0x0000000f) ; sh_pixZ(3);\r
- t=(pack&0xf0000000)>>28; sh_pixZ(4);\r
- t=(pack&0x0f000000)>>24; sh_pixZ(5);\r
- t=(pack&0x00f00000)>>20; sh_pixZ(6);\r
- t=(pack&0x000f0000)>>16; sh_pixZ(7);\r
- if(collision) Pico.video.status|=0x20;\r
+ t=(pack&0x0000f000)>>12; sh_pixAS(0);\r
+ t=(pack&0x00000f00)>> 8; sh_pixAS(1);\r
+ t=(pack&0x000000f0)>> 4; sh_pixAS(2);\r
+ t=(pack&0x0000000f) ; sh_pixAS(3);\r
+ t=(pack&0xf0000000)>>28; sh_pixAS(4);\r
+ t=(pack&0x0f000000)>>24; sh_pixAS(5);\r
+ t=(pack&0x00f00000)>>20; sh_pixAS(6);\r
+ t=(pack&0x000f0000)>>16; sh_pixAS(7);\r
return 0;\r
}\r
\r
return 1; // Tile blank\r
}\r
\r
-static int TileFlipZSH(int sx,int addr,int pal,int zval)\r
+static int TileFlipSHAS(int sx,int addr,int pal)\r
{\r
unsigned int pack=0; unsigned int t=0;\r
unsigned char *pd = HighCol+sx;\r
- unsigned char *zb = HighSprZ+sx;\r
- int collision = 0;\r
\r
pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
if (pack)\r
{\r
- t=(pack&0x000f0000)>>16; sh_pixZ(0);\r
- t=(pack&0x00f00000)>>20; sh_pixZ(1);\r
- t=(pack&0x0f000000)>>24; sh_pixZ(2);\r
- t=(pack&0xf0000000)>>28; sh_pixZ(3);\r
- t=(pack&0x0000000f) ; sh_pixZ(4);\r
- t=(pack&0x000000f0)>> 4; sh_pixZ(5);\r
- t=(pack&0x00000f00)>> 8; sh_pixZ(6);\r
- t=(pack&0x0000f000)>>12; sh_pixZ(7);\r
- if(collision) Pico.video.status|=0x20;\r
+ t=(pack&0x000f0000)>>16; sh_pixAS(0);\r
+ t=(pack&0x00f00000)>>20; sh_pixAS(1);\r
+ t=(pack&0x0f000000)>>24; sh_pixAS(2);\r
+ t=(pack&0xf0000000)>>28; sh_pixAS(3);\r
+ t=(pack&0x0000000f) ; sh_pixAS(4);\r
+ t=(pack&0x000000f0)>> 4; sh_pixAS(5);\r
+ t=(pack&0x00000f00)>> 8; sh_pixAS(6);\r
+ t=(pack&0x0000f000)>>12; sh_pixAS(7);\r
return 0;\r
}\r
return 1; // Tile blank\r
}\r
\r
+\r
// --------------------------------------------\r
\r
#ifndef _ASM_DRAW_C\r
// Index + 0 : hhhhvvvv ab--hhvv yyyyyyyy yyyyyyyy // a: offscreen h, b: offs. v, h: horiz. size\r
// Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8\r
\r
-static void DrawSprite(int *sprite, int **hc, int sh)\r
+static void DrawSprite(int *sprite, int **hc, int sh, int as)\r
{\r
int width=0,height=0;\r
int row=0,code=0;\r
\r
tile<<=4; tile+=(row&7)<<1; // Tile address\r
\r
- if(code&0x8000) { // high priority - cache it\r
+ if (code&0x8000) { // high priority - cache it\r
*(*hc)++ = (tile<<16)|((code&0x0800)<<5)|((sx<<6)&0x0000ffc0)|((code>>9)&0x30)|((sprite[0]>>16)&0xf);\r
- } else {\r
- delta<<=4; // Delta of address\r
- pal=((code>>9)&0x30)|(sh<<6);\r
-\r
- if(sh && (code&0x6000) == 0x6000) {\r
- if(code&0x0800) fTileFunc=TileFlipSH;\r
- else fTileFunc=TileNormSH;\r
- } else {\r
- if(code&0x0800) fTileFunc=TileFlip;\r
- else fTileFunc=TileNorm;\r
- }\r
-\r
- for (; width; width--,sx+=8,tile+=delta)\r
- {\r
- if(sx<=0) continue;\r
- if(sx>=328) break; // Offscreen\r
-\r
- tile&=0x7fff; // Clip tile address\r
- fTileFunc(sx,tile,pal);\r
- }\r
+ // we need all for accurate sprites, cached will be used to recover ones overwritten by high layer\r
+ if (!as) return;\r
}\r
-}\r
-#endif\r
-\r
-\r
-// Index + 0 : hhhhvvvv s---hhvv yyyyyyyy yyyyyyyy // s: skip flag, h: horiz. size\r
-// Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8\r
-\r
-static void DrawSpriteZ(int pack, int pack2, int shpri, int sprio)\r
-{\r
- int width=0,height=0;\r
- int row=0;\r
- int pal;\r
- int tile=0,delta=0;\r
- int sx, sy;\r
- int (*fTileFunc)(int sx,int addr,int pal,int zval);\r
-\r
- // parse the sprite data\r
- sx=pack2>>16; // X\r
- sy=(pack <<16)>>16; // Y\r
- width=pack>>28;\r
- height=(pack>>24)&7; // Width and height in tiles\r
\r
- row=Scanline-sy; // Row of the sprite we are on\r
-\r
- if (pack2&0x1000) row=(height<<3)-1-row; // Flip Y\r
-\r
- tile=pack2&0x7ff; // Tile number\r
- tile+=row>>3; // Tile number increases going down\r
- delta=height; // Delta to increase tile by going right\r
- if (pack2&0x0800) { tile+=delta*(width-1); delta=-delta; } // Flip X\r
-\r
- tile<<=4; tile+=(row&7)<<1; // Tile address\r
delta<<=4; // Delta of address\r
- pal=((pack2>>9)&0x30);\r
- if((shpri&1)&&!(shpri&2)) pal|=0x40;\r
-\r
- shpri&=1;\r
- if((pack2&0x6000) != 0x6000) shpri = 0;\r
- shpri |= (pack2&0x0800)>>10;\r
- switch(shpri) {\r
- default:\r
- case 0: fTileFunc=TileNormZ; break;\r
- case 1: fTileFunc=TileNormZSH; break;\r
- case 2: fTileFunc=TileFlipZ; break;\r
- case 3: fTileFunc=TileFlipZSH; break;\r
+ pal=((code>>9)&0x30)|((sh|as)<<6);\r
+\r
+ if (sh && (code&0x6000) == 0x6000) {\r
+ if(code&0x0800) fTileFunc=TileFlipSH;\r
+ else fTileFunc=TileNormSH;\r
+ } else {\r
+ if(code&0x0800) fTileFunc=TileFlip;\r
+ else fTileFunc=TileNorm;\r
}\r
\r
for (; width; width--,sx+=8,tile+=delta)\r
if(sx>=328) break; // Offscreen\r
\r
tile&=0x7fff; // Clip tile address\r
- fTileFunc(sx,tile,pal,sprio);\r
+ fTileFunc(sx,tile,pal);\r
}\r
}\r
+#endif\r
\r
static void DrawSpriteInterlace(unsigned int *sprite)\r
{\r
}\r
\r
\r
-static void DrawAllSpritesInterlace(int pri, int maxwidth)\r
+static void DrawAllSpritesInterlace(int *hcache, int maxwidth, int pri, int sh)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
int i,u,table,link=0,sline=Scanline<<1;\r
\r
\r
#ifndef _ASM_DRAW_C\r
-static void DrawSpritesFromCache(int *hc, int sh)\r
+static void DrawSpritesFromCache(int *hc, int maxwidth, int prio, int sh)\r
{\r
int code, tile, sx, delta, width;\r
int pal;\r
}\r
#endif\r
\r
+static void DrawSpritesFromCacheAS(int *hc, int maxwidth, int prio, int sh)\r
+{\r
+ int code, tile, sx, delta, width;\r
+ int pal;\r
+ int (*fTileFunc)(int sx,int addr,int pal);\r
+\r
+ // *(*hc)++ = (tile<<16)|((code&0x0800)<<5)|((sx<<6)&0x0000ffc0)|((code>>9)&0x30)|((sprite[0]>>24)&0xf);\r
+\r
+ while((code=*hc++)) {\r
+ pal=(code&0x30);\r
+ delta=code&0xf;\r
+ width=delta>>2; delta&=3;\r
+ width++; delta++; // Width and height in tiles\r
+ if (code&0x10000) delta=-delta; // Flip X\r
+ delta<<=4;\r
+ tile=((unsigned int)code>>17)<<1;\r
+ sx=(code<<16)>>22; // sx can be negative (start offscreen), so sign extend\r
+\r
+ if(sh && pal == 0x30) { //\r
+ if(code&0x10000) fTileFunc=TileFlipSHAS;\r
+ else fTileFunc=TileNormSHAS;\r
+ } else {\r
+ if(code&0x10000) fTileFunc=TileFlipAS;\r
+ else fTileFunc=TileNormAS;\r
+ }\r
+\r
+ for (; width; width--,sx+=8,tile+=delta)\r
+ {\r
+ if(sx<=0) continue;\r
+ if(sx>=328) break; // Offscreen\r
+\r
+ tile&=0x7fff; // Clip tile address\r
+ fTileFunc(sx,tile,pal);\r
+ }\r
+ }\r
+}\r
+\r
\r
// Index + 0 : ----hhvv -lllllll -------y yyyyyyyy\r
// Index + 4 : -------x xxxxxxxx pccvhnnn nnnnnnnn\r
int max_line_sprites = 20; // 20 sprites, 40 tiles\r
int *ps, pack, rs = rendstatus, scan = Scanline;\r
\r
- if(rs&8) {\r
- DrawAllSpritesInterlace(prio, maxwidth);\r
- return;\r
- }\r
if (rs & (PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES)) {\r
//dprintf("PrepareSprites(%i) [%i]", (rs>>4)&1, scan);\r
PrepareSprites(rs & PDRAW_DIRTY_SPRITES);\r
rendstatus = rs & ~(PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES);\r
}\r
- if (!(SpriteBlocks & (1<<(scan>>3)))) return;\r
-\r
- if (((rs&PDRAW_ACC_SPRITES)||sh) && prio==0)\r
- memset(HighSprZ, 0, 328);\r
- if (!(rs&PDRAW_ACC_SPRITES)&&prio) {\r
- if(hcache[0]) DrawSpritesFromCache(hcache, sh);\r
- return;\r
- }\r
+ if (!(SpriteBlocks & (1<<(scan>>3)))) { *hcache = 0; return; }\r
\r
if (PicoOpt & POPT_DIS_SPRITE_LIM)\r
max_line_sprites = 80;\r
\r
if (pack & 0x00800000) continue;\r
\r
- // accurate sprites\r
- //dprintf("P:%i",((sx>>15)&1));\r
- if (rs & PDRAW_ACC_SPRITES) {\r
- // might need to skip this sprite\r
- if ((pack2&0x8000) ^ (prio<<15)) continue;\r
- DrawSpriteZ(pack, pack2, sh|(prio<<1), n^0xff);\r
- continue;\r
- }\r
-\r
// sprite is good, save it's pointer\r
sprites[i++]=ps;\r
}\r
\r
+ n = (rs & PDRAW_ACC_SPRITES) ? 1 : 0;\r
+\r
// Go through sprites backwards:\r
- if (!(rs & PDRAW_ACC_SPRITES)) {\r
- for (i--; i>=0; i--)\r
- DrawSprite(sprites[i],&hcache,sh);\r
+ for (i--; i>=0; i--)\r
+ DrawSprite(sprites[i],&hcache,sh,n);\r
\r
- // terminate cache list\r
- *hcache = 0;\r
- }\r
+ // terminate cache list\r
+ *hcache = 0;\r
}\r
\r
\r
unsigned short *pd=DrawLineDest;\r
unsigned char *ps=HighCol+8;\r
unsigned short *pal=Pico.cram;\r
- int len, i, t;\r
+ int len, i, t, mask=0xff;\r
\r
if (Pico.video.reg[12]&1) {\r
len = 320;\r
}\r
}\r
\r
+ if (!sh && (rendstatus & PDRAW_ACC_SPRITES))\r
+ mask=0x3f; // accurate sprites\r
+\r
for(i = 0; i < len; i++)\r
- pd[i] = pal[ps[i]];\r
+ pd[i] = pal[ps[i] & mask];\r
}\r
\r
\r
len = 256;\r
}\r
\r
+ {\r
#ifndef PSP\r
- for (i = 0; i < len; i++)\r
- pd[i] = pal[ps[i]];\r
+ int mask=0xff;\r
+ if (!sh && (rendstatus & PDRAW_ACC_SPRITES))\r
+ mask=0x3f; // accurate sprites, upper bits are priority stuff\r
+\r
+ for (i = 0; i < len; i++)\r
+ pd[i] = pal[ps[i] & mask];\r
#else\r
- {\r
extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);\r
- amips_clut(pd, ps, pal, len);\r
- }\r
+ extern void amips_clut_6bit(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);\r
+ if (!sh && (rendstatus & PDRAW_ACC_SPRITES))\r
+ amips_clut_6bit(pd, ps, pal, len);\r
+ else amips_clut(pd, ps, pal, len);\r
#endif\r
+ }\r
}\r
#endif\r
\r
int len, rs = rendstatus;\r
static int dirty_count;\r
\r
- if (!sh && Pico.m.dirtyPal == 1 && Scanline < 222)\r
+ if (!sh && !(rs & PDRAW_ACC_SPRITES) && Pico.m.dirtyPal == 1 && Scanline < 222)\r
{\r
// a hack for mid-frame palette changes\r
if (!(rs & PDRAW_SONIC_MODE))\r
\r
// --------------------------------------------\r
\r
-static int DrawDisplay(int sh)\r
+static int DrawDisplay(int sh, int as)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
int win=0,edge=0,hvwind=0;\r
}\r
}\r
\r
- DrawLayer(1|(sh<<1), HighCacheB, 0, maxcells);\r
+ DrawLayer(1|((sh|as)<<1), HighCacheB, 0, maxcells);\r
if (hvwind == 1)\r
- DrawWindow(0, maxcells>>1, 0, sh);\r
+ DrawWindow(0, maxcells>>1, 0, sh|as);\r
else if (hvwind == 2) {\r
// ahh, we have vertical window\r
- DrawLayer(0|(sh<<1), HighCacheA, (win&0x80) ? 0 : edge<<1, (win&0x80) ? edge<<1 : maxcells);\r
- DrawWindow( (win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 0, sh);\r
+ DrawLayer(0|((sh|as)<<1), HighCacheA, (win&0x80) ? 0 : edge<<1, (win&0x80) ? edge<<1 : maxcells);\r
+ DrawWindow( (win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 0, sh|as);\r
} else\r
- DrawLayer(0|(sh<<1), HighCacheA, 0, maxcells);\r
- DrawAllSprites(HighCacheS, maxw, 0, sh);\r
+ DrawLayer(0|((sh|as)<<1), HighCacheA, 0, maxcells);\r
+ DrawAllSpritesLoPri(HighCacheS, maxw, 0, sh);\r
\r
if (HighCacheB[0]) DrawTilesFromCache(HighCacheB, sh, 328);\r
if (hvwind == 1)\r
DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 1, sh);\r
} else\r
if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, 328);\r
- DrawAllSprites(HighCacheS, maxw, 1, sh);\r
+ DrawAllSpritesHiPri(HighCacheS, maxw, 1, sh);\r
\r
#if 0\r
{\r
{\r
// prepare to do this frame\r
rendstatus = (PicoOpt&0x80)>>5; // accurate sprites, clear everything else\r
- if (rendstatus)\r
- Pico.video.status &= ~0x0020;\r
- else Pico.video.status |= 0x0020; // sprite collision\r
- if ((Pico.video.reg[12]&6) == 6) rendstatus |= PDRAW_INTERLACE; // interlace mode\r
+ if ((Pico.video.reg[12]&6) == 6) {\r
+ rendstatus |= PDRAW_INTERLACE; // interlace mode\r
+ DrawAllSpritesLoPri = DrawAllSpritesInterlace;\r
+ DrawAllSpritesHiPri = DrawAllSpritesInterlace;\r
+ }\r
+ else\r
+ {\r
+ DrawAllSpritesLoPri = DrawAllSprites;\r
+ DrawAllSpritesHiPri = rendstatus ? DrawSpritesFromCacheAS : DrawSpritesFromCache;\r
+ }\r
+\r
if (Pico.m.dirtyPal) Pico.m.dirtyPal = 2; // reset dirty if needed\r
\r
PrepareSprites(1);\r
\r
PICO_INTERNAL int PicoLine(int scan)\r
{\r
- int sh;\r
+ int sh, as = 0;\r
if (skip_next_line>0) { skip_next_line--; return 0; } // skip_next_line rendering lines\r
\r
Scanline=scan;\r
sh=(Pico.video.reg[0xC]&8)>>3; // shadow/hilight?\r
+ if (rendstatus & PDRAW_ACC_SPRITES) as|=1; // accurate sprites\r
\r
if (rendstatus & PDRAW_EARLY_BLANK) {\r
if (scan > 0) handle_early_blank(scan, sh);\r
skip_next_line = PicoScanBegin(scan);\r
\r
// Draw screen:\r
- BackFill(Pico.video.reg[7], sh);\r
+ BackFill(Pico.video.reg[7], sh|as);\r
if (Pico.video.reg[1]&0x40)\r
- DrawDisplay(sh);\r
+ DrawDisplay(sh, as);\r
\r
if (FinalizeLine != NULL)\r
FinalizeLine(sh);\r
@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\r
\r
\r
-.global DrawSpritesFromCache @ int *hc, int sh\r
+.global DrawSpritesFromCache @ int *hc, int maxwidth, int prio, int sh\r
\r
DrawSpritesFromCache:\r
stmfd sp!, {r4-r11,lr}\r
mov r12,#0xf\r
.endif\r
ldr lr, =(Pico+0x10000) @ lr=Pico.vram\r
- mov r6, r1, lsl #31\r
+ mov r6, r3, lsl #31\r
orr r6, r6, #1<<30\r
\r
mov r10, r0\r
@ + 0 : hhhhvvvv ab--hhvv yyyyyyyy yyyyyyyy // a: offscreen h, b: offs. v, h: horiz. size\r
@ + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8\r
\r
-.global DrawSprite @ unsigned int *sprite, int **hc, int sh\r
+.global DrawSprite @ unsigned int *sprite, int **hc, int sh, int acc_sprites\r
\r
DrawSprite:\r
stmfd sp!, {r4-r9,r11,lr}\r
\r
+ orr r8, r3, r2, lsl #4\r
ldr r3, [r0] @ sprite[0]\r
ldr r7, =Scanline\r
mov r6, r3, lsr #28\r
ldr r9, [r0, #4]\r
sub r7, r7, r4, asr #16 @ r7=row=Scanline-sy\r
\r
- tst r2, r2\r
mov r2, r9, asr #16 @ r2=sx\r
- bic r9, r9, #0xfe000000\r
- orrne r9, r9, #1<<31 @ r9=code|(sh<<31)\r
+ mov r9, r9, lsl #16\r
+ mov r9, r9, lsr #16\r
+ orr r9, r9, r8, lsl #27 @ r9=code|sh[31]|as[27]\r
\r
tst r9, #0x1000\r
movne r4, r5, lsl #3\r
tst r9, #0x8000\r
bne .dspr_cache @ if(code&0x8000) // high priority - cache it\r
\r
+.dspr_continue:\r
@ cache some stuff to avoid mem access\r
.if OVERRIDE_HIGHCOL\r
ldr r11,=HighCol\r
mov r5, r5, lsl #4 @ delta<<=4; // Delta of address\r
and r4, r9, #0x6000\r
orr r9, r9, r4, lsl #16\r
- orr r9, r9, #0x10000000 @ r9=scc1 ???? ... <code> (s=shadow/hilight, cc=pal)\r
+ orrs r9, r9, #0x10000000 @ r9=scc1 a??? ... <code> (s=shadow/hilight, cc=pal, a=acc_spr)\r
\r
- tst r9, #1<<31\r
mov r3, r4, lsr #9 @ r3=pal=((code>>9)&0x30);\r
- orrne r3, r3, #0x40 @ shadow by default\r
+ orrmi r3, r3, #0x40 @ shadow by default\r
\r
add r6, r6, #1 @ inc now\r
adds r0, r2, #0 @ mov sx to r0 and set ZV flags\r
mov r4, r8, lsl #16 @ tile\r
tst r9, #0x0800\r
orrne r4, r4, #0x10000 @ code&0x0800\r
- mov r2, r2, lsl #22\r
- orr r4, r4, r2, lsr #16 @ (sx<<6)&0x0000ffc0\r
- and r2, r9, #0x6000\r
- orr r4, r4, r2, lsr #9 @ (code>>9)&0x30\r
+ mov r0, r2, lsl #22\r
+ orr r4, r4, r0, lsr #16 @ (sx<<6)&0x0000ffc0\r
+ and r0, r9, #0x6000\r
+ orr r4, r4, r0, lsr #9 @ (code>>9)&0x30\r
mov r3, r3, lsl #12\r
- ldr r2, [r1]\r
+ ldr r0, [r1]\r
orr r4, r4, r3, lsr #28 @ (sprite[0]>>24)&0xf\r
\r
- str r4, [r2], #4\r
- str r2, [r1]\r
+ str r4, [r0], #4\r
+ str r0, [r1]\r
\r
- ldmfd sp!, {r4-r9,r11,lr}\r
- bx lr\r
+ tst r9, #(1<<27)\r
+ ldmeqfd sp!, {r4-r9,r11,lr}\r
+ bne .dspr_continue @ draw anyway if accurate sprites enabled\r
+ bxeq lr\r
\r
@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\r
\r
bne .fl_loopcpBGR444_hi\r
\r
sub r3, r4, #0x40*3*2\r
+ mov r6, #1\r
\r
\r
.fl_noshBGR444:\r
+ ldr r12,=rendstatus\r
+ eors r6, r6, #1 @ sh is 0\r
+ ldr r12,[r12]\r
+ mov lr, #0xff\r
+ tstne r12,#(1<<2) @ and PDRAW_ACC_SPRITES\r
+\r
.if OVERRIDE_HIGHCOL\r
ldr r1, =HighCol\r
- mov lr, #0xff\r
+ movne lr, #0x3f\r
ldr r1, [r1]\r
mov lr, lr, lsl #1\r
add r1, r1, #8\r
.else\r
ldr r1, =(HighCol+8)\r
- mov lr, #0xff\r
+ movne lr, #0x3f\r
mov lr, lr, lsl #1\r
.endif\r
\r
.fl_loopBGR444:\r
-\r
ldr r12, [r1], #4\r
subs r2, r2, #1\r
\r
ldrh r5, [r3, r5]\r
and r6, lr, r12, lsr #15\r
ldrh r6, [r3, r6]\r
+ and r12,lr, r12, lsr #23\r
+ ldrh r12,[r3, r12] @ 1c.i.\r
orr r4, r4, r5, lsl #16\r
-\r
- and r5, lr, r12, lsr #23\r
- ldrh r5, [r3, r5] @ 2c.i.\r
- orr r5, r6, r5, lsl #16\r
+ orr r5, r6, r12,lsl #16\r
\r
stmia r0!, {r4,r5}\r
bne .fl_loopBGR444\r
bne .fl_loopcpRGB555_hi\r
\r
sub r3, r3, #0x40*2\r
+ mov r6, #1\r
\r
.fl_noshRGB555:\r
+ ldr r12,=rendstatus\r
+ eors r6, r6, #1 @ sh is 0\r
+ ldr r12,[r12]\r
+ mov lr, #0xff\r
+ tstne r12,#(1<<2) @ and PDRAW_ACC_SPRITES\r
+ movne lr, #0x3f\r
+\r
.if OVERRIDE_HIGHCOL\r
ldr r1, =HighCol\r
ldr r0, =DrawLineDest\r
.endif\r
\r
ldrb r12, [r8, #12]\r
- mov lr, #0xff\r
mov lr, lr, lsl #1\r
\r
tst r12, #1\r
notaz.gp2x.de / picodrive.git / commitdiff