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

Fixed colour compare in EGA/VGA - fixes graphics issues in Crystal Dream II.

Browse source
This commit is contained in:
SarahW 2017-08-31 14:26:54 +01:00
commit b1f4748eaf
2 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/vid_ega.c
View file

@ -860,18 +860,18 @@ uint8_t ega_read(uint32_t addr, void *p)
ega->ld = ega->vram[addr | 0x3];
if (ega->readmode)
{
temp = (ega->colournocare & 1) ? 0xff : 0;
temp &= ega->la;
temp = ega->la;
temp ^= (ega->colourcompare & 1) ? 0xff : 0;
temp2 = (ega->colournocare & 2) ? 0xff : 0;
temp2 &= ega->lb;
temp &= (ega->colournocare & 1) ? 0xff : 0;
temp2 = ega->lb;
temp2 ^= (ega->colourcompare & 2) ? 0xff : 0;
temp3 = (ega->colournocare & 4) ? 0xff : 0;
temp3 &= ega->lc;
temp2 &= (ega->colournocare & 2) ? 0xff : 0;
temp3 = ega->lc;
temp3 ^= (ega->colourcompare & 4) ? 0xff : 0;
temp4 = (ega->colournocare & 8) ? 0xff : 0;
temp4 &= ega->ld;
temp3 &= (ega->colournocare & 4) ? 0xff : 0;
temp4 = ega->ld;
temp4 ^= (ega->colourcompare & 8) ? 0xff : 0;
temp4 &= (ega->colournocare & 8) ? 0xff : 0;
return ~(temp | temp2 | temp3 | temp4);
}
return ega->vram[addr | readplane];

32
src/vid_svga.c
View file

@ -994,18 +994,18 @@ uint8_t svga_read(uint32_t addr, void *p)
if (svga->readmode)
{
temp = (svga->colournocare & 1) ? 0xff : 0;
temp &= svga->la;
temp = svga->la;
temp ^= (svga->colourcompare & 1) ? 0xff : 0;
temp2 = (svga->colournocare & 2) ? 0xff : 0;
temp2 &= svga->lb;
temp &= (svga->colournocare & 1) ? 0xff : 0;
temp2 = svga->lb;
temp2 ^= (svga->colourcompare & 2) ? 0xff : 0;
temp3 = (svga->colournocare & 4) ? 0xff : 0;
temp3 &= svga->lc;
temp2 &= (svga->colournocare & 2) ? 0xff : 0;
temp3 = svga->lc;
temp3 ^= (svga->colourcompare & 4) ? 0xff : 0;
temp4 = (svga->colournocare & 8) ? 0xff : 0;
temp4 &= svga->ld;
temp3 &= (svga->colournocare & 4) ? 0xff : 0;
temp4 = svga->ld;
temp4 ^= (svga->colourcompare & 8) ? 0xff : 0;
temp4 &= (svga->colournocare & 8) ? 0xff : 0;
return ~(temp | temp2 | temp3 | temp4);
}
//pclog("Read %02X %04X %04X\n",vram[addr|svga->readplane],addr,svga->readplane);
@ -1231,18 +1231,18 @@ uint8_t svga_read_linear(uint32_t addr, void *p)
svga->ld = svga->vram[addr | 0x3];
if (svga->readmode)
{
temp = (svga->colournocare & 1) ? 0xff : 0;
temp &= svga->la;
temp = svga->la;
temp ^= (svga->colourcompare & 1) ? 0xff : 0;
temp2 = (svga->colournocare & 2) ? 0xff : 0;
temp2 &= svga->lb;
temp &= (svga->colournocare & 1) ? 0xff : 0;
temp2 = svga->lb;
temp2 ^= (svga->colourcompare & 2) ? 0xff : 0;
temp3 = (svga->colournocare & 4) ? 0xff : 0;
temp3 &= svga->lc;
temp2 &= (svga->colournocare & 2) ? 0xff : 0;
temp3 = svga->lc;
temp3 ^= (svga->colourcompare & 4) ? 0xff : 0;
temp4 = (svga->colournocare & 8) ? 0xff : 0;
temp4 &= svga->ld;
temp3 &= (svga->colournocare & 4) ? 0xff : 0;
temp4 = svga->ld;
temp4 ^= (svga->colourcompare & 8) ? 0xff : 0;
temp4 &= (svga->colournocare & 8) ? 0xff : 0;
return ~(temp | temp2 | temp3 | temp4);
}
//printf("Read %02X %04X %04X\n",vram[addr|svga->readplane],addr,svga->readplane);