mirrors/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2025-01-22 17:22:25 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5058 from 86Box/tc1995

Browse source 
S3 and Cirrus updates of the first day of winter (December 21, 2024)
This commit is contained in:
Miran Grča 2024-12-21 00:14:01 +01:00 committed by GitHub
commit 87febe6e49
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/video/vid_cl54xx.c
View file

@ -3541,6 +3541,10 @@ gd54xx_mem_sys_src(gd54xx_t *gd54xx, uint32_t cpu_dat, uint32_t count)
mask_shift = 31 - byte_pos; mask_shift = 31 - byte_pos;
if (!(gd54xx->blt.mode & CIRRUS_BLTMODE_COLOREXPAND)) if (!(gd54xx->blt.mode & CIRRUS_BLTMODE_COLOREXPAND))
cpu_dat >>= byte_pos; cpu_dat >>= byte_pos;
else {
if (gd54xx->blt.modeext & CIRRUS_BLTMODEEXT_DWORDGRANULARITY)
cpu_dat = ((cpu_dat & 0xff000000) >> 24) | ((cpu_dat & 0x00ff0000) >> 8) | ((cpu_dat & 0x0000ff00) << 8) | ((cpu_dat & 0x000000ff) << 24);
}
} else } else
mask_shift = 7; mask_shift = 7;

8
src/video/vid_s3.c
View file

@ -4312,7 +4312,7 @@ s3_recalctimings(svga_t *svga)
} }
} }
if ((s3->chip == S3_TRIO32) || (s3->chip == S3_TRIO64) || (s3->chip == S3_VISION864)) if ((s3->chip == S3_TRIO32) || (s3->chip == S3_TRIO64) || (s3->chip == S3_VISION864) || (s3->chip == S3_VISION868) || (s3->chip == S3_VISION968))
svga->hoverride = 1; svga->hoverride = 1;
else else
svga->hoverride = 0; svga->hoverride = 0;
@ -8337,7 +8337,13 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
if (update) { if (update) {
READ(s3->accel.dest + s3->accel.cx - s3->accel.minus, dest_dat); READ(s3->accel.dest + s3->accel.cx - s3->accel.minus, dest_dat);
if (s3_cpu_dest(s3)) {
if (vram_mask) {
MIX MIX
}
} else {
MIX
}
if (s3->accel.cmd & 0x10) { if (s3->accel.cmd & 0x10) {
if (s3->accel.cmd == 0x41b3) if (s3->accel.cmd == 0x41b3)