-// This is part of Pico Library\r
-\r
-// (c) Copyright 2004 Dave, 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
+ * line renderer\r
+ * (c) Copyright Dave, 2004\r
+ * (C) notaz, 2006-2010\r
+ *\r
+ * This work is licensed under the terms of MAME license.\r
+ * See COPYING file in the top-level directory.\r
+ */\r
/*\r
* The renderer has 4 modes now:\r
* - normal\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
+ * since renderer always draws line in 8bit mode, there are 2 spare bits:\r
+ * b \ mode: s/h as sonic\r
+ * 00 normal - pal index\r
+ * 01 shadow - pal index\r
+ * 10 hilight+op spr spr pal index\r
+ * 11 shadow +op spr - pal index\r
+ *\r
* not handled properly:\r
* - hilight op on shadow tile\r
* - AS + s/h (s/h sprite flag interferes with and cleared by AS code)\r
int (*PicoScanBegin)(unsigned int num) = NULL;\r
int (*PicoScanEnd) (unsigned int num) = NULL;\r
\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
+unsigned char *HighCol = DefHighCol;\r
+static unsigned char *HighColBase = DefHighCol;\r
+static int HighColIncrement;\r
+\r
+static unsigned int DefOutBuff[320*2/2];\r
+void *DrawLineDestBase = DefOutBuff;\r
+int DrawLineDestIncrement;\r
\r
static int HighCacheA[41+1]; // caches for high layers\r
static int HighCacheB[41+1];\r
-int HighPreSpr[80*2+1]; // slightly preprocessed sprites\r
+static int HighPreSpr[80*2+1]; // slightly preprocessed sprites\r
\r
#define SPRL_HAVE_HI 0x80 // have hi priority sprites\r
#define SPRL_HAVE_LO 0x40 // *lo*\r
#define SPRL_LO_ABOVE_HI 0x10 // low priority sprites may be on top of hi\r
unsigned char HighLnSpr[240][3 + MAX_LINE_SPRITES]; // sprite_count, ^flags, tile_count, [spritep]...\r
\r
-int rendstatus = 0;\r
-int DrawScanline = 0;\r
+int rendstatus_old;\r
+int rendlines;\r
int PicoDrawMask = -1;\r
\r
static int skip_next_line=0;\r
\r
// stuff available in asm:\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 DrawAllSprites(unsigned char *sprited, int prio, int sh);\r
-void DrawTilesFromCache(int *hc, int sh, int rlim);\r
-void DrawSpritesSHi(unsigned char *sprited);\r
-void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells);\r
-void FinalizeLineBGR444(int sh);\r
-void FinalizeLineRGB555(int sh);\r
+void DrawWindow(int tstart, int tend, int prio, int sh,\r
+ struct PicoEState *est);\r
+void DrawAllSprites(unsigned char *sprited, int prio, int sh,\r
+ struct PicoEState *est);\r
+void DrawTilesFromCache(int *hc, int sh, int rlim,\r
+ struct PicoEState *est);\r
+void DrawSpritesSHi(unsigned char *sprited, struct PicoEState *est);\r
+void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells,\r
+ struct PicoEState *est);\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
#define TileNormMaker(funcname,pix_func) \\r
static int funcname(int sx,int addr,int pal) \\r
{ \\r
- unsigned char *pd = HighCol+sx; \\r
+ unsigned char *pd = Pico.est.HighCol+sx; \\r
unsigned int pack=0; unsigned int t=0; \\r
\\r
pack=*(unsigned int *)(Pico.vram+addr); /* Get 8 pixels */ \\r
#define TileFlipMaker(funcname,pix_func) \\r
static int funcname(int sx,int addr,int pal) \\r
{ \\r
- unsigned char *pd = HighCol+sx; \\r
+ unsigned char *pd = Pico.est.HighCol+sx; \\r
unsigned int pack=0; unsigned int t=0; \\r
\\r
pack=*(unsigned int *)(Pico.vram+addr); /* Get 8 pixels */ \\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 |= PDRAW_PLANE_HI_PRIO;\r
+ if (oldcode == -1) Pico.est.rendstatus |= PDRAW_PLANE_HI_PRIO;\r
}\r
\r
// this is messy\r
{\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=DrawScanline;\r
+ int pal=0,scan=Pico.est.DrawScanline;\r
\r
// Draw tiles across screen:\r
tilex=(-ts->hscroll)>>3;\r
\r
// terminate the cache list\r
*ts->hc = 0;\r
- if (oldcode == -1) rendstatus |= PDRAW_PLANE_HI_PRIO;\r
+ if (oldcode == -1) Pico.est.rendstatus |= PDRAW_PLANE_HI_PRIO;\r
}\r
#endif\r
\r
// --------------------------------------------\r
\r
#ifndef _ASM_DRAW_C\r
-static void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells)\r
+static void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells,\r
+ struct PicoEState *est)\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 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+=DrawScanline<<1; // Offset by line\r
+ if ( pvid->reg[11]&2) htab+=est->DrawScanline<<1; // Offset by line\r
if ((pvid->reg[11]&1)==0) htab&=~0xf; // Offset by tile\r
htab+=plane_sh&1; // A or B\r
\r
vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value\r
\r
// Find the line in the name table\r
- ts.line=(vscroll+(DrawScanline<<1))&((ymask<<1)|1);\r
+ ts.line=(vscroll+(est->DrawScanline<<1))&((ymask<<1)|1);\r
ts.nametab+=(ts.line>>4)<<shift[width];\r
\r
DrawStripInterlace(&ts);\r
vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value\r
\r
// Find the line in the name table\r
- ts.line=(vscroll+DrawScanline)&ymask;\r
+ ts.line=(vscroll+est->DrawScanline)&ymask;\r
ts.nametab+=(ts.line>>3)<<shift[width];\r
\r
DrawStrip(&ts, plane_sh, cellskip);\r
// --------------------------------------------\r
\r
// tstart & tend are tile pair numbers\r
-static void DrawWindow(int tstart, int tend, int prio, int sh) // int *hcache\r
+static void DrawWindow(int tstart, int tend, int prio, int sh,\r
+ struct PicoEState *est)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
int tilex,ty,nametab,code=0;\r
if (pvid->reg[12]&1)\r
{\r
nametab=(pvid->reg[3]&0x3c)<<9; // 40-cell mode\r
- nametab+=(DrawScanline>>3)<<6;\r
+ nametab+=(est->DrawScanline>>3)<<6;\r
}\r
else\r
{\r
nametab=(pvid->reg[3]&0x3e)<<9; // 32-cell mode\r
- nametab+=(DrawScanline>>3)<<5;\r
+ nametab+=(est->DrawScanline>>3)<<5;\r
}\r
\r
tilex=tstart<<1;\r
\r
- if (!(rendstatus & PDRAW_WND_DIFF_PRIO)) {\r
+ if (!(est->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
}\r
\r
tend<<=1;\r
- ty=(DrawScanline&7)<<1; // Y-Offset into tile\r
+ ty=(est->DrawScanline&7)<<1; // Y-Offset into tile\r
\r
// Draw tiles across screen:\r
if (!sh)\r
code=Pico.vram[nametab+tilex];\r
if (code==blank) continue;\r
if ((code>>15) != prio) {\r
- rendstatus |= PDRAW_WND_DIFF_PRIO;\r
+ est->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 |= PDRAW_WND_DIFF_PRIO;\r
+ est->rendstatus |= PDRAW_WND_DIFF_PRIO;\r
continue;\r
}\r
\r
pal=((code>>9)&0x30);\r
\r
if (prio) {\r
- int *zb = (int *)(HighCol+8+(tilex<<3));\r
- *zb++ &= 0x3f3f3f3f;\r
- *zb &= 0x3f3f3f3f;\r
+ int *zb = (int *)(est->HighCol+8+(tilex<<3));\r
+ *zb++ &= 0xbfbfbfbf;\r
+ *zb &= 0xbfbfbfbf;\r
} else {\r
pal |= 0x40;\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
// but leave lo pri op sprite markers alone\r
- int c = 320/4, *zb = (int *)(HighCol+8);\r
- rendstatus |= PDRAW_SHHI_DONE;\r
+ int c = 320/4, *zb = (int *)(Pico.est.HighCol+8);\r
+ Pico.est.rendstatus |= PDRAW_SHHI_DONE;\r
while (c--)\r
{\r
*zb++ &= 0xbfbfbfbf;\r
}\r
}\r
\r
-static void DrawTilesFromCache(int *hc, int sh, int rlim)\r
+static void DrawTilesFromCache(int *hc, int sh, int rlim, struct PicoEState *est)\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 & (PDRAW_SHHI_DONE|PDRAW_PLANE_HI_PRIO)))\r
+ if (sh && (est->rendstatus & (PDRAW_SHHI_DONE|PDRAW_PLANE_HI_PRIO)))\r
{\r
- if (!(rendstatus & PDRAW_SHHI_DONE))\r
+ if (!(est->rendstatus & PDRAW_SHHI_DONE))\r
DrawTilesFromCacheShPrep();\r
sh = 0;\r
}\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
+ zb = est->HighCol+dx;\r
*zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf;\r
*zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf;\r
\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
+ unsigned char *pd = est->HighCol+dx;\r
if (!pack) return;\r
if (code&0x0800)\r
{\r
height=(sy>>24)&7; // Width and height in tiles\r
sy=(sy<<16)>>16; // Y\r
\r
- row=DrawScanline-sy; // Row of the sprite we are on\r
+ row=Pico.est.DrawScanline-sy; // Row of the sprite we are on\r
\r
if (code&0x1000) row=(height<<3)-1-row; // Flip Y\r
\r
width=(height>>2)&3; height&=3;\r
width++; height++; // Width and height in tiles\r
\r
- row=(DrawScanline<<1)-sy; // Row of the sprite we are on\r
+ row=(Pico.est.DrawScanline<<1)-sy; // Row of the sprite we are on\r
\r
code=sprite[1];\r
sx=((code>>16)&0x1ff)-0x78; // X\r
static void DrawAllSpritesInterlace(int pri, int sh)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
- int i,u,table,link=0,sline=DrawScanline<<1;\r
+ int i,u,table,link=0,sline=Pico.est.DrawScanline<<1;\r
unsigned int *sprites[80]; // Sprite index\r
\r
table=pvid->reg[5]&0x7f;\r
* Index + 0 : hhhhvvvv ----hhvv yyyyyyyy yyyyyyyy // v, h: vert./horiz. size\r
* Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8\r
*/\r
-static void DrawSpritesSHi(unsigned char *sprited)\r
+static void DrawSpritesSHi(unsigned char *sprited, const struct PicoEState *est)\r
{\r
int (*fTileFunc)(int sx,int addr,int pal);\r
unsigned char *p;\r
int offs, delta, width, height, row;\r
\r
offs = (p[cnt] & 0x7f) * 2;\r
- sprite = HighPreSpr + offs;\r
+ sprite = est->HighPreSpr + offs;\r
code = sprite[1];\r
pal = (code>>9)&0x30;\r
\r
height=(sy>>24)&7; // Width and height in tiles\r
sy=(sy<<16)>>16; // Y\r
\r
- row=DrawScanline-sy; // Row of the sprite we are on\r
+ row=est->DrawScanline-sy; // Row of the sprite we are on\r
\r
if (code&0x1000) row=(height<<3)-1-row; // Flip Y\r
\r
cnt = sprited[0] & 0x7f;\r
if (cnt == 0) return;\r
\r
- rendstatus |= PDRAW_SPR_LO_ON_HI;\r
+ Pico.est.rendstatus |= PDRAW_SPR_LO_ON_HI;\r
\r
p = &sprited[3];\r
\r
height=(sy>>24)&7; // Width and height in tiles\r
sy=(sy<<16)>>16; // Y\r
\r
- row=DrawScanline-sy; // Row of the sprite we are on\r
+ row=Pico.est.DrawScanline-sy; // Row of the sprite we are on\r
\r
if (code&0x1000) row=(height<<3)-1-row; // Flip Y\r
\r
\r
/* nasty 1: remove 'sprite' flags */\r
{\r
- int c = 320/4, *zb = (int *)(HighCol+8);\r
+ int c = 320/4/4, *zb = (int *)(Pico.est.HighCol+8);\r
while (c--)\r
{\r
- *zb++ &= 0x7f7f7f7f;\r
+ *zb++ &= 0x7f7f7f7f; *zb++ &= 0x7f7f7f7f;\r
+ *zb++ &= 0x7f7f7f7f; *zb++ &= 0x7f7f7f7f;\r
}\r
}\r
\r
/* nasty 2: sh operator pass */\r
sprited[0] = sh_cnt;\r
- DrawSpritesSHi(sprited);\r
+ DrawSpritesSHi(sprited, &Pico.est);\r
}\r
\r
\r
\r
void PrepareSprites(int full)\r
{\r
- struct PicoVideo *pvid=&Pico.video;\r
+ const struct PicoVideo *pvid=&Pico.video;\r
+ const struct PicoEState *est=&Pico.est;\r
int u,link=0,sh;\r
int table=0;\r
int *pd = HighPreSpr;\r
sy = (pack << 16) >> 16;\r
height = (pack >> 24) & 0xf;\r
\r
- if (sy < max_lines && sy + (height<<3) > DrawScanline && // sprite onscreen (y)?\r
+ if (sy < max_lines &&\r
+ sy + (height<<3) > est->DrawScanline && // sprite onscreen (y)?\r
(sx > -24 || sx < max_width)) // onscreen x\r
{\r
- int y = (sy >= DrawScanline) ? sy : DrawScanline;\r
+ int y = (sy >= est->DrawScanline) ? sy : est->DrawScanline;\r
int entry = ((pd - HighPreSpr) / 2) | ((code2>>8)&0x80);\r
for (; y < sy + (height<<3) && y < max_lines; y++)\r
{\r
sx = (code2>>16)&0x1ff;\r
sx -= 0x78; // Get X coordinate + 8\r
\r
- if (sy < max_lines && sy + (height<<3) > DrawScanline) // sprite onscreen (y)?\r
+ if (sy < max_lines && sy + (height<<3) > est->DrawScanline) // sprite onscreen (y)?\r
{\r
int entry, y, sx_min, onscr_x, maybe_op = 0;\r
\r
maybe_op = SPRL_MAY_HAVE_OP;\r
\r
entry = ((pd - HighPreSpr) / 2) | ((code2>>8)&0x80);\r
- y = (sy >= DrawScanline) ? sy : DrawScanline;\r
+ y = (sy >= est->DrawScanline) ? sy : est->DrawScanline;\r
for (; y < sy + (height<<3) && y < max_lines; y++)\r
{\r
unsigned char *p = &HighLnSpr[y][0];\r
}\r
\r
#ifndef _ASM_DRAW_C\r
-static void DrawAllSprites(unsigned char *sprited, int prio, int sh)\r
+static void DrawAllSprites(unsigned char *sprited, int prio, int sh,\r
+ struct PicoEState *est)\r
{\r
- int rs = rendstatus;\r
+ int rs = est->rendstatus;\r
unsigned char *p;\r
int cnt;\r
\r
if (rs & (PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES)) {\r
//elprintf(EL_STATUS, "PrepareSprites(%i)", (rs>>4)&1);\r
PrepareSprites(rs & PDRAW_DIRTY_SPRITES);\r
- rendstatus = rs & ~(PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES);\r
+ est->rendstatus = rs & ~(PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES);\r
}\r
\r
cnt = sprited[0] & 0x7f;\r
\r
// --------------------------------------------\r
\r
-static void BackFill(int reg7, int sh)\r
+void BackFill(int reg7, int sh, struct PicoEState *est)\r
{\r
unsigned int back;\r
\r
back|=back<<8;\r
back|=back<<16;\r
\r
- memset32((int *)(HighCol+8), back, 320/4);\r
+ memset32((int *)(est->HighCol+8), back, 320/4);\r
}\r
#endif\r
\r
// --------------------------------------------\r
\r
-unsigned short HighPal[0x100];\r
-\r
#ifndef _ASM_DRAW_C\r
-void PicoDoHighPal555(int sh)\r
+void PicoDoHighPal555(int sh, int line, struct PicoEState *est)\r
{\r
- unsigned short *pal=HighPal;\r
- int i, t;\r
+ unsigned int *spal, *dpal;\r
+ unsigned int t, i;\r
\r
Pico.m.dirtyPal = 0;\r
\r
- {\r
- unsigned int *spal=(void *)Pico.cram;\r
- unsigned int *dpal=(void *)HighPal;\r
- for (i = 0x3f/2; i >= 0; i--)\r
+ spal = (void *)Pico.cram;\r
+ dpal = (void *)est->HighPal;\r
+\r
+ for (i = 0; i < 0x40 / 2; i++) {\r
+ t = spal[i];\r
#ifdef USE_BGR555\r
- dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);\r
+ t = ((t & 0x000e000e)<< 1) | ((t & 0x00e000e0)<<3) | ((t & 0x0e000e00)<<4);\r
#else\r
- dpal[i] = ((spal[i]&0x000f000f)<<12)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)>>7);\r
+ t = ((t & 0x000e000e)<<12) | ((t & 0x00e000e0)<<3) | ((t & 0x0e000e00)>>7);\r
#endif\r
+ // treat it like it was 4-bit per channel, since in s/h mode it somewhat is that.\r
+ // otherwise intensity difference between this and s/h will be wrong\r
+ t |= (t >> 4) & 0x08610861; // 0x18e318e3\r
+ dpal[i] = t;\r
}\r
\r
+ // norm: xxx0, sh: 0xxx, hi: 0xxx + 7\r
if (sh)\r
{\r
// shadowed pixels\r
- for (i = 0x3f; i >= 0; i--)\r
- pal[0x40|i] = pal[0xc0|i] = (unsigned short)((pal[i]>>1)&0x738e);\r
+ for (i = 0; i < 0x40 / 2; i++)\r
+ dpal[0x40/2 | i] = dpal[0xc0/2 | i] = (dpal[i] >> 1) & 0x738e738e;\r
// hilighted pixels\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
+ for (i = 0; i < 0x40 / 2; i++) {\r
+ t = ((dpal[i] >> 1) & 0x738e738e) + 0x738e738e; // 0x7bef7bef;\r
+ t |= (t >> 4) & 0x08610861;\r
+ dpal[0x80/2 | i] = t;\r
}\r
}\r
}\r
\r
-static void FinalizeLineBGR444(int sh)\r
+void FinalizeLine555(int sh, int line, struct PicoEState *est)\r
{\r
- unsigned short *pd=DrawLineDest;\r
- unsigned char *ps=HighCol+8;\r
- unsigned short *pal=Pico.cram;\r
- int len, i, t, mask=0xff;\r
-\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
- if(sh) {\r
- pal=HighPal;\r
- if(Pico.m.dirtyPal) {\r
- blockcpy(pal, Pico.cram, 0x40*2);\r
- // shadowed pixels\r
- for(i = 0x3f; i >= 0; i--)\r
- pal[0x40|i] = pal[0xc0|i] = (unsigned short)((pal[i]>>1)&0x0777);\r
- // hilighted pixels\r
- for(i = 0x3f; i >= 0; i--) {\r
- t=pal[i]&0xeee;t+=0x444;if(t&0x10)t|=0xe;if(t&0x100)t|=0xe0;if(t&0x1000)t|=0xe00;t&=0xeee;\r
- pal[0x80|i]=(unsigned short)t;\r
- }\r
- Pico.m.dirtyPal = 0;\r
- }\r
- }\r
-\r
- if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI))\r
- mask=0x3f; // accurate sprites\r
-\r
- for(i = 0; i < len; i++)\r
- pd[i] = pal[ps[i] & mask];\r
-}\r
-\r
-\r
-static void FinalizeLineRGB555(int sh)\r
-{\r
- unsigned short *pd=DrawLineDest;\r
- unsigned char *ps=HighCol+8;\r
- unsigned short *pal=HighPal;\r
+ unsigned short *pd=est->DrawLineDest;\r
+ unsigned char *ps=est->HighCol+8;\r
+ unsigned short *pal=est->HighPal;\r
int len;\r
\r
if (Pico.m.dirtyPal)\r
- PicoDoHighPal555(sh);\r
+ PicoDoHighPal555(sh, line, est);\r
\r
if (Pico.video.reg[12]&1) {\r
len = 320;\r
{\r
#ifndef PSP\r
int i, mask=0xff;\r
- if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI))\r
+ if (!sh && (est->rendstatus & PDRAW_SPR_LO_ON_HI))\r
mask=0x3f; // accurate sprites, upper bits are priority stuff\r
\r
for (i = 0; i < len; i++)\r
#else\r
extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);\r
extern void amips_clut_6bit(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);\r
- if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI))\r
+ if (!sh && (est->rendstatus & PDRAW_SPR_LO_ON_HI))\r
amips_clut_6bit(pd, ps, pal, len);\r
else amips_clut(pd, ps, pal, len);\r
#endif\r
}\r
#endif\r
\r
-static void FinalizeLine8bit(int sh)\r
+static void FinalizeLine8bit(int sh, int line, struct PicoEState *est)\r
{\r
- unsigned char *pd=DrawLineDest;\r
- int len, rs = rendstatus;\r
+ unsigned char *pd = est->DrawLineDest;\r
+ int len, rs = est->rendstatus;\r
static int dirty_count;\r
\r
- if (!sh && Pico.m.dirtyPal == 1 && DrawScanline < 222)\r
+ if (!sh && Pico.m.dirtyPal == 1)\r
{\r
// a hack for mid-frame palette changes\r
if (!(rs & PDRAW_SONIC_MODE))\r
dirty_count = 1;\r
else dirty_count++;\r
rs |= PDRAW_SONIC_MODE;\r
- rendstatus = rs;\r
+ est->rendstatus = rs;\r
if (dirty_count == 3) {\r
- blockcpy(HighPal, Pico.cram, 0x40*2);\r
+ blockcpy(est->HighPal, Pico.cram, 0x40*2);\r
} else if (dirty_count == 11) {\r
- blockcpy(HighPal+0x40, Pico.cram, 0x40*2);\r
+ blockcpy(est->HighPal+0x40, Pico.cram, 0x40*2);\r
}\r
}\r
\r
if (Pico.video.reg[12]&1) {\r
len = 320;\r
} else {\r
- if (!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32;\r
+ if (!(PicoOpt & POPT_DIS_32C_BORDER))\r
+ pd += 32;\r
len = 256;\r
}\r
\r
if (!sh && (rs & PDRAW_SONIC_MODE)) {\r
if (dirty_count >= 11) {\r
- blockcpy_or(pd, HighCol+8, len, 0x80);\r
+ blockcpy_or(pd, est->HighCol+8, len, 0x80);\r
} else {\r
- blockcpy_or(pd, HighCol+8, len, 0x40);\r
+ blockcpy_or(pd, est->HighCol+8, len, 0x40);\r
}\r
} else {\r
- blockcpy(pd, HighCol+8, len);\r
+ blockcpy(pd, est->HighCol+8, len);\r
}\r
}\r
\r
-static void (*FinalizeLine)(int sh) = FinalizeLineBGR444;\r
+static void (*FinalizeLine)(int sh, int line, struct PicoEState *est);\r
\r
// --------------------------------------------\r
\r
-static void DrawBlankedLine(void)\r
-{\r
- int sh=(Pico.video.reg[0xC]&8)>>3; // shadow/hilight?\r
-\r
- if (PicoScanBegin != NULL)\r
- PicoScanBegin(DrawScanline);\r
-\r
- BackFill(Pico.video.reg[7], sh);\r
-\r
- if (FinalizeLine != NULL)\r
- FinalizeLine(sh);\r
-\r
- if (PicoScanEnd != NULL)\r
- PicoScanEnd(DrawScanline);\r
-}\r
-\r
static int DrawDisplay(int sh)\r
{\r
- unsigned char *sprited = &HighLnSpr[DrawScanline][0];\r
+ struct PicoEState *est=&Pico.est;\r
+ unsigned char *sprited = &HighLnSpr[est->DrawScanline][0];\r
struct PicoVideo *pvid=&Pico.video;\r
int win=0,edge=0,hvwind=0;\r
int maxw,maxcells;\r
\r
- rendstatus &= ~(PDRAW_SHHI_DONE|PDRAW_PLANE_HI_PRIO);\r
+ est->rendstatus &= ~(PDRAW_SHHI_DONE|PDRAW_PLANE_HI_PRIO);\r
\r
if (pvid->reg[12]&1) {\r
maxw = 328; maxcells = 40;\r
win=pvid->reg[0x12];\r
edge=(win&0x1f)<<3;\r
\r
- if (win&0x80) { if (DrawScanline>=edge) hvwind=1; }\r
- else { if (DrawScanline< edge) hvwind=1; }\r
+ if (win&0x80) { if (est->DrawScanline>=edge) hvwind=1; }\r
+ else { if (est->DrawScanline< edge) hvwind=1; }\r
\r
if (!hvwind) // we might have a vertical window here\r
{\r
\r
/* - layer B low - */\r
if (PicoDrawMask & PDRAW_LAYERB_ON)\r
- DrawLayer(1|(sh<<1), HighCacheB, 0, maxcells);\r
+ DrawLayer(1|(sh<<1), HighCacheB, 0, maxcells, est);\r
/* - layer A low - */\r
if (!(PicoDrawMask & PDRAW_LAYERA_ON));\r
else if (hvwind == 1)\r
- DrawWindow(0, maxcells>>1, 0, sh);\r
+ DrawWindow(0, maxcells>>1, 0, sh, est);\r
else if (hvwind == 2) {\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<<1), HighCacheA, (win&0x80) ? 0 : edge<<1, (win&0x80) ? edge<<1 : maxcells, est);\r
+ DrawWindow( (win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 0, sh, est);\r
} else\r
- DrawLayer(0|(sh<<1), HighCacheA, 0, maxcells);\r
+ DrawLayer(0|(sh<<1), HighCacheA, 0, maxcells, est);\r
/* - sprites low - */\r
if (!(PicoDrawMask & PDRAW_SPRITES_LOW_ON));\r
- else if (rendstatus & PDRAW_INTERLACE)\r
+ else if (Pico.est.rendstatus & PDRAW_INTERLACE)\r
DrawAllSpritesInterlace(0, sh);\r
else if (sprited[1] & SPRL_HAVE_LO)\r
- DrawAllSprites(sprited, 0, sh);\r
+ DrawAllSprites(sprited, 0, sh, est);\r
\r
/* - layer B hi - */\r
if ((PicoDrawMask & PDRAW_LAYERB_ON) && HighCacheB[0])\r
- DrawTilesFromCache(HighCacheB, sh, maxw);\r
+ DrawTilesFromCache(HighCacheB, sh, maxw, est);\r
/* - layer A hi - */\r
if (!(PicoDrawMask & PDRAW_LAYERA_ON));\r
else if (hvwind == 1)\r
- DrawWindow(0, maxcells>>1, 1, sh);\r
+ DrawWindow(0, maxcells>>1, 1, sh, est);\r
else if (hvwind == 2) {\r
- if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, (win&0x80) ? edge<<4 : maxw);\r
- DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 1, sh);\r
+ if (HighCacheA[0])\r
+ DrawTilesFromCache(HighCacheA, sh, (win&0x80) ? edge<<4 : maxw, est);\r
+ DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 1, sh, est);\r
} else\r
- if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, maxw);\r
+ if (HighCacheA[0])\r
+ DrawTilesFromCache(HighCacheA, sh, maxw, est);\r
/* - sprites hi - */\r
if (!(PicoDrawMask & PDRAW_SPRITES_HI_ON));\r
- else if (rendstatus & PDRAW_INTERLACE)\r
+ else if (Pico.est.rendstatus & PDRAW_INTERLACE)\r
DrawAllSpritesInterlace(1, sh);\r
// have sprites without layer pri bit ontop of sprites with that bit\r
else if ((sprited[1] & 0xd0) == 0xd0 && (PicoOpt & POPT_ACC_SPRITES))\r
DrawSpritesHiAS(sprited, sh);\r
else if (sh && (sprited[1] & SPRL_MAY_HAVE_OP))\r
- DrawSpritesSHi(sprited);\r
+ DrawSpritesSHi(sprited, est);\r
else if (sprited[1] & SPRL_HAVE_HI)\r
- DrawAllSprites(sprited, 1, 0);\r
+ DrawAllSprites(sprited, 1, 0, est);\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, DrawScanline, a, b);\r
+ printf("%i:%03i: a=%i, b=%i\n", Pico.m.frame_count,\r
+ Pico.est.DrawScanline, a, b);\r
}\r
#endif\r
\r
// MUST be called every frame\r
PICO_INTERNAL void PicoFrameStart(void)\r
{\r
+ int offs = 8, lines = 224;\r
+\r
// prepare to do this frame\r
- rendstatus = 0;\r
- if ((Pico.video.reg[12]&6) == 6)\r
- rendstatus |= PDRAW_INTERLACE; // interlace mode\r
+ Pico.est.rendstatus = 0;\r
+ if ((Pico.video.reg[12] & 6) == 6)\r
+ Pico.est.rendstatus |= PDRAW_INTERLACE; // interlace mode\r
+ if (!(Pico.video.reg[12] & 1))\r
+ Pico.est.rendstatus |= PDRAW_32_COLS;\r
+ if (Pico.video.reg[1] & 8) {\r
+ offs = 0;\r
+ lines = 240;\r
+ }\r
+\r
+ if (Pico.est.rendstatus != rendstatus_old || lines != rendlines) {\r
+ rendlines = lines;\r
+ // mode_change() might reset rendstatus_old by calling SetColorFormat\r
+ emu_video_mode_change((lines == 240) ? 0 : 8,\r
+ lines, (Pico.video.reg[12] & 1) ? 0 : 1);\r
+ rendstatus_old = Pico.est.rendstatus;\r
+ }\r
+\r
+ Pico.est.HighCol = HighColBase + offs * HighColIncrement;\r
+ Pico.est.DrawLineDest = (char *)DrawLineDestBase + offs * DrawLineDestIncrement;\r
+ Pico.est.DrawScanline = 0;\r
+ skip_next_line = 0;\r
\r
- if (Pico.m.dirtyPal) Pico.m.dirtyPal = 2; // reset dirty if needed\r
+ if (PicoOpt & POPT_ALT_RENDERER)\r
+ return;\r
\r
- DrawScanline=0;\r
+ if (Pico.m.dirtyPal)\r
+ Pico.m.dirtyPal = 2; // reset dirty if needed\r
PrepareSprites(1);\r
- skip_next_line=0;\r
}\r
\r
-static void PicoLine(void)\r
+static void DrawBlankedLine(int line, int offs, int sh, int bgc)\r
{\r
- int sh;\r
- if (skip_next_line>0) { skip_next_line--; return; } // skip rendering lines\r
+ if (PicoScanBegin != NULL)\r
+ PicoScanBegin(line + offs);\r
+\r
+ BackFill(bgc, sh, &Pico.est);\r
+\r
+ if (FinalizeLine != NULL)\r
+ FinalizeLine(sh, line, &Pico.est);\r
+\r
+ if (PicoScanEnd != NULL)\r
+ PicoScanEnd(line + offs);\r
\r
- sh=(Pico.video.reg[0xC]&8)>>3; // shadow/hilight?\r
+ Pico.est.HighCol += HighColIncrement;\r
+ Pico.est.DrawLineDest = (char *)Pico.est.DrawLineDest + DrawLineDestIncrement;\r
+}\r
+\r
+static void PicoLine(int line, int offs, int sh, int bgc)\r
+{\r
+ int skip = 0;\r
\r
+ if (skip_next_line > 0) {\r
+ skip_next_line--;\r
+ return;\r
+ }\r
+\r
+ Pico.est.DrawScanline = line;\r
if (PicoScanBegin != NULL)\r
- skip_next_line = PicoScanBegin(DrawScanline);\r
+ skip = PicoScanBegin(line + offs);\r
+\r
+ if (skip) {\r
+ skip_next_line = skip - 1;\r
+ return;\r
+ }\r
\r
// Draw screen:\r
- BackFill(Pico.video.reg[7], sh);\r
+ BackFill(bgc, sh, &Pico.est);\r
if (Pico.video.reg[1]&0x40)\r
DrawDisplay(sh);\r
\r
if (FinalizeLine != NULL)\r
- FinalizeLine(sh);\r
+ FinalizeLine(sh, line, &Pico.est);\r
\r
if (PicoScanEnd != NULL)\r
- skip_next_line = PicoScanEnd(DrawScanline);\r
+ skip_next_line = PicoScanEnd(line + offs);\r
+\r
+ Pico.est.HighCol += HighColIncrement;\r
+ Pico.est.DrawLineDest = (char *)Pico.est.DrawLineDest + DrawLineDestIncrement;\r
}\r
\r
void PicoDrawSync(int to, int blank_last_line)\r
{\r
- for (; DrawScanline < to; DrawScanline++)\r
+ int line, offs = 0;\r
+ int sh = (Pico.video.reg[0xC] & 8) >> 3; // shadow/hilight?\r
+ int bgc = Pico.video.reg[7];\r
+\r
+ pprof_start(draw);\r
+\r
+ if (rendlines != 240)\r
+ offs = 8;\r
+\r
+ for (line = Pico.est.DrawScanline; line < to; line++)\r
{\r
-#if !CAN_HANDLE_240_LINES\r
- if (DrawScanline >= 224) break;\r
-#endif\r
- PicoLine();\r
+ PicoLine(line, offs, sh, bgc);\r
}\r
\r
-#if !CAN_HANDLE_240_LINES\r
- if (DrawScanline >= 224) { DrawScanline = 240; return; }\r
-#endif\r
-\r
// last line\r
- if (DrawScanline <= to)\r
+ if (line <= to)\r
{\r
if (blank_last_line)\r
- DrawBlankedLine();\r
- else PicoLine();\r
- DrawScanline++;\r
+ DrawBlankedLine(line, offs, sh, bgc);\r
+ else PicoLine(line, offs, sh, bgc);\r
+ line++;\r
+ }\r
+ Pico.est.DrawScanline = line;\r
+\r
+ pprof_end(draw);\r
+}\r
+\r
+// also works for fast renderer\r
+void PicoDrawUpdateHighPal(void)\r
+{\r
+ struct PicoEState *est = &Pico.est;\r
+ int sh = (Pico.video.reg[0xC] & 8) >> 3; // shadow/hilight?\r
+ if (PicoOpt & POPT_ALT_RENDERER)\r
+ sh = 0; // no s/h support\r
+\r
+ PicoDoHighPal555(sh, 0, &Pico.est);\r
+ if (est->rendstatus & PDRAW_SONIC_MODE) {\r
+ // FIXME?\r
+ memcpy(est->HighPal + 0x40, est->HighPal, 0x40*2);\r
+ memcpy(est->HighPal + 0x80, est->HighPal, 0x40*2);\r
}\r
}\r
\r
-void PicoDrawSetColorFormat(int which)\r
+void PicoDrawSetOutFormat(pdso_t which, int use_32x_line_mode)\r
{\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
+ case PDF_8BIT:\r
+ FinalizeLine = FinalizeLine8bit;\r
+ break;\r
+\r
+ case PDF_RGB555:\r
+ if ((PicoAHW & PAHW_32X) && use_32x_line_mode)\r
+ FinalizeLine = FinalizeLine32xRGB555;\r
+ else\r
+ FinalizeLine = FinalizeLine555;\r
+ break;\r
+\r
+ default:\r
+ FinalizeLine = NULL;\r
+ break;\r
}\r
-#if OVERRIDE_HIGHCOL\r
- if (which) HighCol=DefHighCol;\r
-#endif\r
+ PicoDrawSetOutFormat32x(which, use_32x_line_mode);\r
+ PicoDrawSetOutputMode4(which);\r
+ rendstatus_old = -1;\r
+}\r
+\r
+// note: may be called on the middle of frame\r
+void PicoDrawSetOutBuf(void *dest, int increment)\r
+{\r
+ DrawLineDestBase = dest;\r
+ DrawLineDestIncrement = increment;\r
+ Pico.est.DrawLineDest = (unsigned char*)DrawLineDestBase + Pico.est.DrawScanline * increment;\r
+}\r
+\r
+void PicoDrawSetInternalBuf(void *dest, int increment)\r
+{\r
+ if (dest != NULL) {\r
+ HighColBase = dest;\r
+ HighColIncrement = increment;\r
+ Pico.est.HighCol = HighColBase + Pico.est.DrawScanline * increment;\r
+ }\r
+ else {\r
+ HighColBase = DefHighCol;\r
+ HighColIncrement = 0;\r
+ }\r
+}\r
+\r
+void PicoDrawSetCallbacks(int (*begin)(unsigned int num), int (*end)(unsigned int num))\r
+{\r
+ PicoScanBegin = NULL;\r
+ PicoScanEnd = NULL;\r
+ PicoScan32xBegin = NULL;\r
+ PicoScan32xEnd = NULL;\r
+\r
+ if ((PicoAHW & PAHW_32X) && FinalizeLine != FinalizeLine32xRGB555) {\r
+ PicoScan32xBegin = begin;\r
+ PicoScan32xEnd = end;\r
+ }\r
+ else {\r
+ PicoScanBegin = begin;\r
+ PicoScanEnd = end;\r
+ }\r
+}\r
+\r
+void PicoDrawInit(void)\r
+{\r
+ Pico.est.DrawLineDest = DefOutBuff;\r
+ Pico.est.HighCol = HighColBase;\r
+ Pico.est.HighPreSpr = HighPreSpr;\r
+ rendstatus_old = -1;\r
}\r
\r
+// vim:ts=2:sw=2:expandtab\r