\r
#include "PicoInt.h"\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
#if OVERRIDE_HIGHCOL\r
static unsigned char DefHighCol[8+320+8];\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
-int Scanline=0; // Scanline\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 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
// 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
\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
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
int pal;\r
\r
code=Pico.vram[nametab+tilex];\r
- if(code==blank) continue;\r
- if((code>>15) != prio) {\r
- rendstatus|=2;\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
+ rendstatus |= PDRAW_WND_DIFF_PRIO;\r
continue;\r
}\r
\r
\r
static void DrawTilesFromCacheShPrep(void)\r
{\r
- if (!(rendstatus&0x80))\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
- // 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
+ 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
\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
- DrawTilesFromCacheShPrep();\r
+ if (!(rendstatus & PDRAW_SHHI_DONE))\r
+ DrawTilesFromCacheShPrep();\r
sh = 0;\r
}\r
\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
// sprite limit\r
ntiles += pack>>28;\r
- if(ntiles > 40) break;\r
+ if(!(PicoOpt&0x40000) && ntiles > 40) break;\r
\r
if(pack & 0x00800000) continue;\r
\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
+ if ((pack2&0x8000) ^ (prio<<15)) continue;\r
DrawSpriteZ(pack,pack2,sh|(prio<<1),(char)(0x1f-n));\r
continue;\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
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 (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
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
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
static int DrawDisplay(int sh)\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
}\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
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