notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve sh/hi levels
[picodrive.git]
/
pico
/
mode4.c
diff --git
a/pico/mode4.c
b/pico/mode4.c
index
095250f
..
ecfbd75
100644
(file)
--- a/
pico/mode4.c
+++ b/
pico/mode4.c
@@
-8,7
+8,7
@@
*/
#include "pico_int.h"
*/
#include "pico_int.h"
-static void (*FinalizeLineM4)(
void
);
+static void (*FinalizeLineM4)(
int line
);
static int skip_next_line;
static int screen_offset;
static int skip_next_line;
static int screen_offset;
@@
-190,18
+190,29
@@
static void DrawDisplayM4(int scanline)
void PicoFrameStartMode4(void)
{
void PicoFrameStartMode4(void)
{
+ int lines = 192;
skip_next_line = 0;
screen_offset = 24;
skip_next_line = 0;
screen_offset = 24;
- rendstatus = PDRAW_192LINES;
+ rendstatus = PDRAW_32_COLS;
+
if ((Pico.video.reg[0] & 6) == 6 && (Pico.video.reg[1] & 0x18)) {
if ((Pico.video.reg[0] & 6) == 6 && (Pico.video.reg[1] & 0x18)) {
- rendstatus &= ~PDRAW_192LINES;
if (Pico.video.reg[1] & 0x08) {
screen_offset = 0;
if (Pico.video.reg[1] & 0x08) {
screen_offset = 0;
-
rendstatus |= PDRAW_240LINES
;
+
lines = 240
;
}
}
- else
// it's 224 lines
+ else
{
screen_offset = 8;
screen_offset = 8;
+ lines = 224;
+ }
+ }
+
+ if (rendstatus != rendstatus_old || lines != rendlines) {
+ emu_video_mode_change(screen_offset, lines, 1);
+ rendstatus_old = rendstatus;
+ rendlines = lines;
}
}
+
+ DrawLineDest = (char *)DrawLineDestBase + screen_offset * DrawLineDestIncrement;
}
void PicoLineMode4(int line)
}
void PicoLineMode4(int line)
@@
-220,10
+231,12
@@
void PicoLineMode4(int line)
DrawDisplayM4(line);
if (FinalizeLineM4 != NULL)
DrawDisplayM4(line);
if (FinalizeLineM4 != NULL)
- FinalizeLineM4();
+ FinalizeLineM4(
line
);
if (PicoScanEnd != NULL)
skip_next_line = PicoScanEnd(line + screen_offset);
if (PicoScanEnd != NULL)
skip_next_line = PicoScanEnd(line + screen_offset);
+
+ DrawLineDest = (char *)DrawLineDest + DrawLineDestIncrement;
}
void PicoDoHighPal555M4(void)
}
void PicoDoHighPal555M4(void)
@@
-247,41
+260,36
@@
void PicoDoHighPal555M4(void)
t |= (t >> 4) & 0x08610861;
*dpal = t;
}
t |= (t >> 4) & 0x08610861;
*dpal = t;
}
+ HighPal[0xe0] = 0;
}
}
-static void FinalizeLineRGB555M4(
void
)
+static void FinalizeLineRGB555M4(
int line
)
{
{
- unsigned short *pd=DrawLineDest;
- unsigned char *ps=HighCol+8;
- unsigned short *pal=HighPal;
- int i;
-
if (Pico.m.dirtyPal)
PicoDoHighPal555M4();
if (Pico.m.dirtyPal)
PicoDoHighPal555M4();
- if (!(PicoOpt & POPT_DIS_32C_BORDER))
- pd += 32;
-
- for (i = 256/4; i > 0; i--) {
- *pd++ = pal[*ps++];
- *pd++ = pal[*ps++];
- *pd++ = pal[*ps++];
- *pd++ = pal[*ps++];
- }
+ // standard FinalizeLine can finish it for us,
+ // with features like scaling and such
+ FinalizeLine555(0, line);
}
}
-static void FinalizeLine8bitM4(
void
)
+static void FinalizeLine8bitM4(
int line
)
{
{
- memcpy32(DrawLineDest, (int *)(HighCol+8), 256/4);
+ unsigned char *pd = DrawLineDest;
+
+ if (!(PicoOpt & POPT_DIS_32C_BORDER))
+ pd += 32;
+
+ memcpy32((int *)pd, (int *)(HighCol+8), 256/4);
}
}
-void PicoDrawSet
ColorFormatMode4(in
t which)
+void PicoDrawSet
OutputMode4(pdso_
t which)
{
switch (which)
{
{
switch (which)
{
- case
2:
FinalizeLineM4 = FinalizeLine8bitM4; break;
- case
1
: FinalizeLineM4 = FinalizeLineRGB555M4; break;
- default:FinalizeLineM4 = NULL; break;
+ case
PDF_8BIT:
FinalizeLineM4 = FinalizeLine8bitM4; break;
+ case
PDF_RGB555
: FinalizeLineM4 = FinalizeLineRGB555M4; break;
+ default:
FinalizeLineM4 = NULL; break;
}
}
}
}