mirror of
https://github.com/RaySollium99/picodrive.git
synced 2025-09-06 15:48:05 -04:00
new 32x renderers, auto fskip change, massive refactoring
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@855 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz
parent
9bb5d91c48
commit
5a68108691
35 changed files with 925 additions and 307 deletions
277
pico/32x/draw.c
277
pico/32x/draw.c
|
|
@ -1,5 +1,9 @@
|
|||
#include "../pico_int.h"
|
||||
|
||||
int (*PicoScan32xBegin)(unsigned int num);
|
||||
int (*PicoScan32xEnd)(unsigned int num);
|
||||
int Pico32xDrawMode;
|
||||
|
||||
static void convert_pal555(int invert_prio)
|
||||
{
|
||||
unsigned int *ps = (void *)Pico32xMem->pal;
|
||||
|
|
@ -22,49 +26,87 @@ static void convert_pal555(int invert_prio)
|
|||
Pico32x.dirty_pal = 0;
|
||||
}
|
||||
|
||||
// direct color mode
|
||||
#define do_line_dc(pd, p32x, pmd, inv, pmd_draw_code) \
|
||||
{ \
|
||||
const unsigned int m1 = 0x001f; \
|
||||
const unsigned int m2 = 0x03e0; \
|
||||
const unsigned int m3 = 0x7c00; \
|
||||
int i; \
|
||||
\
|
||||
for (i = 320; i > 0; i--, pd++, p32x++, pmd++) { \
|
||||
unsigned short t = *p32x; \
|
||||
if (*pmd != mdbg && !((t ^ inv) & 0x8000)) { \
|
||||
pmd_draw_code; \
|
||||
continue; \
|
||||
} \
|
||||
\
|
||||
*pd = ((t & m1) << 11) | ((t & m2) << 1) | ((t & m3) >> 10); \
|
||||
} \
|
||||
}
|
||||
|
||||
// packed pixel mode
|
||||
#define do_line_pp(pd, p32x, pmd, pmd_draw_code) \
|
||||
{ \
|
||||
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)) \
|
||||
*pd = t; \
|
||||
else \
|
||||
pmd_draw_code; \
|
||||
pd++; pmd++; \
|
||||
} \
|
||||
}
|
||||
|
||||
// run length mode
|
||||
#define do_line_rl(pd, p32x, pmd, pmd_draw_code) \
|
||||
{ \
|
||||
unsigned short len, t; \
|
||||
int i; \
|
||||
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)) \
|
||||
*pd = t; \
|
||||
else \
|
||||
pmd_draw_code; \
|
||||
} \
|
||||
} \
|
||||
}
|
||||
|
||||
void FinalizeLine32xRGB555(int sh, int line)
|
||||
{
|
||||
unsigned short *pd = DrawLineDest;
|
||||
unsigned short *pal = Pico32xMem->pal_native;
|
||||
unsigned char *pb = HighCol + 8;
|
||||
unsigned short *dram, *ps, cram0;
|
||||
int i;
|
||||
unsigned char *pmd = HighCol + 8;
|
||||
unsigned short *dram, *p32x;
|
||||
unsigned char mdbg;
|
||||
|
||||
// this is a bit hackish:
|
||||
// we swap cram color 0 with color that is used for background,
|
||||
// as bg is forced to 0 when we do 32X
|
||||
cram0 = Pico.cram[0];
|
||||
Pico.cram[0] = Pico.cram[Pico.video.reg[7] & 0x3f];
|
||||
FinalizeLine555(sh, line);
|
||||
|
||||
FinalizeLineRGB555(sh, line);
|
||||
Pico.cram[0] = cram0;
|
||||
|
||||
if ((Pico32x.vdp_regs[0] & P32XV_Mx) == 0)
|
||||
return; // blanking
|
||||
|
||||
// XXX: how is 32col mode hadled by real hardware?
|
||||
if (!(Pico.video.reg[12] & 1))
|
||||
return;
|
||||
|
||||
if (!(PicoDrawMask & PDRAW_32X_ON))
|
||||
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))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
dram = (void *)Pico32xMem->dram[Pico32x.vdp_regs[0x0a/2] & P32XV_FS];
|
||||
ps = dram + dram[line];
|
||||
p32x = dram + dram[line];
|
||||
mdbg = Pico.video.reg[7] & 0x3f;
|
||||
|
||||
if ((Pico32x.vdp_regs[0] & P32XV_Mx) == 2) { // Direct Color Mode
|
||||
int inv = (Pico32x.vdp_regs[0] & P32XV_PRI) ? 0x8000 : 0;
|
||||
unsigned int m1 = 0x001f001f;
|
||||
unsigned int m2 = 0x03e003e0;
|
||||
unsigned int m3 = 0xfc00fc00;
|
||||
|
||||
for (i = 320; i > 0; i--, ps++, pd++, pb++) {
|
||||
unsigned short t = *ps;
|
||||
if (*pb != 0 && !((t ^ inv) & 0x8000))
|
||||
continue;
|
||||
|
||||
*pd = ((t & m1) << 11) | ((t & m2) << 1) | ((t & m3) >> 10);
|
||||
}
|
||||
int inv_bit = (Pico32x.vdp_regs[0] & P32XV_PRI) ? 0x8000 : 0;
|
||||
do_line_dc(pd, p32x, pmd, inv_bit,);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -72,24 +114,163 @@ 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
|
||||
unsigned short t;
|
||||
for (i = 320/2; i > 0; i--, ps++, pd += 2, pb += 2) {
|
||||
t = pal[*ps >> 8];
|
||||
if (pb[0] == 0 || (t & 0x20))
|
||||
pd[0] = t;
|
||||
t = pal[*ps & 0xff];
|
||||
if (pb[1] == 0 || (t & 0x20))
|
||||
pd[1] = t;
|
||||
}
|
||||
do_line_pp(pd, p32x, pmd,);
|
||||
}
|
||||
else { // Run Length Mode
|
||||
unsigned short len, t;
|
||||
for (i = 320; i > 0; ps++) {
|
||||
t = pal[*ps & 0xff];
|
||||
for (len = (*ps >> 8) + 1; len > 0 && i > 0; len--, i--, pd++, pb++)
|
||||
if (*pb == 0 || (t & 0x20))
|
||||
*pd = t;
|
||||
}
|
||||
do_line_rl(pd, p32x, pmd,);
|
||||
}
|
||||
}
|
||||
|
||||
#define MD_LAYER_CODE \
|
||||
*dst = palmd[*pmd]
|
||||
|
||||
#define PICOSCAN_PRE \
|
||||
PicoScan32xBegin(l + (lines_offs & 0xff)); \
|
||||
dst = DrawLineDest; \
|
||||
|
||||
#define PICOSCAN_POST \
|
||||
PicoScan32xEnd(l + (lines_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) \
|
||||
{ \
|
||||
int inv_bit = (Pico32x.vdp_regs[0] & P32XV_PRI) ? 0x8000 : 0; \
|
||||
unsigned char *pmd = PicoDraw2FB + 328 * 8 + 8; \
|
||||
unsigned short *palmd = HighPal; \
|
||||
unsigned short *p32x; \
|
||||
int lines = lines_offs >> 16; \
|
||||
int l; \
|
||||
(void)palmd; \
|
||||
for (l = 0; l < lines; l++, pmd += 8) { \
|
||||
pre_code; \
|
||||
p32x = dram + dram[l]; \
|
||||
do_line_dc(dst, p32x, pmd, inv_bit, md_code); \
|
||||
post_code; \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
/* Packed Pixel Mode */ \
|
||||
static void do_loop_pp##name(unsigned short *dst, \
|
||||
unsigned short *dram, int lines_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; \
|
||||
int l; \
|
||||
(void)palmd; \
|
||||
for (l = 0; l < lines; l++, pmd += 8) { \
|
||||
pre_code; \
|
||||
p32x = dram + dram[l]; \
|
||||
do_line_pp(dst, p32x, pmd, md_code); \
|
||||
post_code; \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
/* Run Length Mode */ \
|
||||
static void do_loop_rl##name(unsigned short *dst, \
|
||||
unsigned short *dram, int lines_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; \
|
||||
int l; \
|
||||
(void)palmd; \
|
||||
for (l = 0; l < lines; l++, pmd += 8) { \
|
||||
pre_code; \
|
||||
p32x = dram + dram[l]; \
|
||||
do_line_rl(dst, p32x, pmd, md_code); \
|
||||
post_code; \
|
||||
} \
|
||||
}
|
||||
|
||||
#ifdef _ASM_32X_DRAW
|
||||
#undef make_do_loop
|
||||
#define make_do_loop(name, pre_code, post_code, md_code) \
|
||||
extern void do_loop_dc##name(unsigned short *dst, \
|
||||
unsigned short *dram, int lines_offs, int mdbg); \
|
||||
extern void do_loop_pp##name(unsigned short *dst, \
|
||||
unsigned short *dram, int lines_offs, int mdbg); \
|
||||
extern void do_loop_rl##name(unsigned short *dst, \
|
||||
unsigned short *dram, int lines_offs, int mdbg);
|
||||
#endif
|
||||
|
||||
make_do_loop(,,,)
|
||||
make_do_loop(_md, , , MD_LAYER_CODE)
|
||||
make_do_loop(_scan, PICOSCAN_PRE, PICOSCAN_POST, )
|
||||
make_do_loop(_scan_md, PICOSCAN_PRE, PICOSCAN_POST, MD_LAYER_CODE)
|
||||
|
||||
typedef void (*do_loop_func)(unsigned short *dst, unsigned short *dram, int lines, int mdbg);
|
||||
enum { DO_LOOP, DO_LOOP_MD, DO_LOOP_SCAN, DO_LOOP_MD_SCAN };
|
||||
|
||||
static const do_loop_func do_loop_dc_f[] = { do_loop_dc, do_loop_dc_md, do_loop_dc_scan, do_loop_dc_scan_md };
|
||||
static const do_loop_func do_loop_pp_f[] = { do_loop_pp, do_loop_pp_md, do_loop_pp_scan, do_loop_pp_scan_md };
|
||||
static const do_loop_func do_loop_rl_f[] = { do_loop_rl, do_loop_rl_md, do_loop_rl_scan, do_loop_rl_scan_md };
|
||||
|
||||
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 which_func;
|
||||
|
||||
DrawLineDest = DrawLineDestBase + offs * DrawLineDestIncrement;
|
||||
dram = Pico32xMem->dram[Pico32x.vdp_regs[0x0a/2] & P32XV_FS];
|
||||
|
||||
if (Pico32xDrawMode == 2) {
|
||||
if (Pico.m.dirtyPal)
|
||||
PicoDrawUpdateHighPal();
|
||||
}
|
||||
|
||||
if ((Pico32x.vdp_regs[0] & P32XV_Mx) == 2)
|
||||
{
|
||||
// Direct Color Mode
|
||||
do_loop = do_loop_dc_f;
|
||||
goto do_it;
|
||||
}
|
||||
|
||||
if (Pico32x.dirty_pal)
|
||||
convert_pal555(Pico32x.vdp_regs[0] & P32XV_PRI);
|
||||
|
||||
if ((Pico32x.vdp_regs[0] & P32XV_Mx) == 1)
|
||||
{
|
||||
// Packed Pixel Mode
|
||||
do_loop = do_loop_pp_f;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Run Length Mode
|
||||
do_loop = do_loop_rl_f;
|
||||
}
|
||||
|
||||
do_it:
|
||||
if (Pico32xDrawMode == 2)
|
||||
which_func = have_scan ? DO_LOOP_MD_SCAN : DO_LOOP_MD;
|
||||
else
|
||||
which_func = have_scan ? DO_LOOP_SCAN : DO_LOOP;
|
||||
|
||||
do_loop[which_func](DrawLineDest, dram, (lines << 16) | offs, md_bg);
|
||||
}
|
||||
|
||||
void PicoDraw32xSetFrameMode(int is_on, int only_32x)
|
||||
{
|
||||
#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 {
|
||||
PicoDrawSetInternalBuf(NULL, 0);
|
||||
Pico32xDrawMode = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue