X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=picodrive.git;a=blobdiff_plain;f=pico%2F32x%2Fdraw.c;h=f80215024af8135a9f228e0defcfaf19ae53a58d;hp=66814abd0a6314742c0ef6911907612f65ac641d;hb=e0bcb7a90d06b295b1ca989b6ad70412912cca5b;hpb=cff531af94bd9c9c89ae162e80f48ddc26a4e504 diff --git a/pico/32x/draw.c b/pico/32x/draw.c index 66814ab..f802150 100644 --- a/pico/32x/draw.c +++ b/pico/32x/draw.c @@ -43,7 +43,7 @@ static void convert_pal555(int invert_prio) \ for (i = 320; i > 0; i--, pd++, p32x++, pmd++) { \ unsigned short t = *p32x; \ - if (*pmd != mdbg && !((t ^ inv) & 0x8000)) { \ + if ((*pmd & 0x3f) != mdbg && !((t ^ inv) & 0x8000)) { \ pmd_draw_code; \ continue; \ } \ @@ -59,7 +59,7 @@ static void convert_pal555(int invert_prio) int i; \ for (i = 320; i > 0; i--, pd++, p32x++, pmd++) { \ t = pal[*(unsigned char *)((long)p32x ^ 1)]; \ - if ((t & 0x20) || *pmd == mdbg) \ + if ((t & 0x20) || (*pmd & 0x3f) == mdbg) \ *pd = t; \ else \ pmd_draw_code; \ @@ -74,7 +74,7 @@ static void convert_pal555(int invert_prio) for (i = 320; i > 0; p32x++) { \ t = pal[*p32x & 0xff]; \ for (len = (*p32x >> 8) + 1; len > 0 && i > 0; len--, i--, pd++, pmd++) { \ - if (*pmd == mdbg || (t & 0x20)) \ + if ((*pmd & 0x3f) == mdbg || (t & 0x20)) \ *pd = t; \ else \ pmd_draw_code; \ @@ -82,20 +82,21 @@ static void convert_pal555(int invert_prio) } \ } -void FinalizeLine32xRGB555(int sh, int line) +// this is almost never used (Wiz and menu bg gen only) +void FinalizeLine32xRGB555(int sh, int line, struct PicoEState *est) { - unsigned short *pd = DrawLineDest; + unsigned short *pd = est->DrawLineDest; unsigned short *pal = Pico32xMem->pal_native; - unsigned char *pmd = HighCol + 8; + unsigned char *pmd = est->HighCol + 8; unsigned short *dram, *p32x; unsigned char mdbg; - FinalizeLine555(sh, line); + FinalizeLine555(sh, line, est); if ((Pico32x.vdp_regs[0] & P32XV_Mx) == 0 || // 32x blanking // XXX: how is 32col mode hadled by real hardware? !(Pico.video.reg[12] & 1) || // 32col mode - !(PicoDrawMask & PDRAW_32X_ON)) + (Pico.video.debug_p & PVD_KILL_32X)) { return; } @@ -129,7 +130,7 @@ void FinalizeLine32xRGB555(int sh, int line) #define PICOSCAN_PRE \ PicoScan32xBegin(l + (lines_sft_offs & 0xff)); \ - dst = DrawLineDest; \ + dst = Pico.est.DrawLineDest; \ #define PICOSCAN_POST \ PicoScan32xEnd(l + (lines_sft_offs & 0xff)); \ @@ -140,9 +141,9 @@ static void do_loop_dc##name(unsigned short *dst, \ unsigned short *dram, int lines_sft_offs, int mdbg) \ { \ int inv_bit = (Pico32x.vdp_regs[0] & P32XV_PRI) ? 0x8000 : 0; \ - unsigned char *pmd = PicoDraw2FB + \ + unsigned char *pmd = Pico.est.Draw2FB + \ 328 * (lines_sft_offs & 0xff) + 8; \ - unsigned short *palmd = HighPal; \ + unsigned short *palmd = Pico.est.HighPal; \ unsigned short *p32x; \ int lines = lines_sft_offs >> 16; \ int l; \ @@ -160,9 +161,9 @@ static void do_loop_pp##name(unsigned short *dst, \ unsigned short *dram, int lines_sft_offs, int mdbg) \ { \ unsigned short *pal = Pico32xMem->pal_native; \ - unsigned char *pmd = PicoDraw2FB + \ + unsigned char *pmd = Pico.est.Draw2FB + \ 328 * (lines_sft_offs & 0xff) + 8; \ - unsigned short *palmd = HighPal; \ + unsigned short *palmd = Pico.est.HighPal; \ unsigned char *p32x; \ int lines = lines_sft_offs >> 16; \ int l; \ @@ -181,9 +182,9 @@ static void do_loop_rl##name(unsigned short *dst, \ unsigned short *dram, int lines_sft_offs, int mdbg) \ { \ unsigned short *pal = Pico32xMem->pal_native; \ - unsigned char *pmd = PicoDraw2FB + \ + unsigned char *pmd = Pico.est.Draw2FB + \ 328 * (lines_sft_offs & 0xff) + 8; \ - unsigned short *palmd = HighPal; \ + unsigned short *palmd = Pico.est.HighPal; \ unsigned short *p32x; \ int lines = lines_sft_offs >> 16; \ int l; \ @@ -227,7 +228,7 @@ void PicoDraw32xLayer(int offs, int lines, int md_bg) int lines_sft_offs; int which_func; - DrawLineDest = (char *)DrawLineDestBase + offs * DrawLineDestIncrement; + Pico.est.DrawLineDest = (char *)DrawLineDestBase + offs * DrawLineDestIncrement; dram = Pico32xMem->dram[Pico32x.vdp_regs[0x0a/2] & P32XV_FS]; if (Pico32xDrawMode == PDM32X_BOTH) { @@ -265,7 +266,7 @@ do_it: if (Pico32x.vdp_regs[2 / 2] & P32XV_SFT) lines_sft_offs |= 1 << 8; - do_loop[which_func](DrawLineDest, dram, lines_sft_offs, md_bg); + do_loop[which_func](Pico.est.DrawLineDest, dram, lines_sft_offs, md_bg); } // mostly unused, games tend to keep 32X layer on @@ -273,8 +274,8 @@ void PicoDraw32xLayerMdOnly(int offs, int lines) { int have_scan = PicoScan32xBegin != NULL && PicoScan32xEnd != NULL; unsigned short *dst = (void *)((char *)DrawLineDestBase + offs * DrawLineDestIncrement); - unsigned char *pmd = PicoDraw2FB + 328 * offs + 8; - unsigned short *pal = HighPal; + unsigned char *pmd = Pico.est.Draw2FB + 328 * offs + 8; + unsigned short *pal = Pico.est.HighPal; int poffs = 0, plen = 320; int l, p; @@ -291,7 +292,7 @@ void PicoDraw32xLayerMdOnly(int offs, int lines) for (l = 0; l < lines; l++) { if (have_scan) { PicoScan32xBegin(l + offs); - dst = DrawLineDest + poffs; + dst = Pico.est.DrawLineDest + poffs; } for (p = 0; p < plen; p += 4) { dst[p + 0] = pal[*pmd++]; @@ -306,20 +307,23 @@ void PicoDraw32xLayerMdOnly(int offs, int lines) } } -void PicoDraw32xSetFrameMode(int is_on, int only_32x) +void PicoDrawSetOutFormat32x(pdso_t which, int use_32x_line_mode) { #ifdef _ASM_32X_DRAW extern void *Pico32xNativePal; Pico32xNativePal = Pico32xMem->pal_native; #endif - if (is_on) { - // use the same layout as alt renderer - PicoDrawSetInternalBuf(PicoDraw2FB, 328); - Pico32xDrawMode = only_32x ? PDM32X_32X_ONLY : PDM32X_BOTH; - } else { + if (which == PDF_RGB555 && use_32x_line_mode) { + // we'll draw via FinalizeLine32xRGB555 (rare) PicoDrawSetInternalBuf(NULL, 0); Pico32xDrawMode = PDM32X_OFF; + return; } + + // use the same layout as alt renderer + PicoDrawSetInternalBuf(Pico.est.Draw2FB, 328); + Pico32xDrawMode = (which == PDF_RGB555) ? PDM32X_32X_ONLY : PDM32X_BOTH; } +// vim:shiftwidth=2:ts=2:expandtab