80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #1306 from 86Box/tc1995

Browse Source 
Fixed 1280x1024x8bpp mode in the 928.
This commit is contained in:
Miran Grča
2021-03-16 17:09:10 +01:00
committed by GitHub
parent 82b26f75be 2d79719df5
commit c5773cd371
4 changed files with 534 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/video.h
View File

@@ -260,8 +260,12 @@ extern const device_t et4000_kasan_isa_device;
extern const device_t et4000_mca_device;
/* Tseng ET4000-W32p */
extern const device_t et4000w32_device;
extern const device_t et4000w32i_device;
extern const device_t et4000w32p_vlb_device;
extern const device_t et4000w32p_pci_device;
extern const device_t et4000w32p_noncardex_vlb_device;
extern const device_t et4000w32p_noncardex_pci_device;
extern const device_t et4000w32p_cardex_vlb_device;
extern const device_t et4000w32p_cardex_pci_device;

682
src/video/vid_et4000w32.c
View File

File diff suppressed because it is too large Load Diff

14
src/video/vid_s3.c
View File

@@ -2517,10 +2517,7 @@ static void s3_recalctimings(svga_t *svga)
switch (svga->crtc[0x67] >> 4) {
case 3: case 5: case 7:
if (s3->chip != S3_VISION868)
svga->clock /= 2;
else
svga->clock *= 2;
svga->clock /= 2;
break;
}
@@ -2530,8 +2527,13 @@ static void s3_recalctimings(svga_t *svga)
case 8:
svga->render = svga_render_8bpp_highres;
if (s3->chip != S3_VISION868) {
if (s3->width == 1280 || s3->width == 1600)
svga->hdisp *= 2;
if (s3->chip == S3_86C928) {
if (s3->width == 2048 || s3->width == 1280 || s3->width == 1600)
svga->hdisp *= 2;
} else {
if (s3->width == 1280 || s3->width == 1600)
svga->hdisp *= 2;
}
}
break;
case 15:

4
src/video/vid_table.c
View File

@@ -110,6 +110,8 @@ video_cards[] = {
{ "tgkorvga", &et4000k_isa_device },
{ "et2000", &et2000_device },
{ "et4000ax", &et4000_isa_device },
{ "et4000w32", &et4000w32_device },
{ "et4000w32i", &et4000w32i_device },
{ "vga", &vga_device },
{ "v7_vga_1024i", &v7_vga_1024i_device },
{ "wy700", &wy700_device },
@@ -118,6 +120,7 @@ video_cards[] = {
{ "mach64gx_pci", &mach64gx_pci_device },
{ "mach64vt2", &mach64vt2_device },
{ "et4000w32p_pci", &et4000w32p_cardex_pci_device },
{ "et4000w32p_nc_pci", &et4000w32p_noncardex_pci_device },
{ "cl_gd5430_pci", &gd5430_pci_device, },
{ "cl_gd5434_pci", &gd5434_pci_device },
{ "cl_gd5436_pci", &gd5436_pci_device },
@@ -158,6 +161,7 @@ video_cards[] = {
{ "voodoo3_3k_pci", &voodoo_3_3000_device },
{ "mach64gx_vlb", &mach64gx_vlb_device },
{ "et4000w32p_vlb", &et4000w32p_cardex_vlb_device },
{ "et4000w32p_nc_vlb", &et4000w32p_noncardex_vlb_device },
{ "cl_gd5424_vlb", &gd5424_vlb_device },
{ "cl_gd5428_vlb", &gd5428_vlb_device },
{ "cl_gd5429_vlb", &gd5429_vlb_device },