X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FDraw.c;h=15d09927f088451ef15a56aa3a30fa68f391b131;hb=6a13ef3f56a80ac698d463f5d00235ea2a090f52;hp=c07662495f1ba95a97fd46a4d5ac8a5c497e0d64;hpb=c060a9ab9c428e1ed9c4159b56529a2a36031e44;p=picodrive.git diff --git a/Pico/Draw.c b/Pico/Draw.c index c076624..15d0992 100644 --- a/Pico/Draw.c +++ b/Pico/Draw.c @@ -36,7 +36,6 @@ static int HighCacheA[41+1]; // caches for high layers static int HighCacheB[41+1]; int HighPreSpr[80*2+1]; // slightly preprocessed sprites -#define MAX_LINE_SPRITES 29 #define SPRL_HAVE_HI 0x80 // have hi priority sprites #define SPRL_HAVE_LO 0x40 // *lo* #define SPRL_MAY_HAVE_OP 0x20 // may have operator sprites on the line @@ -840,7 +839,7 @@ static void DrawSpritesSHi(unsigned char *sprited) } } } -#endif +#endif // !_ASM_DRAW_C static void DrawSpritesHiAS(unsigned char *sprited, int sh) { @@ -851,6 +850,8 @@ static void DrawSpritesHiAS(unsigned char *sprited, int sh) cnt = sprited[0] & 0x7f; if (cnt == 0) return; + rendstatus |= PDRAW_SPR_LO_ON_HI; + p = &sprited[3]; // Go through sprites: @@ -958,7 +959,7 @@ void PrepareSprites(int full) { int pack; // updates: tilecode, sx - for (u=0; u < max_lines && (pack = *pd); u++, pd+=2) + for (u=0; u < max_sprites && (pack = *pd); u++, pd+=2) { unsigned int *sprite; int code2, sx, sy, height; @@ -1010,7 +1011,7 @@ found:; for (u = 0; u < max_lines; u++) *((int *)&HighLnSpr[u][0]) = 0; - for (u = 0; u < max_lines; u++) + for (u = 0; u < max_sprites; u++) { unsigned int *sprite; int code, code2, sx, sy, hv, height, width; @@ -1140,6 +1141,37 @@ static void BackFill(int reg7, int sh) unsigned short HighPal[0x100]; #ifndef _ASM_DRAW_C +void PicoDoHighPal555(int sh) +{ + unsigned short *pal=HighPal; + int i, t; + + Pico.m.dirtyPal = 0; + + { + unsigned int *spal=(void *)Pico.cram; + unsigned int *dpal=(void *)HighPal; + for (i = 0x3f/2; i >= 0; i--) +#ifdef USE_BGR555 + dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4); +#else + dpal[i] = ((spal[i]&0x000f000f)<<12)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)>>7); +#endif + } + + if (sh) + { + // shadowed pixels + for (i = 0x3f; i >= 0; i--) + pal[0x40|i] = pal[0xc0|i] = (unsigned short)((pal[i]>>1)&0x738e); + // hilighted pixels + for (i = 0x3f; i >= 0; i--) { + t=pal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c; + pal[0x80|i]=(unsigned short)t; + } + } +} + static void FinalizeLineBGR444(int sh) { unsigned short *pd=DrawLineDest; @@ -1170,7 +1202,7 @@ static void FinalizeLineBGR444(int sh) } } - if (!sh && (rendstatus & PDRAW_ACC_SPRITES)) + if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI)) mask=0x3f; // accurate sprites for(i = 0; i < len; i++) @@ -1183,34 +1215,10 @@ static void FinalizeLineRGB555(int sh) unsigned short *pd=DrawLineDest; unsigned char *ps=HighCol+8; unsigned short *pal=HighPal; - int len, i, t, dirtyPal = Pico.m.dirtyPal; + int len; - if (dirtyPal) - { - unsigned int *spal=(void *)Pico.cram; - unsigned int *dpal=(void *)HighPal; - for (i = 0x3f/2; i >= 0; i--) -#ifdef USE_BGR555 - dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4); -#else - dpal[i] = ((spal[i]&0x000f000f)<<12)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)>>7); -#endif - Pico.m.dirtyPal = 0; - } - - if (sh) - { - if (dirtyPal) { - // shadowed pixels - for (i = 0x3f; i >= 0; i--) - pal[0x40|i] = pal[0xc0|i] = (unsigned short)((pal[i]>>1)&0x738e); - // hilighted pixels - for (i = 0x3f; i >= 0; i--) { - t=pal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c; - pal[0x80|i]=(unsigned short)t; - } - } - } + if (Pico.m.dirtyPal) + PicoDoHighPal555(sh); if (Pico.video.reg[12]&1) { len = 320; @@ -1221,8 +1229,8 @@ static void FinalizeLineRGB555(int sh) { #ifndef PSP - int mask=0xff; - if (!sh && (rendstatus & PDRAW_ACC_SPRITES)) + int i, mask=0xff; + if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI)) mask=0x3f; // accurate sprites, upper bits are priority stuff for (i = 0; i < len; i++) @@ -1230,7 +1238,7 @@ static void FinalizeLineRGB555(int sh) #else extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count); extern void amips_clut_6bit(unsigned short *dst, unsigned char *src, unsigned short *pal, int count); - if (!sh && (rendstatus & PDRAW_ACC_SPRITES)) + if (!sh && (rendstatus & PDRAW_SPR_LO_ON_HI)) amips_clut_6bit(pd, ps, pal, len); else amips_clut(pd, ps, pal, len); #endif @@ -1244,7 +1252,7 @@ static void FinalizeLine8bit(int sh) int len, rs = rendstatus; static int dirty_count; - if (!sh && !(rs & PDRAW_ACC_SPRITES) && Pico.m.dirtyPal == 1 && DrawScanline < 222) + if (!sh && Pico.m.dirtyPal == 1 && DrawScanline < 222) { // a hack for mid-frame palette changes if (!(rs & PDRAW_SONIC_MODE)) @@ -1368,8 +1376,8 @@ static int DrawDisplay(int sh) if (!(PicoDrawMask & PDRAW_SPRITES_HI_ON)); else if (rendstatus & PDRAW_INTERLACE) DrawAllSpritesInterlace(1, sh); - // AS on and have both lo/hi sprites and lo before hi sprites? - else if ((sprited[1] & 0xd0) == 0xd0 && (rendstatus & PDRAW_ACC_SPRITES)) + // have sprites without layer pri bit ontop of sprites with that bit + else if ((sprited[1] & 0xd0) == 0xd0 && (PicoOpt & POPT_ACC_SPRITES)) DrawSpritesHiAS(sprited, sh); else if (sh && (sprited[1] & SPRL_MAY_HAVE_OP)) DrawSpritesSHi(sprited); @@ -1388,13 +1396,11 @@ static int DrawDisplay(int sh) return 0; } - +// MUST be called every frame PICO_INTERNAL void PicoFrameStart(void) { // prepare to do this frame rendstatus = 0; - if (PicoOpt & POPT_ACC_SPRITES) - rendstatus |= PDRAW_ACC_SPRITES; if ((Pico.video.reg[12]&6) == 6) rendstatus |= PDRAW_INTERLACE; // interlace mode @@ -1424,7 +1430,7 @@ static void PicoLine(void) FinalizeLine(sh); if (PicoScanEnd != NULL) - PicoScanEnd(DrawScanline); + skip_next_line = PicoScanEnd(DrawScanline); } void PicoDrawSync(int to, int blank_last_line) @@ -1438,7 +1444,7 @@ void PicoDrawSync(int to, int blank_last_line) } #if !CAN_HANDLE_240_LINES - if (DrawScanline >= 224) DrawScanline = 240, return; + if (DrawScanline >= 224) { DrawScanline = 240; return; } #endif // last line @@ -1465,95 +1471,3 @@ void PicoDrawSetColorFormat(int which) #endif } -/* debug and fun */ -#define GREEN1 0x0700 -#ifdef USE_BGR555 - #define YELLOW1 0x071c - #define BLUE1 0xf000 - #define RED1 0x001e -#else - #define YELLOW1 0xe700 - #define BLUE1 0x001e - #define RED1 0xf000 -#endif - -static void set16(unsigned short *p, unsigned short d, int cnt) -{ - while (cnt-- > 0) - *p++ = d; -} - -void PicoDrawShowSpriteStats(unsigned short *screen, int stride) -{ - int lines, i, u, step; - unsigned short *dest; - unsigned char *p; - - step = (320-4*4-1) / MAX_LINE_SPRITES; - lines = 240; - if (!Pico.m.pal || !(Pico.video.reg[1]&8)) - lines = 224, screen += stride*8; - - for (i = 0; i < lines; i++) - { - dest = screen + stride*i; - p = &HighLnSpr[i][0]; - - // sprite graphs - for (u = 0; u < (p[0] & 0x7f); u++) { - set16(dest, (p[3+u] & 0x80) ? YELLOW1 : GREEN1, step); - dest += step; - } - - // flags - dest = screen + stride*i + 320-4*4; - if (p[1] & SPRL_HAVE_LO) set16(dest+4*0, GREEN1, 4); - if (p[1] & SPRL_HAVE_HI) set16(dest+4*1, YELLOW1, 4); - if (p[1] & SPRL_MAY_HAVE_OP) set16(dest+4*2, BLUE1, 4); - if (p[1] & SPRL_LO_ABOVE_HI) set16(dest+4*3, RED1, 4); - } - - // draw grid - for (i = step*5; i <= 320-4*4-1; i += step*5) { - for (u = 0; u < lines; u++) - screen[i + u*stride] = 0x182; - } -} - -void PicoDrawShowPalette(unsigned short *screen, int stride) -{ - unsigned int *spal=(void *)Pico.cram; - unsigned int *dpal=(void *)HighPal; - int x, y, i; - - for (i = 0x3f/2; i >= 0; i--) -#ifdef USE_BGR555 - dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4); -#else - dpal[i] = ((spal[i]&0x000f000f)<<12)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)>>7); -#endif - for (i = 0x3f; i >= 0; i--) - HighPal[0x40|i] = (unsigned short)((HighPal[i]>>1)&0x738e); - for (i = 0x3f; i >= 0; i--) { - int t=HighPal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c; - HighPal[0x80|i] = (unsigned short)t; - } - - screen += 16*stride+8; - for (y = 0; y < 8*4; y++) - for (x = 0; x < 8*16; x++) - screen[x + y*stride] = HighPal[x/8 + (y/8)*16]; - - screen += 160; - for (y = 0; y < 8*4; y++) - for (x = 0; x < 8*16; x++) - screen[x + y*stride] = HighPal[(x/8 + (y/8)*16) | 0x40]; - - screen += stride*48; - for (y = 0; y < 8*4; y++) - for (x = 0; x < 8*16; x++) - screen[x + y*stride] = HighPal[(x/8 + (y/8)*16) | 0x80]; - - Pico.m.dirtyPal = 1; -} -