X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FDraw.c;h=1c562f6b45307e51d9e0948251da2d73bb2d3e25;hb=70357ce52578dee0dd3b3663902cf872c3d34258;hp=dec7abd156ce2f6822d571e308238c4e0b874c2b;hpb=7a7c6476f31d4b88b0aae876e94bc49733b36e83;p=picodrive.git diff --git a/Pico/Draw.c b/Pico/Draw.c index dec7abd..1c562f6 100644 --- a/Pico/Draw.c +++ b/Pico/Draw.c @@ -8,14 +8,18 @@ #include "PicoInt.h" -#ifndef __GNUC__ -#pragma warning (disable:4706) // Disable assignment within conditional -#endif int (*PicoScan)(unsigned int num, void *data)=NULL; -unsigned short DefOutBuff[320*2]; +#if OVERRIDE_HIGHCOL +static unsigned char DefHighCol[8+320+8]; +unsigned char *HighCol=DefHighCol; +#else unsigned char HighCol[8+320+8]; +#endif +unsigned short DefOutBuff[320*2]; +void *DrawLineDest=DefOutBuff; // pointer to dest buffer where to draw this line to + static int HighCacheA[41+1]; // caches for high layers static int HighCacheB[41+1]; static int HighCacheS[80+1]; // and sprites @@ -25,7 +29,6 @@ char HighSprZ[320+8+8]; // Z-buffer for accurate sprites and shadow/hilight mode // lsb->msb: moved sprites, not all window tiles use same priority, accurate sprites (copied from PicoOpt), interlace // dirty sprites, sonic mode, have layer with all hi prio tiles (mk3), layer sh/hi already processed int rendstatus; -void *DrawLineDest=DefOutBuff; // pointer to dest buffer where to draw this line to int Scanline=0; // Scanline static int SpriteBlocks; @@ -48,7 +51,7 @@ void BackFill(int reg7, int sh); void DrawSprite(int *sprite, int **hc, int sh); void DrawTilesFromCache(int *hc, int sh, int rlim); void DrawSpritesFromCache(int *hc, int sh); -void DrawLayer(int plane, int *hcache, int maxcells, int sh); +void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells); void FinalizeLineBGR444(int sh); void FinalizeLineRGB555(int sh); void blockcpy_or(void *dst, void *src, size_t n, int pat); @@ -271,20 +274,22 @@ static int TileFlipZSH(int sx,int addr,int pal,int zval) // -------------------------------------------- #ifndef _ASM_DRAW_C -static void DrawStrip(struct TileStrip *ts, int sh) +static void DrawStrip(struct TileStrip *ts, int plane_sh, int cellskip) { - int tilex=0,dx=0,ty=0,code=0,addr=0,cells; + int tilex,dx,ty,code=0,addr=0,cells; int oldcode=-1,blank=-1; // The tile we know is blank - int pal=0; + int pal=0,sh; // Draw tiles across screen: - tilex=(-ts->hscroll)>>3; + sh=(plane_sh<<5)&0x40; + tilex=((-ts->hscroll)>>3)+cellskip; ty=(ts->line&7)<<1; // Y-Offset into tile dx=((ts->hscroll-1)&7)+1; - cells = ts->cells; + cells = ts->cells - cellskip; if(dx != 8) cells++; // have hscroll, need to draw 1 cell more + dx+=cellskip<<3; - for (; cells; dx+=8,tilex++,cells--) + for (; cells > 0; dx+=8,tilex++,cells--) { int zero=0; @@ -304,8 +309,7 @@ static void DrawStrip(struct TileStrip *ts, int sh) addr+=ty; if (code&0x1000) addr^=0xe; // Y-flip -// pal=Pico.cram+((code>>9)&0x30); - pal=((code>>9)&0x30)|(sh<<6); + pal=((code>>9)&0x30)|sh; } if (code&0x0800) zero=TileFlip(dx,addr,pal); @@ -321,34 +325,28 @@ static void DrawStrip(struct TileStrip *ts, int sh) } // this is messy -void DrawStripVSRam(struct TileStrip *ts, int plane) +void DrawStripVSRam(struct TileStrip *ts, int plane_sh, int cellskip) { - int tilex=0,dx=0,ty=0,code=0,addr=0,cell=0,nametabadd=0; + int tilex,dx,code=0,addr=0,cell=0; int oldcode=-1,blank=-1; // The tile we know is blank int pal=0,scan=Scanline; // Draw tiles across screen: tilex=(-ts->hscroll)>>3; dx=((ts->hscroll-1)&7)+1; - if(dx != 8) { - int vscroll, line; - cell--; // have hscroll, start with negative cell - // also calculate intial VS stuff - vscroll=Pico.vsram[plane]; - - // Find the line in the name table - line=(vscroll+scan)&ts->line&0xffff; // ts->line is really ymask .. - nametabadd=(line>>3)<<(ts->line>>24); // .. and shift[width] - ty=(line&7)<<1; // Y-Offset into tile - } + if(dx != 8) cell--; // have hscroll, start with negative cell + cell+=cellskip; + tilex+=cellskip; + dx+=cellskip<<3; for (; cell < ts->cells; dx+=8,tilex++,cell++) { - int zero=0; + int zero=0,nametabadd,ty; - if((cell&1)==0) { + //if((cell&1)==0) + { int line,vscroll; - vscroll=Pico.vsram[plane+(cell&~1)]; + vscroll=Pico.vsram[(plane_sh&1)+(cell&~1)]; // Find the line in the name table line=(vscroll+scan)&ts->line&0xffff; // ts->line is really ymask .. @@ -371,8 +369,7 @@ void DrawStripVSRam(struct TileStrip *ts, int plane) addr=(code&0x7ff)<<4; if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip -// pal=Pico.cram+((code>>9)&0x30); - pal=((code>>9)&0x30); + pal=((code>>9)&0x30)|((plane_sh<<5)&0x40); } if (code&0x0800) zero=TileFlip(dx,addr,pal); @@ -440,7 +437,7 @@ void DrawStripInterlace(struct TileStrip *ts) // -------------------------------------------- #ifndef _ASM_DRAW_C -static void DrawLayer(int plane, int *hcache, int maxcells, int sh) +static void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells) { struct PicoVideo *pvid=&Pico.video; const char shift[4]={5,6,5,7}; // 32,64 or 128 sized tilemaps (2 is invalid) @@ -463,20 +460,20 @@ static void DrawLayer(int plane, int *hcache, int maxcells, int sh) else if(width>1) ymask =0x0ff; // Find name table: - if (plane==0) ts.nametab=(pvid->reg[2]&0x38)<< 9; // A - else ts.nametab=(pvid->reg[4]&0x07)<<12; // B + if (plane_sh&1) ts.nametab=(pvid->reg[4]&0x07)<<12; // B + else ts.nametab=(pvid->reg[2]&0x38)<< 9; // A htab=pvid->reg[13]<<9; // Horizontal scroll table address if ( pvid->reg[11]&2) htab+=Scanline<<1; // Offset by line if ((pvid->reg[11]&1)==0) htab&=~0xf; // Offset by tile - htab+=plane; // A or B + htab+=plane_sh&1; // A or B // Get horizontal scroll value, will be masked later ts.hscroll=Pico.vram[htab&0x7fff]; if((pvid->reg[12]&6) == 6) { // interlace mode 2 - vscroll=Pico.vsram[plane]; // Get vertical scroll value + vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value // Find the line in the name table ts.line=(vscroll+(Scanline<<1))&((ymask<<1)|1); @@ -487,15 +484,15 @@ static void DrawLayer(int plane, int *hcache, int maxcells, int sh) // shit, we have 2-cell column based vscroll // luckily this doesn't happen too often ts.line=ymask|(shift[width]<<24); // save some stuff instead of line - DrawStripVSRam(&ts, plane); + DrawStripVSRam(&ts, plane_sh, cellskip); } else { - vscroll=Pico.vsram[plane]; // Get vertical scroll value + vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value // Find the line in the name table ts.line=(vscroll+Scanline)&ymask; ts.nametab+=(ts.line>>3)<= 0; i--) - pal[i] = (unsigned short) (((ppal[i]&0x00f)<<12)|((ppal[i]&0x0f0)<<3)|((ppal[i]&0xf00)>>7)); + 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 (Pico.video.reg[12]&1) { - len = 320; - } else { - if(!(PicoOpt&0x100)) pd+=32; - len = 256; - } - - if(sh) { - if(dirtyPal) { + if (sh) + { + if (dirtyPal) { // shadowed pixels - for(i = 0x3f; i >= 0; i--) + 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--) { + 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; } } } - for(i = 0; i < len; i++) + if (Pico.video.reg[12]&1) { + len = 320; + } else { + if (!(PicoOpt&0x100)) pd+=32; + len = 256; + } + +#ifndef PSP + for (i = 0; i < len; i++) pd[i] = pal[ps[i]]; +#else + { + extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count); + amips_clut(pd, ps, pal, len); + } +#endif } #endif @@ -1259,7 +1270,7 @@ static void FinalizeLine8bit(int sh) } } -void (*FinalizeLine)(int sh) = FinalizeLineBGR444; +static void (*FinalizeLine)(int sh) = FinalizeLineBGR444; // -------------------------------------------- @@ -1297,22 +1308,22 @@ static int DrawDisplay(int sh) } } - DrawLayer(1, HighCacheB, maxcells, sh); + DrawLayer(1|(sh<<1), HighCacheB, 0, maxcells); if (hvwind == 1) - DrawWindow(0, maxcells>>1, 0, sh); // HighCacheAW + DrawWindow(0, maxcells>>1, 0, sh); else if (hvwind == 2) { // ahh, we have vertical window - DrawLayer(0, HighCacheA, (win&0x80) ? edge<<1 : maxcells, sh); - DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 0, sh); // HighCacheW + DrawLayer(0|(sh<<1), HighCacheA, (win&0x80) ? 0 : edge<<1, (win&0x80) ? edge<<1 : maxcells); + DrawWindow( (win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 0, sh); } else - DrawLayer(0, HighCacheA, maxcells, sh); + DrawLayer(0|(sh<<1), HighCacheA, 0, maxcells); DrawAllSprites(HighCacheS, maxw, 0, sh); if (HighCacheB[0]) DrawTilesFromCache(HighCacheB, sh, 328); if (hvwind == 1) DrawWindow(0, maxcells>>1, 1, sh); else if (hvwind == 2) { - if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, (win&0x80) ? edge<<4 : 0); + if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, (win&0x80) ? edge<<4 : 328); DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 1, sh); } else if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, 328); @@ -1360,8 +1371,8 @@ PICO_INTERNAL int PicoLine(int scan) if (Pico.video.reg[1]&0x40) DrawDisplay(sh); - FinalizeLine(sh); - //if (SpriteBlocks & (1<<(scan>>3))) for (sh=0; sh < 30; sh++) DrawLineDest[sh] = 0xf; + if (FinalizeLine != NULL) + FinalizeLine(sh); Skip=PicoScan(Scanline,DrawLineDest); @@ -1371,9 +1382,15 @@ PICO_INTERNAL int PicoLine(int scan) void PicoDrawSetColorFormat(int which) { - if (which == 2) - FinalizeLine = FinalizeLine8bit; - else if (which == 1) - FinalizeLine = FinalizeLineRGB555; - else FinalizeLine = FinalizeLineBGR444; + switch (which) + { + case 2: FinalizeLine = FinalizeLine8bit; break; + case 1: FinalizeLine = FinalizeLineRGB555; break; + case 0: FinalizeLine = FinalizeLineBGR444; break; + default:FinalizeLine = NULL; break; + } +#if OVERRIDE_HIGHCOL + if (which) HighCol=DefHighCol; +#endif } +