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=027b963c92a2eb3c3518226a0119d7475220b457;hb=e0bcb7a90d06b295b1ca989b6ad70412912cca5b;hpb=5a68108691ed5685682ce133aa0bcf6015c0afd8 diff --git a/pico/32x/draw.c b/pico/32x/draw.c index 027b963..f802150 100644 --- a/pico/32x/draw.c +++ b/pico/32x/draw.c @@ -1,3 +1,10 @@ +/* + * PicoDrive + * (C) notaz, 2009,2010 + * + * This work is licensed under the terms of MAME license. + * See COPYING file in the top-level directory. + */ #include "../pico_int.h" int (*PicoScan32xBegin)(unsigned int num); @@ -36,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; \ } \ @@ -50,19 +57,12 @@ static void convert_pal555(int invert_prio) { \ unsigned short t; \ int i; \ - for (i = 320/2; i > 0; i--, p32x++) { \ - t = pal[*p32x >> 8]; \ - if (*pmd == mdbg || (t & 0x20)) \ - *pd = t; \ - else \ - pmd_draw_code; \ - pd++; pmd++; \ - t = pal[*p32x & 0xff]; \ - if (*pmd == mdbg || (t & 0x20)) \ + for (i = 320; i > 0; i--, pd++, p32x++, pmd++) { \ + t = pal[*(unsigned char *)((long)p32x ^ 1)]; \ + if ((t & 0x20) || (*pmd & 0x3f) == mdbg) \ *pd = t; \ else \ pmd_draw_code; \ - pd++; pmd++; \ } \ } @@ -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; } @@ -114,7 +115,10 @@ void FinalizeLine32xRGB555(int sh, int line) convert_pal555(Pico32x.vdp_regs[0] & P32XV_PRI); if ((Pico32x.vdp_regs[0] & P32XV_Mx) == 1) { // Packed Pixel Mode - do_line_pp(pd, p32x, pmd,); + unsigned char *p32xb = (void *)p32x; + if (Pico32x.vdp_regs[2 / 2] & P32XV_SFT) + p32xb++; + do_line_pp(pd, p32xb, pmd,); } else { // Run Length Mode do_line_rl(pd, p32x, pmd,); @@ -125,22 +129,23 @@ void FinalizeLine32xRGB555(int sh, int line) *dst = palmd[*pmd] #define PICOSCAN_PRE \ - PicoScan32xBegin(l + (lines_offs & 0xff)); \ - dst = DrawLineDest; \ + PicoScan32xBegin(l + (lines_sft_offs & 0xff)); \ + dst = Pico.est.DrawLineDest; \ #define PICOSCAN_POST \ - PicoScan32xEnd(l + (lines_offs & 0xff)); \ + PicoScan32xEnd(l + (lines_sft_offs & 0xff)); \ #define make_do_loop(name, pre_code, post_code, md_code) \ /* Direct Color Mode */ \ static void do_loop_dc##name(unsigned short *dst, \ - unsigned short *dram, int lines_offs, int mdbg) \ + unsigned short *dram, int lines_sft_offs, int mdbg) \ { \ int inv_bit = (Pico32x.vdp_regs[0] & P32XV_PRI) ? 0x8000 : 0; \ - unsigned char *pmd = PicoDraw2FB + 328 * 8 + 8; \ - unsigned short *palmd = HighPal; \ + unsigned char *pmd = Pico.est.Draw2FB + \ + 328 * (lines_sft_offs & 0xff) + 8; \ + unsigned short *palmd = Pico.est.HighPal; \ unsigned short *p32x; \ - int lines = lines_offs >> 16; \ + int lines = lines_sft_offs >> 16; \ int l; \ (void)palmd; \ for (l = 0; l < lines; l++, pmd += 8) { \ @@ -153,18 +158,20 @@ static void do_loop_dc##name(unsigned short *dst, \ \ /* Packed Pixel Mode */ \ static void do_loop_pp##name(unsigned short *dst, \ - unsigned short *dram, int lines_offs, int mdbg) \ + unsigned short *dram, int lines_sft_offs, int mdbg) \ { \ unsigned short *pal = Pico32xMem->pal_native; \ - unsigned char *pmd = PicoDraw2FB + 328 * 8 + 8; \ - unsigned short *palmd = HighPal; \ - unsigned short *p32x; \ - int lines = lines_offs >> 16; \ + unsigned char *pmd = Pico.est.Draw2FB + \ + 328 * (lines_sft_offs & 0xff) + 8; \ + unsigned short *palmd = Pico.est.HighPal; \ + unsigned char *p32x; \ + int lines = lines_sft_offs >> 16; \ int l; \ (void)palmd; \ for (l = 0; l < lines; l++, pmd += 8) { \ pre_code; \ - p32x = dram + dram[l]; \ + p32x = (void *)(dram + dram[l]); \ + p32x += (lines_sft_offs >> 8) & 1; \ do_line_pp(dst, p32x, pmd, md_code); \ post_code; \ } \ @@ -172,13 +179,14 @@ static void do_loop_pp##name(unsigned short *dst, \ \ /* Run Length Mode */ \ static void do_loop_rl##name(unsigned short *dst, \ - unsigned short *dram, int lines_offs, int mdbg) \ + unsigned short *dram, int lines_sft_offs, int mdbg) \ { \ unsigned short *pal = Pico32xMem->pal_native; \ - unsigned char *pmd = PicoDraw2FB + 328 * 8 + 8; \ - unsigned short *palmd = HighPal; \ + unsigned char *pmd = Pico.est.Draw2FB + \ + 328 * (lines_sft_offs & 0xff) + 8; \ + unsigned short *palmd = Pico.est.HighPal; \ unsigned short *p32x; \ - int lines = lines_offs >> 16; \ + int lines = lines_sft_offs >> 16; \ int l; \ (void)palmd; \ for (l = 0; l < lines; l++, pmd += 8) { \ @@ -217,12 +225,13 @@ void PicoDraw32xLayer(int offs, int lines, int md_bg) int have_scan = PicoScan32xBegin != NULL && PicoScan32xEnd != NULL; const do_loop_func *do_loop; unsigned short *dram; + int lines_sft_offs; int which_func; - DrawLineDest = DrawLineDestBase + offs * DrawLineDestIncrement; + Pico.est.DrawLineDest = (char *)DrawLineDestBase + offs * DrawLineDestIncrement; dram = Pico32xMem->dram[Pico32x.vdp_regs[0x0a/2] & P32XV_FS]; - if (Pico32xDrawMode == 2) { + if (Pico32xDrawMode == PDM32X_BOTH) { if (Pico.m.dirtyPal) PicoDrawUpdateHighPal(); } @@ -249,28 +258,72 @@ void PicoDraw32xLayer(int offs, int lines, int md_bg) } do_it: - if (Pico32xDrawMode == 2) + if (Pico32xDrawMode == PDM32X_BOTH) which_func = have_scan ? DO_LOOP_MD_SCAN : DO_LOOP_MD; else which_func = have_scan ? DO_LOOP_SCAN : DO_LOOP; + lines_sft_offs = (lines << 16) | offs; + if (Pico32x.vdp_regs[2 / 2] & P32XV_SFT) + lines_sft_offs |= 1 << 8; + + do_loop[which_func](Pico.est.DrawLineDest, dram, lines_sft_offs, md_bg); +} + +// mostly unused, games tend to keep 32X layer on +void PicoDraw32xLayerMdOnly(int offs, int lines) +{ + int have_scan = PicoScan32xBegin != NULL && PicoScan32xEnd != NULL; + unsigned short *dst = (void *)((char *)DrawLineDestBase + offs * DrawLineDestIncrement); + unsigned char *pmd = Pico.est.Draw2FB + 328 * offs + 8; + unsigned short *pal = Pico.est.HighPal; + int poffs = 0, plen = 320; + int l, p; + + if (!(Pico.video.reg[12] & 1)) { + // 32col mode + poffs = 32; + plen = 256; + } - do_loop[which_func](DrawLineDest, dram, (lines << 16) | offs, md_bg); + if (Pico.m.dirtyPal) + PicoDrawUpdateHighPal(); + + dst += poffs; + for (l = 0; l < lines; l++) { + if (have_scan) { + PicoScan32xBegin(l + offs); + dst = Pico.est.DrawLineDest + poffs; + } + for (p = 0; p < plen; p += 4) { + dst[p + 0] = pal[*pmd++]; + dst[p + 1] = pal[*pmd++]; + dst[p + 2] = pal[*pmd++]; + dst[p + 3] = pal[*pmd++]; + } + dst = (void *)((char *)dst + DrawLineDestIncrement); + pmd += 328 - plen; + if (have_scan) + PicoScan32xEnd(l + offs); + } } -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*8, 328); - Pico32xDrawMode = only_32x ? 1 : 2; - } else { + if (which == PDF_RGB555 && use_32x_line_mode) { + // we'll draw via FinalizeLine32xRGB555 (rare) PicoDrawSetInternalBuf(NULL, 0); - Pico32xDrawMode = 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