notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: support ms ABI
[picodrive.git]
/
pico
/
draw.c
diff --git
a/pico/draw.c
b/pico/draw.c
index
5e8d86b
..
0939f3f
100644
(file)
--- a/
pico/draw.c
+++ b/
pico/draw.c
@@
-129,19
+129,12
@@
static void funcname(int sx, unsigned int pack, int pal) \
}
\r
\r
\r
}
\r
\r
\r
-#ifdef _ASM_DRAW_C_AMIPS
\r
-int TileNorm(int sx, unsigned int pack, int pal);
\r
-int TileFlip(int sx, unsigned int pack, int pal);
\r
-#else
\r
-
\r
#define pix_just_write(x) \
\r
if (t) pd[x]=pal|t
\r
\r
TileNormMaker(TileNorm,pix_just_write)
\r
TileFlipMaker(TileFlip,pix_just_write)
\r
\r
#define pix_just_write(x) \
\r
if (t) pd[x]=pal|t
\r
\r
TileNormMaker(TileNorm,pix_just_write)
\r
TileFlipMaker(TileFlip,pix_just_write)
\r
\r
-#endif
\r
-
\r
#ifndef _ASM_DRAW_C
\r
\r
// draw a sprite pixel, process operator colors
\r
#ifndef _ASM_DRAW_C
\r
\r
// draw a sprite pixel, process operator colors
\r
@@
-222,7
+215,7
@@
static void DrawStrip(struct TileStrip *ts, int lflags, int cellskip)
{
\r
unsigned int pack;
\r
\r
{
\r
unsigned int pack;
\r
\r
- code = Pico.vram[ts->nametab + (tilex & ts->xmask)];
\r
+ code = Pico
Mem
.vram[ts->nametab + (tilex & ts->xmask)];
\r
if (code == blank)
\r
continue;
\r
if ((code >> 15) | (lflags & LF_FORCE)) { // high priority tile
\r
if (code == blank)
\r
continue;
\r
if ((code >> 15) | (lflags & LF_FORCE)) { // high priority tile
\r
@@
-242,7
+235,7
@@
static void DrawStrip(struct TileStrip *ts, int lflags, int cellskip)
pal=((code>>9)&0x30)|sh;
\r
}
\r
\r
pal=((code>>9)&0x30)|sh;
\r
}
\r
\r
- pack = *(unsigned int *)(Pico.vram + addr);
\r
+ pack = *(unsigned int *)(Pico
Mem
.vram + addr);
\r
if (!pack) {
\r
blank = code;
\r
continue;
\r
if (!pack) {
\r
blank = code;
\r
continue;
\r
@@
-268,7
+261,11
@@
static void DrawStripVSRam(struct TileStrip *ts, int plane_sh, int cellskip)
// Draw tiles across screen:
\r
tilex=(-ts->hscroll)>>3;
\r
dx=((ts->hscroll-1)&7)+1;
\r
// Draw tiles across screen:
\r
tilex=(-ts->hscroll)>>3;
\r
dx=((ts->hscroll-1)&7)+1;
\r
- if(dx != 8) cell--; // have hscroll, start with negative cell
\r
+ if (ts->hscroll & 0x0f) {
\r
+ int adj = ((ts->hscroll ^ dx) >> 3) & 1;
\r
+ cell -= adj + 1;
\r
+ ts->cells -= adj;
\r
+ }
\r
cell+=cellskip;
\r
tilex+=cellskip;
\r
dx+=cellskip<<3;
\r
cell+=cellskip;
\r
tilex+=cellskip;
\r
dx+=cellskip<<3;
\r
@@
-281,7
+278,7
@@
static void DrawStripVSRam(struct TileStrip *ts, int plane_sh, int cellskip)
//if((cell&1)==0)
\r
{
\r
int line,vscroll;
\r
//if((cell&1)==0)
\r
{
\r
int line,vscroll;
\r
- vscroll=Pico.vsram[(plane_sh&1)+(cell&~1)];
\r
+ vscroll=Pico
Mem
.vsram[(plane_sh&1)+(cell&~1)];
\r
\r
// Find the line in the name table
\r
line=(vscroll+scan)&ts->line&0xffff; // ts->line is really ymask ..
\r
\r
// Find the line in the name table
\r
line=(vscroll+scan)&ts->line&0xffff; // ts->line is really ymask ..
\r
@@
-289,7
+286,7
@@
static void DrawStripVSRam(struct TileStrip *ts, int plane_sh, int cellskip)
ty=(line&7)<<1; // Y-Offset into tile
\r
}
\r
\r
ty=(line&7)<<1; // Y-Offset into tile
\r
}
\r
\r
- code=Pico.vram[ts->nametab+nametabadd+(tilex&ts->xmask)];
\r
+ code=Pico
Mem
.vram[ts->nametab+nametabadd+(tilex&ts->xmask)];
\r
if (code==blank) continue;
\r
if (code>>15) { // high priority tile
\r
int cval = code | (dx<<16) | (ty<<25);
\r
if (code==blank) continue;
\r
if (code>>15) { // high priority tile
\r
int cval = code | (dx<<16) | (ty<<25);
\r
@@
-307,7
+304,7
@@
static void DrawStripVSRam(struct TileStrip *ts, int plane_sh, int cellskip)
pal=((code>>9)&0x30)|((plane_sh<<5)&0x40);
\r
}
\r
\r
pal=((code>>9)&0x30)|((plane_sh<<5)&0x40);
\r
}
\r
\r
- pack = *(unsigned int *)(Pico.vram + addr);
\r
+ pack = *(unsigned int *)(Pico
Mem
.vram + addr);
\r
if (!pack) {
\r
blank = code;
\r
continue;
\r
if (!pack) {
\r
blank = code;
\r
continue;
\r
@@
-343,7
+340,7
@@
void DrawStripInterlace(struct TileStrip *ts)
{
\r
unsigned int pack;
\r
\r
{
\r
unsigned int pack;
\r
\r
- code
=Pico.vram[ts->nametab+(tilex&
ts->xmask)];
\r
+ code
= PicoMem.vram[ts->nametab + (tilex &
ts->xmask)];
\r
if (code==blank) continue;
\r
if (code>>15) { // high priority tile
\r
int cval = (code&0xfc00) | (dx<<16) | (ty<<25);
\r
if (code==blank) continue;
\r
if (code>>15) { // high priority tile
\r
int cval = (code&0xfc00) | (dx<<16) | (ty<<25);
\r
@@
-363,7
+360,7
@@
void DrawStripInterlace(struct TileStrip *ts)
pal=((code>>9)&0x30);
\r
}
\r
\r
pal=((code>>9)&0x30);
\r
}
\r
\r
- pack = *(unsigned int *)(Pico.vram + addr);
\r
+ pack = *(unsigned int *)(Pico
Mem
.vram + addr);
\r
if (!pack) {
\r
blank = code;
\r
continue;
\r
if (!pack) {
\r
blank = code;
\r
continue;
\r
@@
-416,11
+413,11
@@
static void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells,
htab+=plane_sh&1; // A or B
\r
\r
// Get horizontal scroll value, will be masked later
\r
htab+=plane_sh&1; // A or B
\r
\r
// Get horizontal scroll value, will be masked later
\r
- ts.hscroll
=Pico.vram[htab&
0x7fff];
\r
+ ts.hscroll
= PicoMem.vram[htab &
0x7fff];
\r
\r
if((pvid->reg[12]&6) == 6) {
\r
// interlace mode 2
\r
\r
if((pvid->reg[12]&6) == 6) {
\r
// interlace mode 2
\r
- vscroll
=Pico.vsram[plane_sh&
1]; // Get vertical scroll value
\r
+ vscroll
= PicoMem.vsram[plane_sh &
1]; // Get vertical scroll value
\r
\r
// Find the line in the name table
\r
ts.line=(vscroll+(est->DrawScanline<<1))&((ymask<<1)|1);
\r
\r
// Find the line in the name table
\r
ts.line=(vscroll+(est->DrawScanline<<1))&((ymask<<1)|1);
\r
@@
-433,7
+430,7
@@
static void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells,
ts.line=ymask|(shift[width]<<24); // save some stuff instead of line
\r
DrawStripVSRam(&ts, plane_sh, cellskip);
\r
} else {
\r
ts.line=ymask|(shift[width]<<24); // save some stuff instead of line
\r
DrawStripVSRam(&ts, plane_sh, cellskip);
\r
} else {
\r
- vscroll
=Pico.vsram[plane_sh&
1]; // Get vertical scroll value
\r
+ vscroll
= PicoMem.vsram[plane_sh &
1]; // Get vertical scroll value
\r
\r
// Find the line in the name table
\r
ts.line=(vscroll+est->DrawScanline)&ymask;
\r
\r
// Find the line in the name table
\r
ts.line=(vscroll+est->DrawScanline)&ymask;
\r
@@
-470,7
+467,7
@@
static void DrawWindow(int tstart, int tend, int prio, int sh,
\r
if (!(est->rendstatus & PDRAW_WND_DIFF_PRIO)) {
\r
// check the first tile code
\r
\r
if (!(est->rendstatus & PDRAW_WND_DIFF_PRIO)) {
\r
// check the first tile code
\r
- code
=Pico.vram[nametab+
tilex];
\r
+ code
= PicoMem.vram[nametab +
tilex];
\r
// if the whole window uses same priority (what is often the case), we may be able to skip this field
\r
if ((code>>15) != prio) return;
\r
}
\r
// if the whole window uses same priority (what is often the case), we may be able to skip this field
\r
if ((code>>15) != prio) return;
\r
}
\r
@@
-487,7
+484,7
@@
static void DrawWindow(int tstart, int tend, int prio, int sh,
int dx, addr;
\r
int pal;
\r
\r
int dx, addr;
\r
int pal;
\r
\r
- code
=Pico.vram[nametab+
tilex];
\r
+ code
= PicoMem.vram[nametab +
tilex];
\r
if (code==blank) continue;
\r
if ((code>>15) != prio) {
\r
est->rendstatus |= PDRAW_WND_DIFF_PRIO;
\r
if (code==blank) continue;
\r
if ((code>>15) != prio) {
\r
est->rendstatus |= PDRAW_WND_DIFF_PRIO;
\r
@@
-498,7
+495,7
@@
static void DrawWindow(int tstart, int tend, int prio, int sh,
addr=(code&0x7ff)<<4;
\r
if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip
\r
\r
addr=(code&0x7ff)<<4;
\r
if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip
\r
\r
- pack = *(unsigned int *)(Pico.vram + addr);
\r
+ pack = *(unsigned int *)(Pico
Mem
.vram + addr);
\r
if (!pack) {
\r
blank = code;
\r
continue;
\r
if (!pack) {
\r
blank = code;
\r
continue;
\r
@@
-519,7
+516,7
@@
static void DrawWindow(int tstart, int tend, int prio, int sh,
int dx, addr;
\r
int pal;
\r
\r
int dx, addr;
\r
int pal;
\r
\r
- code
=Pico.vram[nametab+
tilex];
\r
+ code
= PicoMem.vram[nametab +
tilex];
\r
if(code==blank) continue;
\r
if((code>>15) != prio) {
\r
est->rendstatus |= PDRAW_WND_DIFF_PRIO;
\r
if(code==blank) continue;
\r
if((code>>15) != prio) {
\r
est->rendstatus |= PDRAW_WND_DIFF_PRIO;
\r
@@
-540,7
+537,7
@@
static void DrawWindow(int tstart, int tend, int prio, int sh,
addr=(code&0x7ff)<<4;
\r
if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip
\r
\r
addr=(code&0x7ff)<<4;
\r
if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip
\r
\r
- pack = *(unsigned int *)(Pico.vram + addr);
\r
+ pack = *(unsigned int *)(Pico
Mem
.vram + addr);
\r
if (!pack) {
\r
blank = code;
\r
continue;
\r
if (!pack) {
\r
blank = code;
\r
continue;
\r
@@
-594,7
+591,7
@@
static void DrawTilesFromCache(int *hc, int sh, int rlim, struct PicoEState *est
addr = (code & 0x7ff) << 4;
\r
addr += code >> 25; // y offset into tile
\r
\r
addr = (code & 0x7ff) << 4;
\r
addr += code >> 25; // y offset into tile
\r
\r
- pack = *(unsigned int *)(Pico.vram + addr);
\r
+ pack = *(unsigned int *)(Pico
Mem
.vram + addr);
\r
if (!pack) {
\r
blank = (short)code;
\r
continue;
\r
if (!pack) {
\r
blank = (short)code;
\r
continue;
\r
@@
-622,7
+619,7
@@
static void DrawTilesFromCache(int *hc, int sh, int rlim, struct PicoEState *est
*zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf;
\r
*zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf;
\r
\r
*zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf;
\r
*zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf; *zb++ &= 0xbf;
\r
\r
- pack = *(unsigned int *)(Pico.vram + addr);
\r
+ pack = *(unsigned int *)(Pico
Mem
.vram + addr);
\r
if (!pack)
\r
continue;
\r
\r
if (!pack)
\r
continue;
\r
\r
@@
-724,7
+721,7
@@
static void DrawSprite(int *sprite, int sh)
if(sx<=0) continue;
\r
if(sx>=328) break; // Offscreen
\r
\r
if(sx<=0) continue;
\r
if(sx>=328) break; // Offscreen
\r
\r
- pack = *(unsigned int *)(Pico.vram + (tile & 0x7fff));
\r
+ pack = *(unsigned int *)(Pico
Mem
.vram + (tile & 0x7fff));
\r
fTileFunc(sx, pack, pal);
\r
}
\r
}
\r
fTileFunc(sx, pack, pal);
\r
}
\r
}
\r
@@
-744,7
+741,7
@@
static NOINLINE void DrawTilesFromCacheForced(const int *hc)
\r
dx = (code >> 16) & 0x1ff;
\r
pal = ((code >> 9) & 0x30);
\r
\r
dx = (code >> 16) & 0x1ff;
\r
pal = ((code >> 9) & 0x30);
\r
- pack = *(unsigned int *)(Pico.vram + addr);
\r
+ pack = *(unsigned int *)(Pico
Mem
.vram + addr);
\r
\r
if (code & 0x0800) TileFlip_and(dx, pack, pal);
\r
else TileNorm_and(dx, pack, pal);
\r
\r
if (code & 0x0800) TileFlip_and(dx, pack, pal);
\r
else TileNorm_and(dx, pack, pal);
\r
@@
-790,7
+787,7
@@
static void DrawSpriteInterlace(unsigned int *sprite)
if(sx<=0) continue;
\r
if(sx>=328) break; // Offscreen
\r
\r
if(sx<=0) continue;
\r
if(sx>=328) break; // Offscreen
\r
\r
- pack = *(unsigned int *)(Pico.vram + (tile & 0x7fff));
\r
+ pack = *(unsigned int *)(Pico
Mem
.vram + (tile & 0x7fff));
\r
if (code & 0x0800) TileFlip(sx, pack, pal);
\r
else TileNorm(sx, pack, pal);
\r
}
\r
if (code & 0x0800) TileFlip(sx, pack, pal);
\r
else TileNorm(sx, pack, pal);
\r
}
\r
@@
-812,7
+809,7
@@
static NOINLINE void DrawAllSpritesInterlace(int pri, int sh)
unsigned int *sprite;
\r
int code, sx, sy, height;
\r
\r
unsigned int *sprite;
\r
int code, sx, sy, height;
\r
\r
- sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite
\r
+ sprite=(unsigned int *)(Pico
Mem
.vram+((table+(link<<2))&0x7ffc)); // Find sprite
\r
\r
// get sprite info
\r
code = sprite[0];
\r
\r
// get sprite info
\r
code = sprite[0];
\r
@@
-915,7
+912,7
@@
static void DrawSpritesSHi(unsigned char *sprited, const struct PicoEState *est)
if(sx<=0) continue;
\r
if(sx>=328) break; // Offscreen
\r
\r
if(sx<=0) continue;
\r
if(sx>=328) break; // Offscreen
\r
\r
- pack = *(unsigned int *)(Pico.vram + (tile & 0x7fff));
\r
+ pack = *(unsigned int *)(Pico
Mem
.vram + (tile & 0x7fff));
\r
fTileFunc(sx, pack, pal);
\r
}
\r
}
\r
fTileFunc(sx, pack, pal);
\r
}
\r
}
\r
@@
-989,7
+986,7
@@
static void DrawSpritesHiAS(unsigned char *sprited, int sh)
if(sx<=0) continue;
\r
if(sx>=328) break; // Offscreen
\r
\r
if(sx<=0) continue;
\r
if(sx>=328) break; // Offscreen
\r
\r
- pack = *(unsigned int *)(Pico.vram + (tile & 0x7fff));
\r
+ pack = *(unsigned int *)(Pico
Mem
.vram + (tile & 0x7fff));
\r
fTileFunc(sx, pack, pal);
\r
}
\r
}
\r
fTileFunc(sx, pack, pal);
\r
}
\r
}
\r
@@
-1030,7
+1027,7
@@
static NOINLINE void PrepareSprites(int full)
\r
if (!(Pico.video.reg[12]&1))
\r
max_sprites = 64, max_line_sprites = 16, max_width = 264;
\r
\r
if (!(Pico.video.reg[12]&1))
\r
max_sprites = 64, max_line_sprites = 16, max_width = 264;
\r
- if (Pico
O
pt & POPT_DIS_SPRITE_LIM)
\r
+ if (Pico
In.o
pt & POPT_DIS_SPRITE_LIM)
\r
max_line_sprites = MAX_LINE_SPRITES;
\r
\r
if (pvid->reg[1]&8) max_lines = 240;
\r
max_line_sprites = MAX_LINE_SPRITES;
\r
\r
if (pvid->reg[1]&8) max_lines = 240;
\r
@@
-1049,7
+1046,7
@@
static NOINLINE void PrepareSprites(int full)
unsigned int *sprite;
\r
int code2, sx, sy, height;
\r
\r
unsigned int *sprite;
\r
int code2, sx, sy, height;
\r
\r
- sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite
\r
+ sprite=(unsigned int *)(Pico
Mem
.vram+((table+(link<<2))&0x7ffc)); // Find sprite
\r
\r
// parse sprite info
\r
code2 = sprite[1];
\r
\r
// parse sprite info
\r
code2 = sprite[1];
\r
@@
-1102,7
+1099,7
@@
found:;
unsigned int *sprite;
\r
int code, code2, sx, sy, hv, height, width;
\r
\r
unsigned int *sprite;
\r
int code, code2, sx, sy, hv, height, width;
\r
\r
- sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite
\r
+ sprite=(unsigned int *)(Pico
Mem
.vram+((table+(link<<2))&0x7ffc)); // Find sprite
\r
\r
// parse sprite info
\r
code = sprite[0];
\r
\r
// parse sprite info
\r
code = sprite[0];
\r
@@
-1226,7
+1223,7
@@
void PicoDoHighPal555(int sh, int line, struct PicoEState *est)
\r
Pico.m.dirtyPal = 0;
\r
\r
\r
Pico.m.dirtyPal = 0;
\r
\r
- spal = (void *)Pico.cram;
\r
+ spal = (void *)Pico
Mem
.cram;
\r
dpal = (void *)est->HighPal;
\r
\r
for (i = 0; i < 0x40 / 2; i++) {
\r
dpal = (void *)est->HighPal;
\r
\r
for (i = 0; i < 0x40 / 2; i++) {
\r
@@
-1270,7
+1267,7
@@
void FinalizeLine555(int sh, int line, struct PicoEState *est)
if (Pico.video.reg[12]&1) {
\r
len = 320;
\r
} else {
\r
if (Pico.video.reg[12]&1) {
\r
len = 320;
\r
} else {
\r
- if (!(Pico
O
pt&POPT_DIS_32C_BORDER)) pd+=32;
\r
+ if (!(Pico
In.o
pt&POPT_DIS_32C_BORDER)) pd+=32;
\r
len = 256;
\r
}
\r
\r
len = 256;
\r
}
\r
\r
@@
-1308,16
+1305,16
@@
static void FinalizeLine8bit(int sh, int line, struct PicoEState *est)
rs |= PDRAW_SONIC_MODE;
\r
est->rendstatus = rs;
\r
if (dirty_count == 3) {
\r
rs |= PDRAW_SONIC_MODE;
\r
est->rendstatus = rs;
\r
if (dirty_count == 3) {
\r
- blockcpy(est->HighPal, Pico.cram, 0x40*2);
\r
+ blockcpy(est->HighPal, Pico
Mem
.cram, 0x40*2);
\r
} else if (dirty_count == 11) {
\r
} else if (dirty_count == 11) {
\r
- blockcpy(est->HighPal+0x40, Pico.cram, 0x40*2);
\r
+ blockcpy(est->HighPal+0x40, Pico
Mem
.cram, 0x40*2);
\r
}
\r
}
\r
\r
if (Pico.video.reg[12]&1) {
\r
len = 320;
\r
} else {
\r
}
\r
}
\r
\r
if (Pico.video.reg[12]&1) {
\r
len = 320;
\r
} else {
\r
- if (!(Pico
O
pt & POPT_DIS_32C_BORDER))
\r
+ if (!(Pico
In.o
pt & POPT_DIS_32C_BORDER))
\r
pd += 32;
\r
len = 256;
\r
}
\r
pd += 32;
\r
len = 256;
\r
}
\r
@@
-1430,7
+1427,7
@@
static int DrawDisplay(int sh)
else if (est->rendstatus & PDRAW_INTERLACE)
\r
DrawAllSpritesInterlace(1, sh);
\r
// have sprites without layer pri bit ontop of sprites with that bit
\r
else if (est->rendstatus & PDRAW_INTERLACE)
\r
DrawAllSpritesInterlace(1, sh);
\r
// have sprites without layer pri bit ontop of sprites with that bit
\r
- else if ((sprited[1] & 0xd0) == 0xd0 && (Pico
O
pt & POPT_ACC_SPRITES))
\r
+ else if ((sprited[1] & 0xd0) == 0xd0 && (Pico
In.o
pt & POPT_ACC_SPRITES))
\r
DrawSpritesHiAS(sprited, sh);
\r
else if (sh && (sprited[1] & SPRL_MAY_HAVE_OP))
\r
DrawSpritesSHi(sprited, est);
\r
DrawSpritesHiAS(sprited, sh);
\r
else if (sh && (sprited[1] & SPRL_MAY_HAVE_OP))
\r
DrawSpritesSHi(sprited, est);
\r
@@
-1484,7
+1481,7
@@
PICO_INTERNAL void PicoFrameStart(void)
Pico.est.DrawScanline = 0;
\r
skip_next_line = 0;
\r
\r
Pico.est.DrawScanline = 0;
\r
skip_next_line = 0;
\r
\r
- if (Pico
O
pt & POPT_ALT_RENDERER)
\r
+ if (Pico
In.o
pt & POPT_ALT_RENDERER)
\r
return;
\r
\r
if (Pico.m.dirtyPal)
\r
return;
\r
\r
if (Pico.m.dirtyPal)
\r
@@
-1553,13
+1550,14
@@
void PicoDrawSync(int to, int blank_last_line)
\r
pprof_start(draw);
\r
\r
\r
pprof_start(draw);
\r
\r
- if (rendlines != 240)
\r
+ if (rendlines != 240)
{
\r
offs = 8;
\r
offs = 8;
\r
+ if (to > 223)
\r
+ to = 223;
\r
+ }
\r
\r
for (line = Pico.est.DrawScanline; line < to; line++)
\r
\r
for (line = Pico.est.DrawScanline; line < to; line++)
\r
- {
\r
PicoLine(line, offs, sh, bgc);
\r
PicoLine(line, offs, sh, bgc);
\r
- }
\r
\r
// last line
\r
if (line <= to)
\r
\r
// last line
\r
if (line <= to)
\r
@@
-1579,7
+1577,7
@@
void PicoDrawUpdateHighPal(void)
{
\r
struct PicoEState *est = &Pico.est;
\r
int sh = (Pico.video.reg[0xC] & 8) >> 3; // shadow/hilight?
\r
{
\r
struct PicoEState *est = &Pico.est;
\r
int sh = (Pico.video.reg[0xC] & 8) >> 3; // shadow/hilight?
\r
- if (Pico
O
pt & POPT_ALT_RENDERER)
\r
+ if (Pico
In.o
pt & POPT_ALT_RENDERER)
\r
sh = 0; // no s/h support
\r
\r
PicoDoHighPal555(sh, 0, &Pico.est);
\r
sh = 0; // no s/h support
\r
\r
PicoDoHighPal555(sh, 0, &Pico.est);
\r
@@
-1599,7
+1597,7
@@
void PicoDrawSetOutFormat(pdso_t which, int use_32x_line_mode)
break;
\r
\r
case PDF_RGB555:
\r
break;
\r
\r
case PDF_RGB555:
\r
- if ((PicoAHW & PAHW_32X) && use_32x_line_mode)
\r
+ if ((Pico
In.
AHW & PAHW_32X) && use_32x_line_mode)
\r
FinalizeLine = FinalizeLine32xRGB555;
\r
else
\r
FinalizeLine = FinalizeLine555;
\r
FinalizeLine = FinalizeLine32xRGB555;
\r
else
\r
FinalizeLine = FinalizeLine555;
\r
@@
-1619,7
+1617,7
@@
void PicoDrawSetOutBuf(void *dest, int increment)
{
\r
DrawLineDestBase = dest;
\r
DrawLineDestIncrement = increment;
\r
{
\r
DrawLineDestBase = dest;
\r
DrawLineDestIncrement = increment;
\r
- Pico.est.DrawLineDest = DrawLineDestBase + Pico.est.DrawScanline * increment;
\r
+ Pico.est.DrawLineDest =
(char *)
DrawLineDestBase + Pico.est.DrawScanline * increment;
\r
}
\r
\r
void PicoDrawSetInternalBuf(void *dest, int increment)
\r
}
\r
\r
void PicoDrawSetInternalBuf(void *dest, int increment)
\r
@@
-1642,7
+1640,7
@@
void PicoDrawSetCallbacks(int (*begin)(unsigned int num), int (*end)(unsigned in
PicoScan32xBegin = NULL;
\r
PicoScan32xEnd = NULL;
\r
\r
PicoScan32xBegin = NULL;
\r
PicoScan32xEnd = NULL;
\r
\r
- if ((PicoAHW & PAHW_32X) && FinalizeLine != FinalizeLine32xRGB555) {
\r
+ if ((Pico
In.
AHW & PAHW_32X) && FinalizeLine != FinalizeLine32xRGB555) {
\r
PicoScan32xBegin = begin;
\r
PicoScan32xEnd = end;
\r
}
\r
PicoScan32xBegin = begin;
\r
PicoScan32xEnd = end;
\r
}
\r