notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check if DEBUG is set rather than not set.
[picodrive.git]
/
pico
/
draw.c
diff --git
a/pico/draw.c
b/pico/draw.c
index
d14e996
..
dbd6363
100644
(file)
--- a/
pico/draw.c
+++ b/
pico/draw.c
@@
-1424,11
+1424,6
@@
PICO_INTERNAL void PicoFrameStart(void)
lines = 240;
\r
}
\r
\r
lines = 240;
\r
}
\r
\r
- HighCol = HighColBase + offs * HighColIncrement;
\r
- DrawLineDest = (char *)DrawLineDestBase + offs * DrawLineDestIncrement;
\r
- DrawScanline = 0;
\r
- skip_next_line = 0;
\r
-
\r
if (rendstatus != rendstatus_old || lines != rendlines) {
\r
rendlines = lines;
\r
// mode_change() might reset rendstatus_old by calling SetColorFormat
\r
if (rendstatus != rendstatus_old || lines != rendlines) {
\r
rendlines = lines;
\r
// mode_change() might reset rendstatus_old by calling SetColorFormat
\r
@@
-1437,6
+1432,11
@@
PICO_INTERNAL void PicoFrameStart(void)
rendstatus_old = rendstatus;
\r
}
\r
\r
rendstatus_old = rendstatus;
\r
}
\r
\r
+ HighCol = HighColBase + offs * HighColIncrement;
\r
+ DrawLineDest = (char *)DrawLineDestBase + offs * DrawLineDestIncrement;
\r
+ DrawScanline = 0;
\r
+ skip_next_line = 0;
\r
+
\r
if (PicoOpt & POPT_ALT_RENDERER)
\r
return;
\r
\r
if (PicoOpt & POPT_ALT_RENDERER)
\r
return;
\r
\r
@@
-1457,6
+1457,9
@@
static void DrawBlankedLine(int line, int offs, int sh, int bgc)
\r
if (PicoScanEnd != NULL)
\r
PicoScanEnd(line + offs);
\r
\r
if (PicoScanEnd != NULL)
\r
PicoScanEnd(line + offs);
\r
+
\r
+ HighCol += HighColIncrement;
\r
+ DrawLineDest = (char *)DrawLineDest + DrawLineDestIncrement;
\r
}
\r
\r
static void PicoLine(int line, int offs, int sh, int bgc)
\r
}
\r
\r
static void PicoLine(int line, int offs, int sh, int bgc)
\r
@@
-1505,19
+1508,9
@@
void PicoDrawSync(int to, int blank_last_line)
\r
for (line = DrawScanline; line < to; line++)
\r
{
\r
\r
for (line = DrawScanline; line < to; line++)
\r
{
\r
-#if !CAN_HANDLE_240_LINES
\r
- if (line >= 224) break;
\r
-#endif
\r
PicoLine(line, offs, sh, bgc);
\r
}
\r
\r
PicoLine(line, offs, sh, bgc);
\r
}
\r
\r
-#if !CAN_HANDLE_240_LINES
\r
- if (line >= 224) {
\r
- DrawScanline = 240;
\r
- return;
\r
- }
\r
-#endif
\r
-
\r
// last line
\r
if (line <= to)
\r
{
\r
// last line
\r
if (line <= to)
\r
{
\r
@@
-1546,7
+1539,7
@@
void PicoDrawUpdateHighPal(void)
}
\r
}
\r
\r
}
\r
}
\r
\r
-void PicoDrawSetOutFormat(pdso_t which, int
allow_32x
)
\r
+void PicoDrawSetOutFormat(pdso_t which, int
use_32x_line_mode
)
\r
{
\r
switch (which)
\r
{
\r
{
\r
switch (which)
\r
{
\r
@@
-1555,7
+1548,7
@@
void PicoDrawSetOutFormat(pdso_t which, int allow_32x)
break;
\r
\r
case PDF_RGB555:
\r
break;
\r
\r
case PDF_RGB555:
\r
- if ((PicoAHW & PAHW_32X) &&
allow_32x
)
\r
+ if ((PicoAHW & PAHW_32X) &&
use_32x_line_mode
)
\r
FinalizeLine = FinalizeLine32xRGB555;
\r
else
\r
FinalizeLine = FinalizeLine555;
\r
FinalizeLine = FinalizeLine32xRGB555;
\r
else
\r
FinalizeLine = FinalizeLine555;
\r
@@
-1565,6
+1558,7
@@
void PicoDrawSetOutFormat(pdso_t which, int allow_32x)
FinalizeLine = NULL;
\r
break;
\r
}
\r
FinalizeLine = NULL;
\r
break;
\r
}
\r
+ PicoDrawSetOutFormat32x(which, use_32x_line_mode);
\r
PicoDrawSetOutputMode4(which);
\r
rendstatus_old = -1;
\r
}
\r
PicoDrawSetOutputMode4(which);
\r
rendstatus_old = -1;
\r
}
\r
@@
-1574,7
+1568,7
@@
void PicoDrawSetOutBuf(void *dest, int increment)
{
\r
DrawLineDestBase = dest;
\r
DrawLineDestIncrement = increment;
\r
{
\r
DrawLineDestBase = dest;
\r
DrawLineDestIncrement = increment;
\r
- DrawLineDest = DrawLineDestBase + DrawScanline * increment;
\r
+ DrawLineDest =
(unsigned char*)
DrawLineDestBase + DrawScanline * increment;
\r
}
\r
\r
void PicoDrawSetInternalBuf(void *dest, int increment)
\r
}
\r
\r
void PicoDrawSetInternalBuf(void *dest, int increment)
\r