Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More fixes to CL-GD5429 blitter pattern mode.

Browse source
This commit is contained in:
SarahW 2018-02-17 16:37:45 +00:00
commit 28749fa3dd
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/vid_cl5429.c
View file

@ -34,7 +34,7 @@ typedef struct gd5429_t
uint32_t dst_addr_backup, src_addr_backup; uint32_t dst_addr_backup, src_addr_backup;
uint16_t width_backup, height_internal; uint16_t width_backup, height_internal;
int x_count; int x_count, y_count;
} blt; } blt;
uint8_t hidden_dac_reg; uint8_t hidden_dac_reg;
@ -878,6 +878,10 @@ void gd5429_start_blit(uint32_t cpu_dat, int count, void *p)
gd5429->blt.width_backup = gd5429->blt.width; gd5429->blt.width_backup = gd5429->blt.width;
gd5429->blt.height_internal = gd5429->blt.height; gd5429->blt.height_internal = gd5429->blt.height;
gd5429->blt.x_count = 0; gd5429->blt.x_count = 0;
if ((gd5429->blt.mode & 0xc0) == 0xc0)
gd5429->blt.y_count = gd5429->blt.src_addr & 7;
else
gd5429->blt.y_count = 0;
// pclog("gd5429_start_blit : size %i, %i %i\n", gd5429->blt.width, gd5429->blt.height, gd5429->blt.x_count); // pclog("gd5429_start_blit : size %i, %i %i\n", gd5429->blt.width, gd5429->blt.height, gd5429->blt.x_count);
if (gd5429->blt.mode & 0x04) if (gd5429->blt.mode & 0x04)
@ -932,9 +936,9 @@ void gd5429_start_blit(uint32_t cpu_dat, int count, void *p)
break; break;
case 0x40: case 0x40:
if (gd5429->blt.mode & 0x10) if (gd5429->blt.mode & 0x10)
src = svga->vram[(gd5429->blt.src_addr & (svga->vram_mask & ~15)) | (gd5429->blt.dst_addr & 15)]; src = svga->vram[(gd5429->blt.src_addr & (svga->vram_mask & ~3)) + (gd5429->blt.y_count << 4) + (gd5429->blt.x_count & 15)];
else else
src = svga->vram[(gd5429->blt.src_addr & (svga->vram_mask & ~7)) | (gd5429->blt.dst_addr & 7)]; src = svga->vram[(gd5429->blt.src_addr & (svga->vram_mask & ~7)) + (gd5429->blt.y_count << 3) + (gd5429->blt.x_count & 7)];
mask = 1; mask = 1;
break; break;
case 0x80: case 0x80:
@ -955,7 +959,7 @@ void gd5429_start_blit(uint32_t cpu_dat, int count, void *p)
case 0xc0: case 0xc0:
if (gd5429->blt.mode & 0x10) if (gd5429->blt.mode & 0x10)
{ {
mask = svga->vram[gd5429->blt.src_addr & svga->vram_mask] & (0x80 >> (gd5429->blt.x_count >> 1)); mask = svga->vram[(gd5429->blt.src_addr & svga->vram_mask & ~7) | gd5429->blt.y_count] & (0x80 >> (gd5429->blt.x_count >> 1));
if (gd5429->blt.dst_addr & 1) if (gd5429->blt.dst_addr & 1)
src = mask ? (gd5429->blt.fg_col >> 8) : (gd5429->blt.bg_col >> 8); src = mask ? (gd5429->blt.fg_col >> 8) : (gd5429->blt.bg_col >> 8);
else else
@ -963,7 +967,7 @@ void gd5429_start_blit(uint32_t cpu_dat, int count, void *p)
} }
else else
{ {
mask = svga->vram[gd5429->blt.src_addr & svga->vram_mask] & (0x80 >> gd5429->blt.x_count); mask = svga->vram[(gd5429->blt.src_addr & svga->vram_mask & ~7) | gd5429->blt.y_count] & (0x80 >> gd5429->blt.x_count);
src = mask ? gd5429->blt.fg_col : gd5429->blt.bg_col; src = mask ? gd5429->blt.fg_col : gd5429->blt.bg_col;
} }
break; break;
@ -1022,22 +1026,17 @@ void gd5429_start_blit(uint32_t cpu_dat, int count, void *p)
case 0x00: case 0x00:
gd5429->blt.src_addr = gd5429->blt.src_addr_backup = gd5429->blt.src_addr_backup + ((gd5429->blt.mode & 0x01) ? -gd5429->blt.src_pitch : gd5429->blt.src_pitch); gd5429->blt.src_addr = gd5429->blt.src_addr_backup = gd5429->blt.src_addr_backup + ((gd5429->blt.mode & 0x01) ? -gd5429->blt.src_pitch : gd5429->blt.src_pitch);
break; break;
case 0x40:
if (gd5429->blt.mode & 0x10)
gd5429->blt.src_addr = ((gd5429->blt.src_addr + ((gd5429->blt.mode & 0x01) ? -16 : 16)) & 0x70) | (gd5429->blt.src_addr & ~0x70);
else
gd5429->blt.src_addr = ((gd5429->blt.src_addr + ((gd5429->blt.mode & 0x01) ? -8 : 8)) & 0x38) | (gd5429->blt.src_addr & ~0x38);
break;
case 0x80: case 0x80:
if (gd5429->blt.x_count != 0) if (gd5429->blt.x_count != 0)
gd5429->blt.src_addr++; gd5429->blt.src_addr++;
break; break;
case 0xc0:
gd5429->blt.src_addr = ((gd5429->blt.src_addr + ((gd5429->blt.mode & 0x01) ? -1 : 1)) & 7) | (gd5429->blt.src_addr & ~7);
break;
} }
gd5429->blt.x_count = 0; gd5429->blt.x_count = 0;
if (gd5429->blt.mode & 0x10)
gd5429->blt.y_count = (gd5429->blt.y_count - 1) & 7;
else
gd5429->blt.y_count = (gd5429->blt.y_count + 1) & 7;
gd5429->blt.height_internal--; gd5429->blt.height_internal--;
if (gd5429->blt.height_internal == 0xffff) if (gd5429->blt.height_internal == 0xffff)