mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 01:25:33 -07:00
Code Issues Packages Projects Releases Activity

Merge pull request #6625 from Cacodemon345/s3-trio3d-gamma-correction

Browse Source 
S3: Allow gamma correction in Trio3D/2X
This commit is contained in:
Miran Grča
2025-12-27 14:50:49 +01:00
committed by GitHub
parent 2aaf157226 803453cdcb
commit e1c271c5a5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/vid_s3.c
View File

@@ -3527,7 +3527,7 @@ s3_in(uint16_t addr, void *priv)
}
break;
case 0x30:
return s3->id; /*Chip ID*/
return ((svga->crtc[0x38] & 0xcc) != 0x48) ? 0xFF : s3->id; /*Chip ID*/
case 0x31:
return (svga->crtc[0x31] & 0xcf) | ((s3->ma_ext & 3) << 4);
case 0x35:

4
src/video/vid_s3_virge.c
View File

@@ -751,7 +751,7 @@ s3_virge_in(uint16_t addr, void *priv)
ret = virge->virge_rev;
break;
case 0x30:
ret = virge->virge_id;
ret = ((svga->crtc[0x38] & 0xcc) != 0x48) ? 0xFF : virge->virge_id;
break; /*Chip ID*/
case 0x31:
ret = (svga->crtc[0x31] & 0xcf) | ((virge->ma_ext & 3) << 4);
@@ -828,6 +828,7 @@ s3_virge_recalctimings(svga_t *svga)
if (virge->chip >= S3_TRIO3D2X) {
svga_set_ramdac_type(svga, (svga->seqregs[0x1b] & 0x10) ? RAMDAC_8BIT : RAMDAC_6BIT);
svga->lut_map = !!(svga->seqregs[0x1b] & 0x8);
}
if (!svga->scrblank && svga->attr_palette_enable && (svga->crtc[0x43] & 0x80)) {
/* TODO: In case of bug reports, disable 9-dots-wide character clocks in graphics modes. */
@@ -5377,6 +5378,7 @@ s3_virge_init(const device_t *info)
s3_virge_hwcursor_draw,
s3_virge_overlay_draw);
virge->svga.hwcursor.cur_ysize = 64;
virge->svga.conv_16to32 = tvp3026_conv_16to32;
if (bios_fn != NULL) {
if (virge->type == S3_VIRGE_GX2)