\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
\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, all window tiles don't use same priority, accurate sprites (copied from PicoOpt), interlace\r
-// dirty sprites, sonic mode\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 int SpriteBlocks;\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_or(void *dst, void *src, size_t n, int pat);\r
#endif\r
\r
\r
+#ifdef _ASM_DRAW_C_MIPS\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
\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
\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
}\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
}\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
// --------------------------------------------\r
\r
-static void DrawTilesFromCache(int *hc, int sh)\r
+static void DrawTilesFromCache(int *hc, int sh, int rlim)\r
{\r
- int code, addr, zero, dx;\r
+ int code, addr, dx;\r
int pal;\r
- short blank=-1; // The tile we know is blank\r
\r
// *ts->hc++ = code | (dx<<16) | (ty<<25); // cache it\r
\r
- while((code=*hc++)) {\r
- if(!sh && (short)code == blank) continue;\r
+ if (sh && (rendstatus&0xc0))\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
+ sh = 0;\r
+ }\r
\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
- if(sh) {\r
- unsigned char *zb = HighCol+dx;\r
+ if (sh)\r
+ {\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) TileFlip(dx,addr,pal);\r
+ else TileNorm(dx,addr,pal);\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
+ // 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
\r
- pal=((code>>9)&0x30);\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) zero=TileFlip(dx,addr,pal);\r
+ else zero=TileNorm(dx,addr,pal);\r
+\r
+ if (zero) blank=(short)code;\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
\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&0x100)) 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
}\r
}\r
\r
-void (*FinalizeLine)(int sh) = FinalizeLineBGR444;\r
+static void (*FinalizeLine)(int sh) = FinalizeLineBGR444;\r
\r
// --------------------------------------------\r
\r
int win=0,edge=0,hvwind=0;\r
int maxw, maxcells;\r
\r
+ rendstatus&=~0xc0;\r
+\r
if(pvid->reg[12]&1) {\r
maxw = 328; maxcells = 40;\r
} else {\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
+ int *c, a, b;\r
+ for (a = 0, c = HighCacheA; *c; c++, a++);\r
+ for (b = 0, c = HighCacheB; *c; c++, b++);\r
+ printf("%i:%03i: a=%i, b=%i\n", Pico.m.frame_count, Scanline, a, b);\r
+ }\r
+#endif\r
+\r
return 0;\r
}\r
\r
\r
static int Skip=0;\r
\r
-void PicoFrameStart()\r
+PICO_INTERNAL void PicoFrameStart(void)\r
{\r
// prepare to do this frame\r
rendstatus = (PicoOpt&0x80)>>5; // accurate sprites\r
Skip=0;\r
}\r
\r
-int PicoLine(int scan)\r
+PICO_INTERNAL int PicoLine(int scan)\r
{\r
int sh;\r
if (Skip>0) { Skip--; return 0; } // Skip rendering lines\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
\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