PCem
changeset 38:79cd603440f9
S3 line draw now uses correct foreground/background mix.
| author | TomW |
|---|---|
| date | Sat Nov 16 17:25:44 2013 +0000 |
| parents | bea391e61690 |
| children | 98e5536cbe16 |
| files | src/vid_s3.c |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line diff
1.1 --- a/src/vid_s3.c Fri Nov 15 19:55:22 2013 +0000 1.2 +++ b/src/vid_s3.c Sat Nov 16 17:25:44 2013 +0000 1.3 @@ -959,6 +959,10 @@ 1.4 s3->accel.sy = s3->accel.maj_axis_pcnt; 1.5 } 1.6 if ((s3->accel.cmd & 0x100) && !cpu_input) return; /*Wait for data from CPU*/ 1.7 + 1.8 + frgd_mix = (s3->accel.frgd_mix >> 5) & 3; 1.9 + bkgd_mix = (s3->accel.bkgd_mix >> 5) & 3; 1.10 + 1.11 if (s3->accel.cmd & 8) /*Radial*/ 1.12 { 1.13 while (count-- && s3->accel.sy >= 0) 1.14 @@ -1457,7 +1461,7 @@ 1.15 int xx; 1.16 int offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff; 1.17 1.18 - pclog("HWcursor %i %i\n", svga->hwcursor_latch.x, svga->hwcursor_latch.y); 1.19 +// pclog("HWcursor %i %i\n", svga->hwcursor_latch.x, svga->hwcursor_latch.y); 1.20 for (x = 0; x < 64; x += 16) 1.21 { 1.22 dat[0] = (svga->vram[svga->hwcursor_latch.addr] << 8) | svga->vram[svga->hwcursor_latch.addr + 1];