static int HighCacheB[41+1];\r
int HighPreSpr[80*2+1]; // slightly preprocessed sprites\r
\r
-#define MAX_LINE_SPRITES 30\r
-unsigned char HighLnSpr[240][2 + MAX_LINE_SPRITES]; // sprite_count, tile_count, [spritep]...\r
+#define SPRL_HAVE_HI 0x80 // have hi priority sprites\r
+#define SPRL_HAVE_LO 0x40 // *lo*\r
+#define SPRL_MAY_HAVE_OP 0x20 // may have operator sprites on the line\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 PicoDrawMask = -1;\r
\r
static int skip_next_line=0;\r
\r
//unsigned short ppt[] = { 0x0f11, 0x0ff1, 0x01f1, 0x011f, 0x01ff, 0x0f1f, 0x0f0e, 0x0e7c };\r
\r
-static void (*DrawAllSpritesLoPri)(int prio, int sh) = NULL;\r
-static void (*DrawAllSpritesHiPri)(int prio, int sh) = NULL;\r
-\r
struct TileStrip\r
{\r
int nametab; // Position in VRAM of name table (for this tile line)\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(int prio, int sh);\r
+void DrawAllSprites(unsigned char *sprited, int prio, int sh);\r
void DrawTilesFromCache(int *hc, int sh, int rlim);\r
-void DrawSpritesSHi(int prio, int sh);\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
#ifndef _ASM_DRAW_C\r
// Index + 0 : hhhhvvvv ----hhvv yyyyyyyy yyyyyyyy // v, h: vert./horiz. size\r
// Index + 4 : xxxxxxxx xxxxxxxx pccvhnnn nnnnnnnn // x: x coord + 8\r
-static void DrawSpritesSHi(int prio, int sh)\r
+static void DrawSpritesSHi(unsigned char *sprited)\r
{\r
int (*fTileFunc)(int sx,int addr,int pal);\r
unsigned char *p;\r
int cnt;\r
\r
- cnt = HighLnSpr[DrawScanline][0] & 0x7f;\r
+ cnt = sprited[0] & 0x7f;\r
if (cnt == 0) return;\r
\r
- p = &HighLnSpr[DrawScanline][2];\r
+ p = &sprited[3];\r
\r
// Go through sprites backwards:\r
for (cnt--; cnt >= 0; cnt--)\r
code = sprite[1];\r
pal = (code>>9)&0x30;\r
\r
- if (sh && pal == 0x30)\r
+ if (pal == 0x30)\r
{\r
if (code & 0x8000) // hi priority\r
{\r
}\r
#endif\r
\r
-static void DrawSpritesHiAS(int prio, int sh)\r
+static void DrawSpritesHiAS(unsigned char *sprited, int sh)\r
{\r
int (*fTileFunc)(int sx,int addr,int pal);\r
unsigned char *p;\r
int entry, cnt, sh_cnt = 0;\r
\r
- cnt = HighLnSpr[DrawScanline][0] & 0x7f;\r
+ cnt = sprited[0] & 0x7f;\r
if (cnt == 0) return;\r
\r
- p = &HighLnSpr[DrawScanline][2];\r
+ p = &sprited[3];\r
\r
// Go through sprites:\r
for (entry = 0; entry < cnt; entry++)\r
}\r
}\r
\r
- if (!sh) return;\r
+ if (!sh || !(sprited[1]&SPRL_MAY_HAVE_OP)) return;\r
\r
/* nasty 1: remove 'sprite' flags */\r
{\r
}\r
\r
/* nasty 2: sh operator pass */\r
- HighLnSpr[DrawScanline][0] = sh_cnt;\r
- DrawSpritesSHi(1, 1);\r
+ sprited[0] = sh_cnt;\r
+ DrawSpritesSHi(sprited);\r
}\r
\r
\r
void PrepareSprites(int full)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
- int u,link=0;\r
+ int u,link=0,sh;\r
int table=0;\r
int *pd = HighPreSpr;\r
int max_lines = 224, max_sprites = 80, max_width = 328;\r
max_line_sprites = MAX_LINE_SPRITES;\r
\r
if (pvid->reg[1]&8) max_lines = 240;\r
+ sh = Pico.video.reg[0xC]&8; // shadow/hilight?\r
\r
table=pvid->reg[5]&0x7f;\r
if (pvid->reg[12]&1) table&=0x7e; // Lowest bit 0 in 40-cell mode\r
{\r
int pack;\r
// updates: tilecode, sx\r
- for (u=0; u < max_lines && (pack = *pd); u++, pd+=2)\r
+ for (u=0; u < max_sprites && (pack = *pd); u++, pd+=2)\r
{\r
unsigned int *sprite;\r
int code2, sx, sy, height;\r
if (cnt >= max_line_sprites) continue; // sprite limit?\r
\r
for (i = 0; i < cnt; i++)\r
- if (((HighLnSpr[y][2+i] ^ entry) & 0x7f) == 0) goto found;\r
+ if (((HighLnSpr[y][3+i] ^ entry) & 0x7f) == 0) goto found;\r
\r
// this sprite was previously missing\r
- HighLnSpr[y][2+cnt] = entry;\r
+ HighLnSpr[y][3+cnt] = entry;\r
HighLnSpr[y][0] = cnt + 1;\r
found:;\r
if (entry & 0x80)\r
- rendstatus |= PDRAW_HAVE_HI_SPR;\r
- else rendstatus |= PDRAW_HAVE_LO_SPR;\r
+ HighLnSpr[y][1] |= SPRL_HAVE_HI;\r
+ else HighLnSpr[y][1] |= SPRL_HAVE_LO;\r
}\r
}\r
\r
for (u = 0; u < max_lines; u++)\r
*((int *)&HighLnSpr[u][0]) = 0;\r
\r
- for (u = 0; u < max_lines; u++)\r
+ for (u = 0; u < max_sprites; u++)\r
{\r
unsigned int *sprite;\r
int code, code2, sx, sy, hv, height, width;\r
- int sx_min;\r
\r
sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite\r
\r
code2 = sprite[1];\r
sx = (code2>>16)&0x1ff;\r
sx -= 0x78; // Get X coordinate + 8\r
- sx_min = 8-(width<<3);\r
\r
if (sy < max_lines && sy + (height<<3) > DrawScanline) // sprite onscreen (y)?\r
{\r
- int y = (sy >= DrawScanline) ? sy : DrawScanline;\r
- int entry = ((pd - HighPreSpr) / 2) | ((code2>>8)&0x80);\r
+ int entry, y, sx_min, onscr_x, maybe_op = 0;\r
+\r
+ sx_min = 8-(width<<3);\r
+ onscr_x = sx_min < sx && sx < max_width;\r
+ if (sh && (code2 & 0x6000) == 0x6000)\r
+ maybe_op = SPRL_MAY_HAVE_OP;\r
+\r
+ entry = ((pd - HighPreSpr) / 2) | ((code2>>8)&0x80);\r
+ y = (sy >= DrawScanline) ? sy : DrawScanline;\r
for (; y < sy + (height<<3) && y < max_lines; y++)\r
{\r
- int cnt = HighLnSpr[y][0];\r
+ unsigned char *p = &HighLnSpr[y][0];\r
+ int cnt = p[0];\r
if (cnt >= max_line_sprites) continue; // sprite limit?\r
\r
- if (HighLnSpr[y][1] >= max_line_sprites*2) { // tile limit?\r
- HighLnSpr[y][0] |= 0x80;\r
+ if (p[2] >= max_line_sprites*2) { // tile limit?\r
+ p[0] |= 0x80;\r
continue;\r
}\r
- HighLnSpr[y][1] += width;\r
+ p[2] += width;\r
\r
if (sx == -0x78) {\r
if (cnt > 0)\r
- HighLnSpr[y][0] |= 0x80; // masked, no more sprites for this line\r
+ p[0] |= 0x80; // masked, no more sprites for this line\r
continue;\r
}\r
// must keep the first sprite even if it's offscreen, for masking\r
- if (cnt > 0 && (sx <= sx_min || sx >= max_width)) continue; // offscreen x\r
-\r
- HighLnSpr[y][2+cnt] = entry;\r
- HighLnSpr[y][0] = cnt + 1;\r
- if (entry & 0x80)\r
- rendstatus |= PDRAW_HAVE_HI_SPR;\r
- else rendstatus |= PDRAW_HAVE_LO_SPR;\r
+ if (cnt > 0 && !onscr_x) continue; // offscreen x\r
+\r
+ p[3+cnt] = entry;\r
+ p[0] = cnt + 1;\r
+ p[1] |= (entry & 0x80) ? SPRL_HAVE_HI : SPRL_HAVE_LO;\r
+ p[1] |= maybe_op; // there might be op sprites on this line\r
+ if (cnt > 0 && (code2 & 0x8000) && !(p[3+cnt-1]&0x80))\r
+ p[1] |= SPRL_LO_ABOVE_HI;\r
}\r
}\r
\r
for (u = 0; u < max_lines; u++)\r
{\r
int y;\r
- printf("c%03i: %2i, %2i: ", u, HighLnSpr[u][0] & 0x7f, HighLnSpr[u][1]);\r
+ printf("c%03i: %2i, %2i: ", u, HighLnSpr[u][0] & 0x7f, HighLnSpr[u][2]);\r
for (y = 0; y < HighLnSpr[u][0] & 0x7f; y++)\r
- printf(" %i", HighLnSpr[u][y+2]);\r
+ printf(" %i", HighLnSpr[u][y+3]);\r
printf("\n");\r
}\r
#endif\r
}\r
\r
#ifndef _ASM_DRAW_C\r
-static void DrawAllSprites(int prio, int sh)\r
+static void DrawAllSprites(unsigned char *sprited, int prio, int sh)\r
{\r
- int rs = rendstatus, scan = DrawScanline;\r
+ int rs = rendstatus;\r
unsigned char *p;\r
int cnt;\r
\r
rendstatus = rs & ~(PDRAW_SPRITES_MOVED|PDRAW_DIRTY_SPRITES);\r
}\r
\r
- cnt = HighLnSpr[scan][0] & 0x7f;\r
+ cnt = sprited[0] & 0x7f;\r
if (cnt == 0) return;\r
\r
- p = &HighLnSpr[scan][2];\r
+ p = &sprited[3];\r
\r
// Go through sprites backwards:\r
for (cnt--; cnt >= 0; cnt--)\r
unsigned short HighPal[0x100];\r
\r
#ifndef _ASM_DRAW_C\r
+void PicoDoHighPal555(int sh)\r
+{\r
+ unsigned short *pal=HighPal;\r
+ int i, t;\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
+#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
+ }\r
+\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
+ // 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
+ }\r
+ }\r
+}\r
+\r
static void FinalizeLineBGR444(int sh)\r
{\r
unsigned short *pd=DrawLineDest;\r
unsigned short *pd=DrawLineDest;\r
unsigned char *ps=HighCol+8;\r
unsigned short *pal=HighPal;\r
- int len, i, t, dirtyPal = Pico.m.dirtyPal;\r
+ int len;\r
\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 (sh)\r
- {\r
- if (dirtyPal) {\r
- // shadowed pixels\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
- 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
+ if (Pico.m.dirtyPal)\r
+ PicoDoHighPal555(sh);\r
\r
if (Pico.video.reg[12]&1) {\r
len = 320;\r
\r
{\r
#ifndef PSP\r
- int mask=0xff;\r
+ int i, mask=0xff;\r
if (!sh && (rendstatus & PDRAW_ACC_SPRITES))\r
mask=0x3f; // accurate sprites, upper bits are priority stuff\r
\r
PicoScanEnd(DrawScanline);\r
}\r
\r
-static int DrawDisplay(int sh, int as)\r
+static int DrawDisplay(int sh)\r
{\r
+ unsigned char *sprited = &HighLnSpr[DrawScanline][0];\r
struct PicoVideo *pvid=&Pico.video;\r
int win=0,edge=0,hvwind=0;\r
- int maxw, maxcells;\r
+ int maxw,maxcells;\r
\r
rendstatus &= ~(PDRAW_SHHI_DONE|PDRAW_PLANE_HI_PRIO);\r
\r
- if(pvid->reg[12]&1) {\r
+ if (pvid->reg[12]&1) {\r
maxw = 328; maxcells = 40;\r
} else {\r
maxw = 264; maxcells = 32;\r
if (win&0x80) { if (DrawScanline>=edge) hvwind=1; }\r
else { if (DrawScanline< 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
+ {\r
win=pvid->reg[0x11];\r
edge=win&0x1f;\r
if (win&0x80) {\r
}\r
}\r
\r
- DrawLayer(1|((sh|as)<<1), HighCacheB, 0, maxcells);\r
- if (hvwind == 1)\r
- DrawWindow(0, maxcells>>1, 0, sh|as);\r
+ /* - layer B low - */\r
+ if (PicoDrawMask & PDRAW_LAYERB_ON)\r
+ DrawLayer(1|(sh<<1), HighCacheB, 0, maxcells);\r
+ /* - layer A low - */\r
+ if (!(PicoDrawMask & PDRAW_LAYERA_ON));\r
+ else if (hvwind == 1)\r
+ DrawWindow(0, maxcells>>1, 0, sh);\r
else if (hvwind == 2) {\r
- // ahh, we have vertical window\r
- DrawLayer(0|((sh|as)<<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|as);\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|((sh|as)<<1), HighCacheA, 0, maxcells);\r
- if (rendstatus & PDRAW_HAVE_LO_SPR)\r
- DrawAllSpritesLoPri(0, sh);\r
-\r
- if (HighCacheB[0]) DrawTilesFromCache(HighCacheB, sh, maxw);\r
- if (hvwind == 1)\r
+ DrawLayer(0|(sh<<1), HighCacheA, 0, maxcells);\r
+ /* - sprites low - */\r
+ if (!(PicoDrawMask & PDRAW_SPRITES_LOW_ON));\r
+ else if (rendstatus & PDRAW_INTERLACE)\r
+ DrawAllSpritesInterlace(0, sh);\r
+ else if (sprited[1] & SPRL_HAVE_LO)\r
+ DrawAllSprites(sprited, 0, sh);\r
+\r
+ /* - layer B hi - */\r
+ if ((PicoDrawMask & PDRAW_LAYERB_ON) && HighCacheB[0])\r
+ DrawTilesFromCache(HighCacheB, sh, maxw);\r
+ /* - layer A hi - */\r
+ if (!(PicoDrawMask & PDRAW_LAYERA_ON));\r
+ else if (hvwind == 1)\r
DrawWindow(0, maxcells>>1, 1, sh);\r
else if (hvwind == 2) {\r
- if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, (win&0x80) ? edge<<4 : maxw);\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
} else\r
if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, maxw);\r
- if ((rendstatus & PDRAW_HAVE_HI_SPR) || sh)\r
- DrawAllSpritesHiPri(1, sh);\r
+ /* - sprites hi - */\r
+ if (!(PicoDrawMask & PDRAW_SPRITES_HI_ON));\r
+ else if (rendstatus & PDRAW_INTERLACE)\r
+ DrawAllSpritesInterlace(1, sh);\r
+ // AS on and have both lo/hi sprites and lo before hi sprites?\r
+ else if ((sprited[1] & 0xd0) == 0xd0 && (rendstatus & PDRAW_ACC_SPRITES))\r
+ DrawSpritesHiAS(sprited, sh);\r
+ else if (sh && (sprited[1] & SPRL_MAY_HAVE_OP))\r
+ DrawSpritesSHi(sprited);\r
+ else if (sprited[1] & SPRL_HAVE_HI)\r
+ DrawAllSprites(sprited, 1, 0);\r
\r
#if 0\r
{\r
PICO_INTERNAL void PicoFrameStart(void)\r
{\r
// prepare to do this frame\r
- int sh = Pico.video.reg[0xC] & 8; // shadow/hilight?\r
rendstatus = 0;\r
if (PicoOpt & POPT_ACC_SPRITES)\r
rendstatus |= PDRAW_ACC_SPRITES;\r
-\r
- if (sh)\r
- {\r
- DrawAllSpritesLoPri = DrawAllSprites;\r
- DrawAllSpritesHiPri = DrawSpritesSHi;\r
- }\r
- else\r
- {\r
- DrawAllSpritesLoPri =\r
- DrawAllSpritesHiPri = DrawAllSprites;\r
- }\r
- if (rendstatus & PDRAW_ACC_SPRITES)\r
- DrawAllSpritesHiPri = DrawSpritesHiAS;\r
- if ((Pico.video.reg[12]&6) == 6) {\r
+ if ((Pico.video.reg[12]&6) == 6)\r
rendstatus |= PDRAW_INTERLACE; // interlace mode\r
- DrawAllSpritesLoPri =\r
- DrawAllSpritesHiPri = DrawAllSpritesInterlace;\r
- }\r
\r
if (Pico.m.dirtyPal) Pico.m.dirtyPal = 2; // reset dirty if needed\r
\r
\r
static void PicoLine(void)\r
{\r
- int sh, as = 0;\r
+ int sh;\r
if (skip_next_line>0) { skip_next_line--; return; } // skip rendering lines\r
\r
sh=(Pico.video.reg[0xC]&8)>>3; // shadow/hilight?\r
- if (rendstatus & PDRAW_ACC_SPRITES) as|=1; // accurate sprites\r
\r
if (PicoScanBegin != NULL)\r
skip_next_line = PicoScanBegin(DrawScanline);\r
\r
// Draw screen:\r
- BackFill(Pico.video.reg[7], sh|as);\r
+ BackFill(Pico.video.reg[7], sh);\r
if (Pico.video.reg[1]&0x40)\r
- DrawDisplay(sh, as);\r
+ DrawDisplay(sh);\r
\r
if (FinalizeLine != NULL)\r
FinalizeLine(sh);\r
}\r
\r
#if !CAN_HANDLE_240_LINES\r
- if (DrawScanline >= 224) DrawScanline = 240, return;\r
+ if (DrawScanline >= 224) { DrawScanline = 240; return; }\r
#endif\r
\r
// last line\r
notaz.gp2x.de / picodrive.git / blobdiff