// This is part of Pico Library\r
\r
// (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006 notaz, All rights reserved.\r
+// (c) Copyright 2006-2008 notaz, All rights reserved.\r
// Free for non-commercial use.\r
\r
// For commercial use, separate licencing terms must be obtained.\r
\r
\r
#include "PicoInt.h"\r
-#ifndef __GNUC__\r
-#pragma warning (disable:4706) // Disable assignment within conditional\r
-#endif\r
\r
-int (*PicoScan)(unsigned int num, void *data)=NULL;\r
+int (*PicoScanBegin)(unsigned int num) = NULL;\r
+int (*PicoScanEnd) (unsigned int num) = NULL;\r
\r
-unsigned short DefOutBuff[320*2];\r
+#if OVERRIDE_HIGHCOL\r
+static unsigned char DefHighCol[8+320+8];\r
+unsigned char *HighCol=DefHighCol;\r
+#else\r
unsigned char HighCol[8+320+8];\r
+#endif\r
+unsigned short DefOutBuff[320*2];\r
+void *DrawLineDest=DefOutBuff; // pointer to dest buffer where to draw this line to\r
+\r
static int HighCacheA[41+1]; // caches for high layers\r
static int HighCacheB[41+1];\r
static int HighCacheS[80+1]; // and sprites\r
static int HighPreSpr[80*2+1]; // slightly preprocessed sprites\r
-char HighSprZ[320+8+8]; // Z-buffer for accurate sprites and shadow/hilight mode\r
- // (if bit 7 == 0, sh caused by tile; if bit 6 == 0 pixel must be shadowed, else hilighted, if bit5 == 1)\r
-// lsb->msb: moved sprites, not all window tiles use same priority, accurate sprites (copied from PicoOpt), interlace\r
-// dirty sprites, sonic mode, have layer with all hi prio tiles (mk3), layer sh/hi already processed\r
-int rendstatus;\r
-void *DrawLineDest=DefOutBuff; // pointer to dest buffer where to draw this line to\r
-int Scanline=0; // Scanline\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
static int SpriteBlocks;\r
+static int skip_next_line=0;\r
+\r
//unsigned short ppt[] = { 0x0f11, 0x0ff1, 0x01f1, 0x011f, 0x01ff, 0x0f1f, 0x0f0e, 0x0e7c };\r
\r
struct TileStrip\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 DrawTilesFromCache(int *hc, int sh);\r
+void DrawTilesFromCache(int *hc, int sh, int rlim);\r
void DrawSpritesFromCache(int *hc, int sh);\r
-void DrawLayer(int plane, int *hcache, int maxcells, 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
+void *blockcpy(void *dst, const void *src, size_t n);\r
void blockcpy_or(void *dst, void *src, size_t n, int pat);\r
#else\r
// utility\r
for (; n; n--)\r
*pd++ = (unsigned char) (*ps++ | pat);\r
}\r
+#define blockcpy memcpy\r
#endif\r
\r
\r
+#ifdef _ASM_DRAW_C_AMIPS\r
+int TileNorm(int sx,int addr,int pal);\r
+int TileFlip(int sx,int addr,int pal);\r
+#else\r
static int TileNorm(int sx,int addr,int pal)\r
{\r
unsigned char *pd = HighCol+sx;\r
}\r
return 1; // Tile blank\r
}\r
-\r
+#endif\r
\r
// tile renderers for hacky operator sprite support\r
#define sh_pix(x) \\r
{\r
unsigned int pack=0; unsigned int t=0;\r
unsigned char *pd = HighCol+sx;\r
- char *zb = HighSprZ+sx;\r
- int collision = 0, zb_s;\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; 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; } }\r
- 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; } }\r
- 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; } }\r
- 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; } }\r
- 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; } }\r
- 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; } }\r
- 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; } }\r
- 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; } }\r
- if(collision) Pico.video.status|=0x20;\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
return 0;\r
}\r
\r
{\r
unsigned int pack=0; unsigned int t=0;\r
unsigned char *pd = HighCol+sx;\r
- char *zb = HighSprZ+sx;\r
- int collision = 0, zb_s;\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; 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; } }\r
- 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; } }\r
- 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; } }\r
- 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; } }\r
- 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; } }\r
- 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; } }\r
- 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; } }\r
- 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; } }\r
- if(collision) Pico.video.status|=0x20;\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
return 0;\r
}\r
return 1; // Tile blank\r
{\r
unsigned int pack=0; unsigned int t=0;\r
unsigned char *pd = HighCol+sx;\r
- char *zb = HighSprZ+sx;\r
+ unsigned char *zb = HighSprZ+sx;\r
int collision = 0;\r
\r
pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
{\r
unsigned int pack=0; unsigned int t=0;\r
unsigned char *pd = HighCol+sx;\r
- char *zb = HighSprZ+sx;\r
+ unsigned char *zb = HighSprZ+sx;\r
int collision = 0;\r
\r
pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
// --------------------------------------------\r
\r
#ifndef _ASM_DRAW_C\r
-static void DrawStrip(struct TileStrip *ts, int sh)\r
+static void DrawStrip(struct TileStrip *ts, int plane_sh, int cellskip)\r
{\r
- int tilex=0,dx=0,ty=0,code=0,addr=0,cells;\r
+ int tilex,dx,ty,code=0,addr=0,cells;\r
int oldcode=-1,blank=-1; // The tile we know is blank\r
- int pal=0;\r
+ int pal=0,sh;\r
\r
// Draw tiles across screen:\r
- tilex=(-ts->hscroll)>>3;\r
+ sh=(plane_sh<<5)&0x40;\r
+ tilex=((-ts->hscroll)>>3)+cellskip;\r
ty=(ts->line&7)<<1; // Y-Offset into tile\r
dx=((ts->hscroll-1)&7)+1;\r
- cells = ts->cells;\r
+ cells = ts->cells - cellskip;\r
if(dx != 8) cells++; // have hscroll, need to draw 1 cell more\r
+ dx+=cellskip<<3;\r
\r
- for (; cells; dx+=8,tilex++,cells--)\r
+ for (; cells > 0; dx+=8,tilex++,cells--)\r
{\r
int zero=0;\r
\r
addr+=ty;\r
if (code&0x1000) addr^=0xe; // Y-flip\r
\r
-// pal=Pico.cram+((code>>9)&0x30);\r
- pal=((code>>9)&0x30)|(sh<<6);\r
+ pal=((code>>9)&0x30)|sh;\r
}\r
\r
if (code&0x0800) zero=TileFlip(dx,addr,pal);\r
// terminate the cache list\r
*ts->hc = 0;\r
// if oldcode wasn't changed, it means all layer is hi priority\r
- if (oldcode == -1) rendstatus|=0x40;\r
+ if (oldcode == -1) rendstatus |= PDRAW_PLANE_HI_PRIO;\r
}\r
\r
// this is messy\r
-void DrawStripVSRam(struct TileStrip *ts, int plane)\r
+void DrawStripVSRam(struct TileStrip *ts, int plane_sh, int cellskip)\r
{\r
- int tilex=0,dx=0,ty=0,code=0,addr=0,cell=0,nametabadd=0;\r
+ int tilex,dx,code=0,addr=0,cell=0;\r
int oldcode=-1,blank=-1; // The tile we know is blank\r
int pal=0,scan=Scanline;\r
\r
// Draw tiles across screen:\r
tilex=(-ts->hscroll)>>3;\r
dx=((ts->hscroll-1)&7)+1;\r
- if(dx != 8) {\r
- int vscroll, line;\r
- cell--; // have hscroll, start with negative cell\r
- // also calculate intial VS stuff\r
- vscroll=Pico.vsram[plane];\r
-\r
- // Find the line in the name table\r
- line=(vscroll+scan)&ts->line&0xffff; // ts->line is really ymask ..\r
- nametabadd=(line>>3)<<(ts->line>>24); // .. and shift[width]\r
- ty=(line&7)<<1; // Y-Offset into tile\r
- }\r
+ if(dx != 8) cell--; // have hscroll, start with negative cell\r
+ cell+=cellskip;\r
+ tilex+=cellskip;\r
+ dx+=cellskip<<3;\r
\r
for (; cell < ts->cells; dx+=8,tilex++,cell++)\r
{\r
- int zero=0;\r
+ int zero=0,nametabadd,ty;\r
\r
- if((cell&1)==0) {\r
+ //if((cell&1)==0)\r
+ {\r
int line,vscroll;\r
- vscroll=Pico.vsram[plane+(cell&~1)];\r
+ vscroll=Pico.vsram[(plane_sh&1)+(cell&~1)];\r
\r
// Find the line in the name table\r
line=(vscroll+scan)&ts->line&0xffff; // ts->line is really ymask ..\r
addr=(code&0x7ff)<<4;\r
if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip\r
\r
-// pal=Pico.cram+((code>>9)&0x30);\r
- pal=((code>>9)&0x30);\r
+ pal=((code>>9)&0x30)|((plane_sh<<5)&0x40);\r
}\r
\r
if (code&0x0800) zero=TileFlip(dx,addr,pal);\r
\r
// terminate the cache list\r
*ts->hc = 0;\r
- if (oldcode == -1) rendstatus|=0x40;\r
+ if (oldcode == -1) rendstatus |= PDRAW_PLANE_HI_PRIO;\r
}\r
#endif\r
\r
// --------------------------------------------\r
\r
#ifndef _ASM_DRAW_C\r
-static void DrawLayer(int plane, int *hcache, int maxcells, int sh)\r
+static void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
const char shift[4]={5,6,5,7}; // 32,64 or 128 sized tilemaps (2 is invalid)\r
else if(width>1) ymask =0x0ff;\r
\r
// Find name table:\r
- if (plane==0) ts.nametab=(pvid->reg[2]&0x38)<< 9; // A\r
- else ts.nametab=(pvid->reg[4]&0x07)<<12; // B\r
+ if (plane_sh&1) ts.nametab=(pvid->reg[4]&0x07)<<12; // B\r
+ else ts.nametab=(pvid->reg[2]&0x38)<< 9; // A\r
\r
htab=pvid->reg[13]<<9; // Horizontal scroll table address\r
if ( pvid->reg[11]&2) htab+=Scanline<<1; // Offset by line\r
if ((pvid->reg[11]&1)==0) htab&=~0xf; // Offset by tile\r
- htab+=plane; // A or B\r
+ htab+=plane_sh&1; // A or B\r
\r
// Get horizontal scroll value, will be masked later\r
ts.hscroll=Pico.vram[htab&0x7fff];\r
\r
if((pvid->reg[12]&6) == 6) {\r
// interlace mode 2\r
- vscroll=Pico.vsram[plane]; // Get vertical scroll value\r
+ vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value\r
\r
// Find the line in the name table\r
ts.line=(vscroll+(Scanline<<1))&((ymask<<1)|1);\r
// shit, we have 2-cell column based vscroll\r
// luckily this doesn't happen too often\r
ts.line=ymask|(shift[width]<<24); // save some stuff instead of line\r
- DrawStripVSRam(&ts, plane);\r
+ DrawStripVSRam(&ts, plane_sh, cellskip);\r
} else {\r
- vscroll=Pico.vsram[plane]; // Get vertical scroll value\r
+ vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value\r
\r
// Find the line in the name table\r
ts.line=(vscroll+Scanline)&ymask;\r
ts.nametab+=(ts.line>>3)<<shift[width];\r
\r
- DrawStrip(&ts, sh);\r
+ DrawStrip(&ts, plane_sh, cellskip);\r
}\r
}\r
\r
\r
ty=(Scanline&7)<<1; // Y-Offset into tile\r
\r
- if(!(rendstatus&2)) {\r
+ if (!(rendstatus & PDRAW_WND_DIFF_PRIO)) {\r
// check the first tile code\r
code=Pico.vram[nametab+tilex];\r
// if the whole window uses same priority (what is often the case), we may be able to skip this field\r
- if((code>>15) != prio) return;\r
+ if ((code>>15) != prio) return;\r
}\r
\r
// Draw tiles across screen:\r
- for (; tilex < tend; tilex++)\r
+ if (!sh)\r
{\r
- int addr=0,zero=0;\r
- int pal;\r
+ for (; tilex < tend; tilex++)\r
+ {\r
+ int addr=0,zero=0;\r
+ int pal;\r
+\r
+ code=Pico.vram[nametab+tilex];\r
+ if (code==blank) continue;\r
+ if ((code>>15) != prio) {\r
+ rendstatus |= PDRAW_WND_DIFF_PRIO;\r
+ continue;\r
+ }\r
\r
- code=Pico.vram[nametab+tilex];\r
- if(code==blank) continue;\r
- if((code>>15) != prio) {\r
- rendstatus|=2;\r
- continue;\r
+ pal=((code>>9)&0x30);\r
+\r
+ // Get tile address/2:\r
+ addr=(code&0x7ff)<<4;\r
+ if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip\r
+\r
+ if (code&0x0800) zero=TileFlip(8+(tilex<<3),addr,pal);\r
+ else zero=TileNorm(8+(tilex<<3),addr,pal);\r
+\r
+ if (zero) blank=code; // We know this tile is blank now\r
}\r
+ }\r
+ else\r
+ {\r
+ for (; tilex < tend; tilex++)\r
+ {\r
+ int addr=0,zero=0;\r
+ int pal, tmp, *zb;\r
+\r
+ code=Pico.vram[nametab+tilex];\r
+ if(code==blank) continue;\r
+ if((code>>15) != prio) {\r
+ rendstatus |= PDRAW_WND_DIFF_PRIO;\r
+ continue;\r
+ }\r
\r
- pal=((code>>9)&0x30);\r
+ pal=((code>>9)&0x30);\r
\r
- if(sh) {\r
- int tmp, *zb = (int *)(HighCol+8+(tilex<<3));\r
+ zb = (int *)(HighCol+8+(tilex<<3));\r
if(prio) {\r
tmp = *zb;\r
if(!(tmp&0x00000080)) tmp&=~0x000000c0; if(!(tmp&0x00008000)) tmp&=~0x0000c000;\r
} else {\r
pal |= 0x40;\r
}\r
- }\r
\r
- // Get tile address/2:\r
- addr=(code&0x7ff)<<4;\r
- if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip\r
+ // Get tile address/2:\r
+ addr=(code&0x7ff)<<4;\r
+ if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip\r
\r
- if (code&0x0800) zero=TileFlip(8+(tilex<<3),addr,pal);\r
- else zero=TileNorm(8+(tilex<<3),addr,pal);\r
+ if (code&0x0800) zero=TileFlip(8+(tilex<<3),addr,pal);\r
+ else zero=TileNorm(8+(tilex<<3),addr,pal);\r
\r
- if (zero) blank=code; // We know this tile is blank now\r
+ if (zero) blank=code; // We know this tile is blank now\r
+ }\r
}\r
-\r
- // terminate the cache list\r
- //*hcache = 0;\r
}\r
\r
// --------------------------------------------\r
\r
-static void DrawTilesFromCache(int *hc, int sh)\r
+static void DrawTilesFromCacheShPrep(void)\r
+{\r
+ // as some layer has covered whole line with hi priority tiles,\r
+ // we can process whole line and then act as if sh/hi mode was off.\r
+ int c = 320/4, *zb = (int *)(HighCol+8);\r
+ rendstatus |= PDRAW_SHHI_DONE;\r
+ while (c--)\r
+ {\r
+ int tmp = *zb;\r
+ if (!(tmp & 0x80808080)) *zb=tmp&0x3f3f3f3f;\r
+ else {\r
+ if(!(tmp&0x00000080)) tmp&=~0x000000c0; if(!(tmp&0x00008000)) tmp&=~0x0000c000;\r
+ if(!(tmp&0x00800000)) tmp&=~0x00c00000; if(!(tmp&0x80000000)) tmp&=~0xc0000000;\r
+ *zb=tmp;\r
+ }\r
+ zb++;\r
+ }\r
+}\r
+\r
+static void DrawTilesFromCache(int *hc, int sh, int rlim)\r
{\r
int code, addr, dx;\r
int pal;\r
\r
// *ts->hc++ = code | (dx<<16) | (ty<<25); // cache it\r
\r
- if (sh && (rendstatus&0xc0))\r
+ if (sh && (rendstatus & (PDRAW_SHHI_DONE|PDRAW_PLANE_HI_PRIO)))\r
{\r
- if (!(rendstatus&0x80))\r
- {\r
- // as some layer has covered whole line with hi priority tiles,\r
- // we can process whole line and then act as if sh/hi mode was off.\r
- rendstatus|=0x80;\r
- int c = 320/4, *zb = (int *)(HighCol+8);\r
- while (c--)\r
- {\r
- int tmp = *zb;\r
- if (!(tmp & 0x80808080)) *zb=tmp&0x3f3f3f3f;\r
- else {\r
- if(!(tmp&0x00000080)) tmp&=~0x000000c0; if(!(tmp&0x00008000)) tmp&=~0x0000c000;\r
- if(!(tmp&0x00800000)) tmp&=~0x00c00000; if(!(tmp&0x80000000)) tmp&=~0xc0000000;\r
- *zb=tmp;\r
- }\r
- zb++;\r
- }\r
- }\r
+ if (!(rendstatus & PDRAW_SHHI_DONE))\r
+ DrawTilesFromCacheShPrep();\r
sh = 0;\r
}\r
\r
- if (sh)\r
+ if (!sh)\r
{\r
- while((code=*hc++)) {\r
- unsigned char *zb;\r
+ short blank=-1; // The tile we know is blank\r
+ while ((code=*hc++)) {\r
+ int zero;\r
+ if((short)code == blank) continue;\r
// Get tile address/2:\r
addr=(code&0x7ff)<<4;\r
addr+=(unsigned int)code>>25; // y offset into tile\r
dx=(code>>16)&0x1ff;\r
- zb = HighCol+dx;\r
- if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
- if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
- if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
- if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
\r
pal=((code>>9)&0x30);\r
+ if (rlim-dx < 0) goto last_cut_tile;\r
\r
- if (code&0x0800) TileFlip(dx,addr,pal);\r
- else TileNorm(dx,addr,pal);\r
+ if (code&0x0800) zero=TileFlip(dx,addr,pal);\r
+ else zero=TileNorm(dx,addr,pal);\r
+\r
+ if (zero) blank=(short)code;\r
}\r
}\r
else\r
{\r
- short blank=-1; // The tile we know is blank\r
- while((code=*hc++)) {\r
- int zero;\r
- if((short)code == blank) continue;\r
+ while ((code=*hc++)) {\r
+ unsigned char *zb;\r
// Get tile address/2:\r
addr=(code&0x7ff)<<4;\r
addr+=(unsigned int)code>>25; // y offset into tile\r
dx=(code>>16)&0x1ff;\r
+ zb = HighCol+dx;\r
+ if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
+ if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
+ if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
+ if(!(*zb&0x80)) *zb&=0x3f; zb++; if(!(*zb&0x80)) *zb&=0x3f; zb++;\r
\r
pal=((code>>9)&0x30);\r
+ if (rlim-dx < 0) goto last_cut_tile;\r
\r
- if (code&0x0800) zero=TileFlip(dx,addr,pal);\r
- else zero=TileNorm(dx,addr,pal);\r
+ if (code&0x0800) TileFlip(dx,addr,pal);\r
+ else TileNorm(dx,addr,pal);\r
+ }\r
+ }\r
+ return;\r
\r
- if(zero) blank=(short)code;\r
+last_cut_tile:\r
+ {\r
+ unsigned int t, pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels\r
+ unsigned char *pd = HighCol+dx;\r
+ if (!pack) return;\r
+ if (code&0x0800)\r
+ {\r
+ switch (rlim-dx+8)\r
+ {\r
+ case 7: t=pack&0x00000f00; if (t) pd[6]=(unsigned char)(pal|(t>> 8)); // "break" is left out intentionally\r
+ case 6: t=pack&0x000000f0; if (t) pd[5]=(unsigned char)(pal|(t>> 4));\r
+ case 5: t=pack&0x0000000f; if (t) pd[4]=(unsigned char)(pal|(t ));\r
+ case 4: t=pack&0xf0000000; if (t) pd[3]=(unsigned char)(pal|(t>>28));\r
+ case 3: t=pack&0x0f000000; if (t) pd[2]=(unsigned char)(pal|(t>>24));\r
+ case 2: t=pack&0x00f00000; if (t) pd[1]=(unsigned char)(pal|(t>>20));\r
+ case 1: t=pack&0x000f0000; if (t) pd[0]=(unsigned char)(pal|(t>>16));\r
+ default: break;\r
+ }\r
+ }\r
+ else\r
+ {\r
+ switch (rlim-dx+8)\r
+ {\r
+ case 7: t=pack&0x00f00000; if (t) pd[6]=(unsigned char)(pal|(t>>20));\r
+ case 6: t=pack&0x0f000000; if (t) pd[5]=(unsigned char)(pal|(t>>24));\r
+ case 5: t=pack&0xf0000000; if (t) pd[4]=(unsigned char)(pal|(t>>28));\r
+ case 4: t=pack&0x0000000f; if (t) pd[3]=(unsigned char)(pal|(t ));\r
+ case 3: t=pack&0x000000f0; if (t) pd[2]=(unsigned char)(pal|(t>> 4));\r
+ case 2: t=pack&0x00000f00; if (t) pd[1]=(unsigned char)(pal|(t>> 8));\r
+ case 1: t=pack&0x0000f000; if (t) pd[0]=(unsigned char)(pal|(t>>12));\r
+ default: break;\r
+ }\r
}\r
}\r
}\r
hv = (code>>24)&0xf;\r
height = (hv&3)+1;\r
\r
- if(sy > 240 || sy + (height<<3) <= 0) skip|=1<<22;\r
+ if (sy > 240 || sy + (height<<3) <= 0) skip|=1<<22; // sprite offscreen (completely, y)\r
\r
width = (hv>>2)+1;\r
code2 = sprite[1];\r
sx -= 0x78; // Get X coordinate + 8\r
sx_min = 8-(width<<3);\r
\r
- if((sx <= sx_min && sx >= -0x76) || sx >= 328) skip|=1<<23;\r
+ if ((sx <= sx_min && sx >= -0x76) || sx >= 328) skip|=1<<23; // offscreen x\r
else if (sx > sx_min && !skip) {\r
int sbl = (2<<height)-1;\r
int shi = sy>>3;\r
static void DrawAllSprites(int *hcache, int maxwidth, int prio, int sh)\r
{\r
int i,u,n;\r
- int sx1seen=0; // sprite with x coord 1 or 0 seen\r
+ int sx1seen = 0; // sprite with x coord 1 or 0 seen\r
int ntiles = 0; // tile counter for sprite limit emulation\r
int *sprites[40]; // Sprites to draw in fast mode\r
- int *ps, pack, rs = rendstatus, scan=Scanline;\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&0x11) {\r
+ if (rs & (PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES)) {\r
//dprintf("PrepareSprites(%i) [%i]", (rs>>4)&1, scan);\r
- PrepareSprites(rs&0x10);\r
- rendstatus=rs&~0x11;\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&4)||sh)&&prio==0)\r
+ if (((rs&PDRAW_ACC_SPRITES)||sh) && prio==0)\r
memset(HighSprZ, 0, 328);\r
- if(!(rs&4)&&prio) {\r
+ if (!(rs&PDRAW_ACC_SPRITES)&&prio) {\r
if(hcache[0]) DrawSpritesFromCache(hcache, sh);\r
return;\r
}\r
\r
+ if (PicoOpt & POPT_DIS_SPRITE_LIM)\r
+ max_line_sprites = 80;\r
+\r
ps = HighPreSpr;\r
\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
- for(i=u=n=0; (pack = *ps) && n < 20; ps+=2, u++)\r
+ for (i=u=n=0; (pack = *ps) && n < max_line_sprites; ps+=2, u++)\r
{\r
int sx, sy, row, pack2;\r
\r
- if(pack & 0x00400000) continue;\r
+ if (pack & 0x00400000) continue;\r
\r
// get sprite info\r
pack2 = *(ps+1);\r
sy = (pack <<16)>>16;\r
row = scan-sy;\r
\r
- //dprintf("x: %i y: %i %ix%i", sx, sy, (pack>>28)<<3, (pack>>21)&0x38);\r
+ // elprintf(EL_ANOMALY, "x: %4i y: %4i p %i %ix%i", sx, sy, (pack2>>15)&1, (pack>>28)<<3, (pack>>21)&0x38);\r
\r
- if(sx == -0x77) sx1seen|=1; // for masking mode 2\r
+ if (sx == -0x77) sx1seen|=1; // for masking mode 2\r
\r
// check if it is on this line\r
- if(row < 0 || row >= ((pack>>21)&0x38)) continue; // no\r
- n++; // number of sprites on this line (both visible and hidden, max is 20) [broken]\r
-\r
- // sprite limit\r
- ntiles += pack>>28;\r
- if(ntiles > 40) break;\r
-\r
- if(pack & 0x00800000) continue;\r
+ if (row < 0 || row >= ((pack>>21)&0x38)) continue; // no\r
\r
// masking sprite?\r
- if(sx == -0x78) {\r
- if(!(sx1seen&1) || sx1seen==3) {\r
- break; // this sprite is not drawn and remaining sprites are masked\r
- }\r
- if((sx1seen>>8) == 0) sx1seen=(i+1)<<8;\r
- continue;\r
- }\r
- else if(sx == -0x77) {\r
- // masking mode2 (Outrun, Galaxy Force II, Shadow of the beast)\r
- if(sx1seen>>8) { i=(sx1seen>>8)-1; break; } // seen both 0 and 1\r
- sx1seen |= 2;\r
+ if (sx == -0x78) {\r
+ if (n > 0) break; // masked\r
continue;\r
}\r
\r
+ n++; // number of sprites on this line (both visible and hidden, except of x=0)\r
+\r
+ // sprite limit\r
+ ntiles += pack>>28;\r
+ if (ntiles > max_line_sprites*2) break;\r
+\r
+ if (pack & 0x00800000) continue;\r
+\r
// accurate sprites\r
//dprintf("P:%i",((sx>>15)&1));\r
- if(rs&4) {\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),(char)(0x1f-n));\r
+ if ((pack2&0x8000) ^ (prio<<15)) continue;\r
+ DrawSpriteZ(pack, pack2, sh|(prio<<1), n^0xff);\r
continue;\r
}\r
\r
}\r
\r
// Go through sprites backwards:\r
- if(!(rs&4)) {\r
+ if (!(rs & PDRAW_ACC_SPRITES)) {\r
for (i--; i>=0; i--)\r
DrawSprite(sprites[i],&hcache,sh);\r
\r
#ifndef _ASM_DRAW_C\r
static void BackFill(int reg7, int sh)\r
{\r
- unsigned int back=0;\r
- unsigned int *pd=NULL,*end=NULL;\r
+ unsigned int back;\r
\r
// Start with a blank scanline (background colour):\r
back=reg7&0x3f;\r
back|=back<<8;\r
back|=back<<16;\r
\r
- pd= (unsigned int *)(HighCol+8);\r
- end=(unsigned int *)(HighCol+8+320);\r
-\r
- do { pd[0]=pd[1]=pd[2]=pd[3]=back; pd+=4; } while (pd<end);\r
+ memset32((int *)(HighCol+8), back, 320/4);\r
}\r
#endif\r
\r
if (Pico.video.reg[12]&1) {\r
len = 320;\r
} else {\r
- if(!(PicoOpt&0x100)) pd+=32;\r
+ if(!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32;\r
len = 256;\r
}\r
\r
unsigned short *pal=HighPal;\r
int len, i, t, dirtyPal = Pico.m.dirtyPal;\r
\r
- if(dirtyPal) {\r
- unsigned short *ppal=Pico.cram;\r
- for(i = 0x3f; i >= 0; i--)\r
- pal[i] = (unsigned short) (((ppal[i]&0x00f)<<12)|((ppal[i]&0x0f0)<<3)|((ppal[i]&0xf00)>>7));\r
+ if (dirtyPal)\r
+ {\r
+ unsigned int *spal=(void *)Pico.cram;\r
+ unsigned int *dpal=(void *)HighPal;\r
+ for (i = 0x3f/2; i >= 0; i--)\r
+#ifdef USE_BGR555\r
+ dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);\r
+#else\r
+ dpal[i] = ((spal[i]&0x000f000f)<<12)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)>>7);\r
+#endif\r
Pico.m.dirtyPal = 0;\r
}\r
\r
- if (Pico.video.reg[12]&1) {\r
- len = 320;\r
- } else {\r
- if(!(PicoOpt&0x100)) pd+=32;\r
- len = 256;\r
- }\r
-\r
- if(sh) {\r
- if(dirtyPal) {\r
+ if (sh)\r
+ {\r
+ if (dirtyPal) {\r
// shadowed pixels\r
- for(i = 0x3f; i >= 0; i--)\r
+ for (i = 0x3f; i >= 0; i--)\r
pal[0x40|i] = pal[0xc0|i] = (unsigned short)((pal[i]>>1)&0x738e);\r
// hilighted pixels\r
- for(i = 0x3f; i >= 0; i--) {\r
+ for (i = 0x3f; i >= 0; i--) {\r
t=pal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c;\r
pal[0x80|i]=(unsigned short)t;\r
}\r
}\r
}\r
\r
- for(i = 0; i < len; i++)\r
+ if (Pico.video.reg[12]&1) {\r
+ len = 320;\r
+ } else {\r
+ if (!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32;\r
+ len = 256;\r
+ }\r
+\r
+#ifndef PSP\r
+ for (i = 0; i < len; i++)\r
pd[i] = pal[ps[i]];\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
+#endif\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 && Pico.m.dirtyPal == 1 && Scanline < 222)\r
+ {\r
// a hack for mid-frame palette changes\r
- if (!(rs & 0x20))\r
+ if (!(rs & PDRAW_SONIC_MODE))\r
dirty_count = 1;\r
else dirty_count++;\r
- rs |= 0x20;\r
+ rs |= PDRAW_SONIC_MODE;\r
rendstatus = rs;\r
if (dirty_count == 3) {\r
blockcpy(HighPal, Pico.cram, 0x40*2);\r
if (Pico.video.reg[12]&1) {\r
len = 320;\r
} else {\r
- if(!(PicoOpt&0x100)) pd+=32;\r
+ if (!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32;\r
len = 256;\r
}\r
\r
- if (!sh && rs & 0x20) {\r
+ if (!sh && (rs & PDRAW_SONIC_MODE)) {\r
if (dirty_count >= 11) {\r
blockcpy_or(pd, HighCol+8, len, 0x80);\r
} else {\r
}\r
}\r
\r
-void (*FinalizeLine)(int sh) = FinalizeLineBGR444;\r
+static void (*FinalizeLine)(int sh) = FinalizeLineBGR444;\r
+\r
+// hblank was enabled early during prev line processng -\r
+// it should have been blanked\r
+static void handle_early_blank(int scanline, int sh)\r
+{\r
+ scanline--;\r
+\r
+ if (PicoScanBegin != NULL)\r
+ PicoScanBegin(scanline);\r
+\r
+ BackFill(Pico.video.reg[7], sh);\r
+\r
+ if (FinalizeLine != NULL)\r
+ FinalizeLine(sh);\r
+\r
+ if (PicoScanEnd != NULL)\r
+ PicoScanEnd(scanline);\r
+}\r
\r
// --------------------------------------------\r
\r
int win=0,edge=0,hvwind=0;\r
int maxw, maxcells;\r
\r
- rendstatus&=~0xc0;\r
+ rendstatus &= ~(PDRAW_SHHI_DONE|PDRAW_PLANE_HI_PRIO);\r
\r
if(pvid->reg[12]&1) {\r
maxw = 328; maxcells = 40;\r
if (win&0x80) { if (Scanline>=edge) hvwind=1; }\r
else { if (Scanline< edge) hvwind=1; }\r
\r
- if(!hvwind) { // we might have a vertical window here\r
+ if (!hvwind) { // we might have a vertical window here\r
win=pvid->reg[0x11];\r
edge=win&0x1f;\r
- if(win&0x80) {\r
- if(!edge) hvwind=1;\r
+ if (win&0x80) {\r
+ if (!edge) hvwind=1;\r
else if(edge < (maxcells>>1)) hvwind=2;\r
} else {\r
- if(!edge);\r
+ if (!edge);\r
else if(edge < (maxcells>>1)) hvwind=2;\r
else hvwind=1;\r
}\r
}\r
\r
- DrawLayer(1, HighCacheB, maxcells, sh);\r
- if(hvwind == 1)\r
- DrawWindow(0, maxcells>>1, 0, sh); // HighCacheAW\r
- else if(hvwind == 2) {\r
+ DrawLayer(1|(sh<<1), HighCacheB, 0, maxcells);\r
+ if (hvwind == 1)\r
+ DrawWindow(0, maxcells>>1, 0, sh);\r
+ else if (hvwind == 2) {\r
// ahh, we have vertical window\r
- DrawLayer(0, HighCacheA, (win&0x80) ? edge<<1 : maxcells, sh);\r
- DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 0, sh); // HighCacheW\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
} else\r
- DrawLayer(0, HighCacheA, maxcells, sh);\r
+ DrawLayer(0|(sh<<1), HighCacheA, 0, maxcells);\r
DrawAllSprites(HighCacheS, maxw, 0, sh);\r
\r
- if(HighCacheB[0]) DrawTilesFromCache(HighCacheB, sh);\r
- if(hvwind == 1)\r
+ if (HighCacheB[0]) DrawTilesFromCache(HighCacheB, sh, 328);\r
+ if (hvwind == 1)\r
DrawWindow(0, maxcells>>1, 1, sh);\r
- else if(hvwind == 2) {\r
- if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh);\r
+ else if (hvwind == 2) {\r
+ if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, (win&0x80) ? edge<<4 : 328);\r
DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 1, sh);\r
} else\r
- if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh);\r
+ if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, 328);\r
DrawAllSprites(HighCacheS, maxw, 1, sh);\r
\r
#if 0\r
}\r
\r
\r
-static int Skip=0;\r
-\r
PICO_INTERNAL void PicoFrameStart(void)\r
{\r
// prepare to do this frame\r
- rendstatus = (PicoOpt&0x80)>>5; // accurate sprites\r
- if(rendstatus)\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 |= 8; // interlace mode\r
- if(Pico.m.dirtyPal) Pico.m.dirtyPal = 2; // reset dirty if needed\r
+ if ((Pico.video.reg[12]&6) == 6) rendstatus |= PDRAW_INTERLACE; // interlace mode\r
+ if (Pico.m.dirtyPal) Pico.m.dirtyPal = 2; // reset dirty if needed\r
\r
PrepareSprites(1);\r
- Skip=0;\r
+ skip_next_line=0;\r
}\r
\r
PICO_INTERNAL int PicoLine(int scan)\r
{\r
int sh;\r
- if (Skip>0) { Skip--; return 0; } // Skip rendering lines\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
\r
+ if (rendstatus & PDRAW_EARLY_BLANK) {\r
+ if (scan > 0) handle_early_blank(scan, sh);\r
+ rendstatus &= ~PDRAW_EARLY_BLANK;\r
+ }\r
+\r
+ if (PicoScanBegin != NULL)\r
+ skip_next_line = PicoScanBegin(scan);\r
+\r
// Draw screen:\r
BackFill(Pico.video.reg[7], sh);\r
if (Pico.video.reg[1]&0x40)\r
DrawDisplay(sh);\r
\r
- FinalizeLine(sh);\r
- //if (SpriteBlocks & (1<<(scan>>3))) for (sh=0; sh < 30; sh++) DrawLineDest[sh] = 0xf;\r
+ if (FinalizeLine != NULL)\r
+ FinalizeLine(sh);\r
\r
- Skip=PicoScan(Scanline,DrawLineDest);\r
+ if (PicoScanEnd != NULL)\r
+ PicoScanEnd(scan);\r
\r
return 0;\r
}\r
\r
void PicoDrawSetColorFormat(int which)\r
{\r
- if (which == 2)\r
- FinalizeLine = FinalizeLine8bit;\r
- else if (which == 1)\r
- FinalizeLine = FinalizeLineRGB555;\r
- else FinalizeLine = FinalizeLineBGR444;\r
+ switch (which)\r
+ {\r
+ case 2: FinalizeLine = FinalizeLine8bit; break;\r
+ case 1: FinalizeLine = FinalizeLineRGB555; break;\r
+ case 0: FinalizeLine = FinalizeLineBGR444; break;\r
+ default:FinalizeLine = NULL; break;\r
+ }\r
+#if OVERRIDE_HIGHCOL\r
+ if (which) HighCol=DefHighCol;\r
+#endif\r
}\r
+\r