* - "sonic mode" for midline palette changes (8bit mode only)\r
* - accurate sprites (AS) [+ s/h]\r
*\r
- * AS and s/h both use upper bits for both priority and shadow/hilight flags.\r
+ * s/h uses 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
* 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
+ * b \ mode: s/h sonic\r
+ * 00 normal pal index\r
+ * 01 shadow pal index\r
+ * 10 hilight+op 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
*/\r
\r
#include "pico_int.h"\r
#define blockcpy memcpy\r
#endif\r
\r
-\r
-#define TileNormMaker(funcname,pix_func) \\r
-static void funcname(int sx, unsigned int pack, int pal) \\r
+#define TileNormMaker_(pix_func) \\r
{ \\r
- unsigned char *pd = Pico.est.HighCol + sx; \\r
unsigned int t; \\r
\\r
t = (pack&0x0000f000)>>12; pix_func(0); \\r
t = (pack&0x000f0000)>>16; pix_func(7); \\r
}\r
\r
-#define TileFlipMaker(funcname,pix_func) \\r
-static void funcname(int sx, unsigned int pack, int pal) \\r
+#define TileFlipMaker_(pix_func) \\r
{ \\r
- unsigned char *pd = Pico.est.HighCol + sx; \\r
unsigned int t; \\r
\\r
t = (pack&0x000f0000)>>16; pix_func(0); \\r
t = (pack&0x0000f000)>>12; pix_func(7); \\r
}\r
\r
+#define TileNormMaker(funcname, pix_func) \\r
+static void funcname(unsigned char *pd, unsigned int pack, int pal) \\r
+TileNormMaker_(pix_func)\r
\r
-#ifdef _ASM_DRAW_C_AMIPS\r
-int TileNorm(int sx, unsigned int pack, int pal);\r
-int TileFlip(int sx, unsigned int pack, int pal);\r
-#else\r
+#define TileFlipMaker(funcname, pix_func) \\r
+static void funcname(unsigned char *pd, unsigned int pack, int pal) \\r
+TileFlipMaker_(pix_func)\r
+\r
+#define TileNormMakerAS(funcname, pix_func) \\r
+static void funcname(unsigned char *pd, unsigned char *mb, unsigned int pack, int pal) \\r
+TileNormMaker_(pix_func)\r
+\r
+#define TileFlipMakerAS(funcname, pix_func) \\r
+static void funcname(unsigned char *pd, unsigned char *mb, unsigned int pack, int pal) \\r
+TileFlipMaker_(pix_func)\r
\r
#define pix_just_write(x) \\r
if (t) pd[x]=pal|t\r
TileNormMaker(TileNorm,pix_just_write)\r
TileFlipMaker(TileFlip,pix_just_write)\r
\r
-#endif\r
-\r
#ifndef _ASM_DRAW_C\r
\r
// draw a sprite pixel, process operator colors\r
TileNormMaker(TileNormSH_markop, pix_sh_markop)\r
TileFlipMaker(TileFlipSH_markop, pix_sh_markop)\r
\r
+#endif\r
+\r
// process operator pixels only, apply only on low pri tiles and other op pixels\r
#define pix_sh_onlyop(x) \\r
if (t>=0xe && (pd[x]&0xc0)) \\r
pd[x]=(pd[x]&0x3f)|(t<<6); /* c0 shadow, 80 hilight */ \\r
\r
+#ifndef _ASM_DRAW_C\r
+\r
TileNormMaker(TileNormSH_onlyop_lp, pix_sh_onlyop)\r
TileFlipMaker(TileFlipSH_onlyop_lp, pix_sh_onlyop)\r
\r
\r
// draw a sprite pixel (AS)\r
#define pix_as(x) \\r
- if (t && !(pd[x]&0x80)) pd[x]=pal|t\r
+ if (t & mb[x]) mb[x] = 0, pd[x] = pal | t\r
+\r
+TileNormMakerAS(TileNormAS, pix_as)\r
+TileFlipMakerAS(TileFlipAS, pix_as)\r
\r
-TileNormMaker(TileNormAS, pix_as)\r
-TileFlipMaker(TileFlipAS, pix_as)\r
+// draw a sprite pixel, process operator colors (AS)\r
+#define pix_sh_as(x) \\r
+ if (t & mb[x]) { \\r
+ mb[x] = 0; \\r
+ if (t>=0xe) pd[x]=(pd[x]&0x3f)|(t<<6); /* c0 shadow, 80 hilight */ \\r
+ else pd[x] = pal | t; \\r
+ }\r
\r
-// draw a sprite pixel, skip operator colors (AS)\r
-#define pix_sh_as_noop(x) \\r
- if (t && t < 0xe && !(pd[x]&0x80)) pd[x]=pal|t\r
+TileNormMakerAS(TileNormSH_AS, pix_sh_as)\r
+TileFlipMakerAS(TileFlipSH_AS, pix_sh_as)\r
+\r
+#define pix_sh_as_onlyop(x) \\r
+ if (t & mb[x]) { \\r
+ mb[x] = 0; \\r
+ pix_sh_onlyop(x); \\r
+ }\r
\r
-TileNormMaker(TileNormAS_noop, pix_sh_as_noop)\r
-TileFlipMaker(TileFlipAS_noop, pix_sh_as_noop)\r
+TileNormMakerAS(TileNormSH_AS_onlyop_lp, pix_sh_as_onlyop)\r
+TileFlipMakerAS(TileFlipSH_AS_onlyop_lp, pix_sh_as_onlyop)\r
\r
// mark pixel as sprite pixel (AS)\r
#define pix_sh_as_onlymark(x) \\r
- if (t) pd[x]|=0x80\r
+ if (t) mb[x] = 0\r
\r
-TileNormMaker(TileNormAS_onlymark, pix_sh_as_onlymark)\r
-TileFlipMaker(TileFlipAS_onlymark, pix_sh_as_onlymark)\r
+TileNormMakerAS(TileNormAS_onlymark, pix_sh_as_onlymark)\r
+TileFlipMakerAS(TileFlipAS_onlymark, pix_sh_as_onlymark)\r
\r
-// mark pixel as sprite pixel (AS)\r
+// forced both layer draw (through debug reg)\r
#define pix_and(x) \\r
pd[x] = (pd[x] & 0xc0) | (pd[x] & (pal | t))\r
\r
#ifndef _ASM_DRAW_C\r
static void DrawStrip(struct TileStrip *ts, int lflags, int cellskip)\r
{\r
+ unsigned char *pd = Pico.est.HighCol;\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,sh;\r
{\r
unsigned int pack;\r
\r
- code = Pico.vram[ts->nametab + (tilex & ts->xmask)];\r
+ code = PicoMem.vram[ts->nametab + (tilex & ts->xmask)];\r
if (code == blank)\r
continue;\r
if ((code >> 15) | (lflags & LF_FORCE)) { // high priority tile\r
pal=((code>>9)&0x30)|sh;\r
}\r
\r
- pack = *(unsigned int *)(Pico.vram + addr);\r
+ pack = *(unsigned int *)(PicoMem.vram + addr);\r
if (!pack) {\r
blank = code;\r
continue;\r
}\r
\r
- if (code & 0x0800) TileFlip(dx, pack, pal);\r
- else TileNorm(dx, pack, pal);\r
+ if (code & 0x0800) TileFlip(pd + dx, pack, pal);\r
+ else TileNorm(pd + dx, pack, pal);\r
}\r
\r
// terminate the cache list\r
// this is messy\r
static void DrawStripVSRam(struct TileStrip *ts, int plane_sh, int cellskip)\r
{\r
+ unsigned char *pd = Pico.est.HighCol;\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=Pico.est.DrawScanline;\r
// Draw tiles across screen:\r
tilex=(-ts->hscroll)>>3;\r
dx=((ts->hscroll-1)&7)+1;\r
- if(dx != 8) cell--; // have hscroll, start with negative cell\r
+ if (ts->hscroll & 0x0f) {\r
+ int adj = ((ts->hscroll ^ dx) >> 3) & 1;\r
+ cell -= adj + 1;\r
+ ts->cells -= adj;\r
+ }\r
cell+=cellskip;\r
tilex+=cellskip;\r
dx+=cellskip<<3;\r
//if((cell&1)==0)\r
{\r
int line,vscroll;\r
- vscroll=Pico.vsram[(plane_sh&1)+(cell&~1)];\r
+ vscroll=PicoMem.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
ty=(line&7)<<1; // Y-Offset into tile\r
}\r
\r
- code=Pico.vram[ts->nametab+nametabadd+(tilex&ts->xmask)];\r
+ code=PicoMem.vram[ts->nametab+nametabadd+(tilex&ts->xmask)];\r
if (code==blank) continue;\r
if (code>>15) { // high priority tile\r
int cval = code | (dx<<16) | (ty<<25);\r
pal=((code>>9)&0x30)|((plane_sh<<5)&0x40);\r
}\r
\r
- pack = *(unsigned int *)(Pico.vram + addr);\r
+ pack = *(unsigned int *)(PicoMem.vram + addr);\r
if (!pack) {\r
blank = code;\r
continue;\r
}\r
\r
- if (code & 0x0800) TileFlip(dx, pack, pal);\r
- else TileNorm(dx, pack, pal);\r
+ if (code & 0x0800) TileFlip(pd + dx, pack, pal);\r
+ else TileNorm(pd + dx, pack, pal);\r
}\r
\r
// terminate the cache list\r
#endif\r
void DrawStripInterlace(struct TileStrip *ts)\r
{\r
+ unsigned char *pd = Pico.est.HighCol;\r
int tilex=0,dx=0,ty=0,code=0,addr=0,cells;\r
int oldcode=-1,blank=-1; // The tile we know is blank\r
int pal=0;\r
{\r
unsigned int pack;\r
\r
- code=Pico.vram[ts->nametab+(tilex&ts->xmask)];\r
+ code = PicoMem.vram[ts->nametab + (tilex & ts->xmask)];\r
if (code==blank) continue;\r
if (code>>15) { // high priority tile\r
int cval = (code&0xfc00) | (dx<<16) | (ty<<25);\r
pal=((code>>9)&0x30);\r
}\r
\r
- pack = *(unsigned int *)(Pico.vram + addr);\r
+ pack = *(unsigned int *)(PicoMem.vram + addr);\r
if (!pack) {\r
blank = code;\r
continue;\r
}\r
\r
- if (code & 0x0800) TileFlip(dx, pack, pal);\r
- else TileNorm(dx, pack, pal);\r
+ if (code & 0x0800) TileFlip(pd + dx, pack, pal);\r
+ else TileNorm(pd + dx, pack, pal);\r
}\r
\r
// terminate the cache list\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
+ ts.hscroll = PicoMem.vram[htab & 0x7fff];\r
\r
if((pvid->reg[12]&6) == 6) {\r
// interlace mode 2\r
- vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value\r
+ vscroll = PicoMem.vsram[plane_sh & 1]; // Get vertical scroll value\r
\r
// Find the line in the name table\r
ts.line=(vscroll+(est->DrawScanline<<1))&((ymask<<1)|1);\r
ts.line=ymask|(shift[width]<<24); // save some stuff instead of line\r
DrawStripVSRam(&ts, plane_sh, cellskip);\r
} else {\r
- vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value\r
+ vscroll = PicoMem.vsram[plane_sh & 1]; // Get vertical scroll value\r
\r
// Find the line in the name table\r
ts.line=(vscroll+est->DrawScanline)&ymask;\r
static void DrawWindow(int tstart, int tend, int prio, int sh,\r
struct PicoEState *est)\r
{\r
- struct PicoVideo *pvid=&Pico.video;\r
+ unsigned char *pd = Pico.est.HighCol;\r
+ struct PicoVideo *pvid = &Pico.video;\r
int tilex,ty,nametab,code=0;\r
int blank=-1; // The tile we know is blank\r
\r
\r
if (!(est->rendstatus & PDRAW_WND_DIFF_PRIO)) {\r
// check the first tile code\r
- code=Pico.vram[nametab+tilex];\r
+ code = PicoMem.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
}\r
int dx, addr;\r
int pal;\r
\r
- code=Pico.vram[nametab+tilex];\r
+ code = PicoMem.vram[nametab + tilex];\r
if (code==blank) continue;\r
if ((code>>15) != prio) {\r
est->rendstatus |= PDRAW_WND_DIFF_PRIO;\r
addr=(code&0x7ff)<<4;\r
if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip\r
\r
- pack = *(unsigned int *)(Pico.vram + addr);\r
+ pack = *(unsigned int *)(PicoMem.vram + addr);\r
if (!pack) {\r
blank = code;\r
continue;\r
pal = ((code >> 9) & 0x30);\r
dx = 8 + (tilex << 3);\r
\r
- if (code & 0x0800) TileFlip(dx, pack, pal);\r
- else TileNorm(dx, pack, pal);\r
+ if (code & 0x0800) TileFlip(pd + dx, pack, pal);\r
+ else TileNorm(pd + dx, pack, pal);\r
}\r
}\r
else\r
int dx, addr;\r
int pal;\r
\r
- code=Pico.vram[nametab+tilex];\r
+ code = PicoMem.vram[nametab + tilex];\r
if(code==blank) continue;\r
if((code>>15) != prio) {\r
est->rendstatus |= PDRAW_WND_DIFF_PRIO;\r
addr=(code&0x7ff)<<4;\r
if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip\r
\r
- pack = *(unsigned int *)(Pico.vram + addr);\r
+ pack = *(unsigned int *)(PicoMem.vram + addr);\r
if (!pack) {\r
blank = code;\r
continue;\r
\r
dx = 8 + (tilex << 3);\r
\r
- if (code & 0x0800) TileFlip(dx, pack, pal);\r
- else TileNorm(dx, pack, pal);\r
+ if (code & 0x0800) TileFlip(pd + dx, pack, pal);\r
+ else TileNorm(pd + dx, pack, pal);\r
}\r
}\r
}\r
\r
static void DrawTilesFromCache(int *hc, int sh, int rlim, struct PicoEState *est)\r
{\r
+ unsigned char *pd = Pico.est.HighCol;\r
int code, addr, dx;\r
unsigned int pack;\r
int pal;\r
addr = (code & 0x7ff) << 4;\r
addr += code >> 25; // y offset into tile\r
\r
- pack = *(unsigned int *)(Pico.vram + addr);\r
+ pack = *(unsigned int *)(PicoMem.vram + addr);\r
if (!pack) {\r
blank = (short)code;\r
continue;\r
if (rlim-dx < 0)\r
goto last_cut_tile;\r
\r
- if (code & 0x0800) TileFlip(dx, pack, pal);\r
- else TileNorm(dx, pack, pal);\r
+ if (code & 0x0800) TileFlip(pd + dx, pack, pal);\r
+ else TileNorm(pd + dx, pack, pal);\r
}\r
}\r
else\r
*zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf;\r
*zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf;\r
\r
- pack = *(unsigned int *)(Pico.vram + addr);\r
+ pack = *(unsigned int *)(PicoMem.vram + addr);\r
if (!pack)\r
continue;\r
\r
if (rlim - dx < 0)\r
goto last_cut_tile;\r
\r
- if (code & 0x0800) TileFlip(dx, pack, pal);\r
- else TileNorm(dx, pack, pal);\r
+ if (code & 0x0800) TileFlip(pd + dx, pack, pal);\r
+ else TileNorm(pd + dx, pack, pal);\r
}\r
}\r
return;\r
last_cut_tile:\r
// for vertical window cutoff\r
{\r
- unsigned char *pd = est->HighCol + dx;\r
unsigned int t;\r
\r
+ pd += dx;\r
if (code&0x0800)\r
{\r
switch (rlim-dx+8)\r
\r
static void DrawSprite(int *sprite, int sh)\r
{\r
+ void (*fTileFunc)(unsigned char *pd, unsigned int pack, int pal);\r
+ unsigned char *pd = Pico.est.HighCol;\r
int width=0,height=0;\r
int row=0,code=0;\r
int pal;\r
int tile=0,delta=0;\r
int sx, sy;\r
- void (*fTileFunc)(int sx, unsigned int pack, int pal);\r
\r
// parse the sprite data\r
sy=sprite[0];\r
if(sx<=0) continue;\r
if(sx>=328) break; // Offscreen\r
\r
- pack = *(unsigned int *)(Pico.vram + (tile & 0x7fff));\r
- fTileFunc(sx, pack, pal);\r
+ pack = *(unsigned int *)(PicoMem.vram + (tile & 0x7fff));\r
+ fTileFunc(pd + sx, pack, pal);\r
}\r
}\r
#endif\r
\r
static NOINLINE void DrawTilesFromCacheForced(const int *hc)\r
{\r
+ unsigned char *pd = Pico.est.HighCol;\r
int code, addr, dx;\r
unsigned int pack;\r
int pal;\r
\r
dx = (code >> 16) & 0x1ff;\r
pal = ((code >> 9) & 0x30);\r
- pack = *(unsigned int *)(Pico.vram + addr);\r
+ pack = *(unsigned int *)(PicoMem.vram + addr);\r
\r
- if (code & 0x0800) TileFlip_and(dx, pack, pal);\r
- else TileNorm_and(dx, pack, pal);\r
+ if (code & 0x0800) TileFlip_and(pd + dx, pack, pal);\r
+ else TileNorm_and(pd + dx, pack, pal);\r
}\r
}\r
\r
static void DrawSpriteInterlace(unsigned int *sprite)\r
{\r
+ unsigned char *pd = Pico.est.HighCol;\r
int width=0,height=0;\r
int row=0,code=0;\r
int pal;\r
if(sx<=0) continue;\r
if(sx>=328) break; // Offscreen\r
\r
- pack = *(unsigned int *)(Pico.vram + (tile & 0x7fff));\r
- if (code & 0x0800) TileFlip(sx, pack, pal);\r
- else TileNorm(sx, pack, pal);\r
+ pack = *(unsigned int *)(PicoMem.vram + (tile & 0x7fff));\r
+ if (code & 0x0800) TileFlip(pd + sx, pack, pal);\r
+ else TileNorm(pd + sx, pack, pal);\r
}\r
}\r
\r
unsigned int *sprite;\r
int code, sx, sy, height;\r
\r
- sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite\r
+ sprite=(unsigned int *)(PicoMem.vram+((table+(link<<2))&0x7ffc)); // Find sprite\r
\r
// get sprite info\r
code = sprite[0];\r
*/\r
static void DrawSpritesSHi(unsigned char *sprited, const struct PicoEState *est)\r
{\r
- void (*fTileFunc)(int sx, unsigned int pack, int pal);\r
+ void (*fTileFunc)(unsigned char *pd, unsigned int pack, int pal);\r
+ unsigned char *pd = Pico.est.HighCol;\r
unsigned char *p;\r
int cnt;\r
\r
if(sx<=0) continue;\r
if(sx>=328) break; // Offscreen\r
\r
- pack = *(unsigned int *)(Pico.vram + (tile & 0x7fff));\r
- fTileFunc(sx, pack, pal);\r
+ pack = *(unsigned int *)(PicoMem.vram + (tile & 0x7fff));\r
+ fTileFunc(pd + sx, pack, pal);\r
}\r
}\r
}\r
\r
static void DrawSpritesHiAS(unsigned char *sprited, int sh)\r
{\r
- void (*fTileFunc)(int sx, unsigned int pack, int pal);\r
+ void (*fTileFunc)(unsigned char *pd, unsigned char *mb,\r
+ unsigned int pack, int pal);\r
+ unsigned char *pd = Pico.est.HighCol;\r
+ unsigned char mb[8+320+8];\r
unsigned char *p;\r
- int entry, cnt, sh_cnt = 0;\r
+ int entry, cnt;\r
\r
cnt = sprited[0] & 0x7f;\r
if (cnt == 0) return;\r
\r
- Pico.est.rendstatus |= PDRAW_SPR_LO_ON_HI;\r
-\r
+ memset(mb, 0xff, sizeof(mb));\r
p = &sprited[3];\r
\r
// Go through sprites:\r
code = sprite[1];\r
pal = (code>>9)&0x30;\r
\r
- if (code & 0x8000) // hi priority\r
+ if (sh && pal == 0x30)\r
{\r
- if (sh && pal == 0x30)\r
+ if (code & 0x8000) // hi priority\r
{\r
- if (code&0x800) fTileFunc=TileFlipAS_noop;\r
- else fTileFunc=TileNormAS_noop;\r
+ if (code&0x800) fTileFunc = TileFlipSH_AS;\r
+ else fTileFunc = TileNormSH_AS;\r
} else {\r
- if (code&0x800) fTileFunc=TileFlipAS;\r
- else fTileFunc=TileNormAS;\r
+ if (code&0x800) fTileFunc = TileFlipSH_AS_onlyop_lp;\r
+ else fTileFunc = TileNormSH_AS_onlyop_lp;\r
}\r
} else {\r
- if (code&0x800) fTileFunc=TileFlipAS_onlymark;\r
- else fTileFunc=TileNormAS_onlymark;\r
+ if (code & 0x8000) // hi priority\r
+ {\r
+ if (code&0x800) fTileFunc = TileFlipAS;\r
+ else fTileFunc = TileNormAS;\r
+ } else {\r
+ if (code&0x800) fTileFunc = TileFlipAS_onlymark;\r
+ else fTileFunc = TileNormAS_onlymark;\r
+ }\r
}\r
- if (sh && pal == 0x30)\r
- p[sh_cnt++] = offs / 2; // re-save for sh/hi pass\r
\r
// parse remaining sprite data\r
sy=sprite[0];\r
tile &= 0x7ff; tile<<=4; tile+=(row&7)<<1; // Tile address\r
delta<<=4; // Delta of address\r
\r
- pal |= 0x80;\r
for (; width; width--,sx+=8,tile+=delta)\r
{\r
unsigned int pack;\r
if(sx<=0) continue;\r
if(sx>=328) break; // Offscreen\r
\r
- pack = *(unsigned int *)(Pico.vram + (tile & 0x7fff));\r
- fTileFunc(sx, pack, pal);\r
+ pack = *(unsigned int *)(PicoMem.vram + (tile & 0x7fff));\r
+ fTileFunc(pd + sx, mb + sx, pack, pal);\r
}\r
}\r
-\r
- if (!sh || !(sprited[1]&SPRL_MAY_HAVE_OP)) return;\r
-\r
- /* nasty 1: remove 'sprite' flags */\r
- {\r
- int c = 320/4/4, *zb = (int *)(Pico.est.HighCol+8);\r
- while (c--)\r
- {\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, &Pico.est);\r
}\r
\r
\r
\r
if (!(Pico.video.reg[12]&1))\r
max_sprites = 64, max_line_sprites = 16, max_width = 264;\r
- if (PicoOpt & POPT_DIS_SPRITE_LIM)\r
+ if (PicoIn.opt & POPT_DIS_SPRITE_LIM)\r
max_line_sprites = MAX_LINE_SPRITES;\r
\r
if (pvid->reg[1]&8) max_lines = 240;\r
unsigned int *sprite;\r
int code2, sx, sy, height;\r
\r
- sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite\r
+ sprite=(unsigned int *)(PicoMem.vram+((table+(link<<2))&0x7ffc)); // Find sprite\r
\r
// parse sprite info\r
code2 = sprite[1];\r
unsigned int *sprite;\r
int code, code2, sx, sy, hv, height, width;\r
\r
- sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite\r
+ sprite=(unsigned int *)(PicoMem.vram+((table+(link<<2))&0x7ffc)); // Find sprite\r
\r
// parse sprite info\r
code = sprite[0];\r
\r
Pico.m.dirtyPal = 0;\r
\r
- spal = (void *)Pico.cram;\r
+ spal = (void *)PicoMem.cram;\r
dpal = (void *)est->HighPal;\r
\r
for (i = 0; i < 0x40 / 2; i++) {\r
if (Pico.video.reg[12]&1) {\r
len = 320;\r
} else {\r
- if (!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32;\r
+ if (!(PicoIn.opt&POPT_DIS_32C_BORDER)) pd+=32;\r
len = 256;\r
}\r
\r
{\r
-#ifndef PSP\r
- int i, mask=0xff;\r
- if (!sh && (est->rendstatus & PDRAW_SPR_LO_ON_HI))\r
- mask=0x3f; // accurate sprites, upper bits are priority stuff\r
+#if 1\r
+ int i;\r
\r
for (i = 0; i < len; i++)\r
- pd[i] = pal[ps[i] & mask];\r
+ pd[i] = pal[ps[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 && (est->rendstatus & PDRAW_SPR_LO_ON_HI))\r
+ if (!sh)\r
amips_clut_6bit(pd, ps, pal, len);\r
else amips_clut(pd, ps, pal, len);\r
#endif\r
rs |= PDRAW_SONIC_MODE;\r
est->rendstatus = rs;\r
if (dirty_count == 3) {\r
- blockcpy(est->HighPal, Pico.cram, 0x40*2);\r
+ blockcpy(est->HighPal, PicoMem.cram, 0x40*2);\r
} else if (dirty_count == 11) {\r
- blockcpy(est->HighPal+0x40, Pico.cram, 0x40*2);\r
+ blockcpy(est->HighPal+0x40, PicoMem.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))\r
+ if (!(PicoIn.opt & POPT_DIS_32C_BORDER))\r
pd += 32;\r
len = 256;\r
}\r
else if (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
+ else if ((sprited[1] & 0xd0) == 0xd0 && (PicoIn.opt & POPT_ACC_SPRITES))\r
DrawSpritesHiAS(sprited, sh);\r
else if (sh && (sprited[1] & SPRL_MAY_HAVE_OP))\r
DrawSpritesSHi(sprited, est);\r
Pico.est.DrawScanline = 0;\r
skip_next_line = 0;\r
\r
- if (PicoOpt & POPT_ALT_RENDERER)\r
+ if (PicoIn.opt & POPT_ALT_RENDERER)\r
return;\r
\r
if (Pico.m.dirtyPal)\r
\r
pprof_start(draw);\r
\r
- if (rendlines != 240)\r
+ if (rendlines != 240) {\r
offs = 8;\r
+ if (to > 223)\r
+ to = 223;\r
+ }\r
\r
for (line = Pico.est.DrawScanline; line < to; line++)\r
- {\r
PicoLine(line, offs, sh, bgc);\r
- }\r
\r
// last line\r
if (line <= to)\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
+ if (PicoIn.opt & POPT_ALT_RENDERER)\r
sh = 0; // no s/h support\r
\r
PicoDoHighPal555(sh, 0, &Pico.est);\r
break;\r
\r
case PDF_RGB555:\r
- if ((PicoAHW & PAHW_32X) && use_32x_line_mode)\r
+ if ((PicoIn.AHW & PAHW_32X) && use_32x_line_mode)\r
FinalizeLine = FinalizeLine32xRGB555;\r
else\r
FinalizeLine = FinalizeLine555;\r
{\r
DrawLineDestBase = dest;\r
DrawLineDestIncrement = increment;\r
- Pico.est.DrawLineDest = DrawLineDestBase + Pico.est.DrawScanline * increment;\r
+ Pico.est.DrawLineDest = (char *)DrawLineDestBase + Pico.est.DrawScanline * increment;\r
}\r
\r
void PicoDrawSetInternalBuf(void *dest, int increment)\r
PicoScan32xBegin = NULL;\r
PicoScan32xEnd = NULL;\r
\r
- if ((PicoAHW & PAHW_32X) && FinalizeLine != FinalizeLine32xRGB555) {\r
+ if ((PicoIn.AHW & PAHW_32X) && FinalizeLine != FinalizeLine32xRGB555) {\r
PicoScan32xBegin = begin;\r
PicoScan32xEnd = end;\r
}\r
notaz.gp2x.de / picodrive.git / blobdiff