\
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; \
} \
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; \
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; \
}
// this is almost never used (Wiz and menu bg gen only)
-void FinalizeLine32xRGB555(int sh, int line)
+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?
#define PICOSCAN_PRE \
PicoScan32xBegin(l + (lines_sft_offs & 0xff)); \
- dst = DrawLineDest; \
+ dst = Pico.est.DrawLineDest; \
#define PICOSCAN_POST \
PicoScan32xEnd(l + (lines_sft_offs & 0xff)); \
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; \
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; \
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; \
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) {
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
{
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;
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++];
}
// use the same layout as alt renderer
- PicoDrawSetInternalBuf(PicoDraw2FB, 328);
+ PicoDrawSetInternalBuf(Pico.est.Draw2FB, 328);
Pico32xDrawMode = (which == PDF_RGB555) ? PDM32X_32X_ONLY : PDM32X_BOTH;
}