claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5692 from win2kgamer/s3v-init-fix

Browse Source 
Ensure the S3 ViRGE type is correctly assigned including when using an onboard ViRGE
This commit is contained in:
Miran Grča
2025-06-23 05:22:26 +02:00
committed by GitHub
parent dd305a174c 212401bed6
commit eed26c5df8
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/video/vid_s3_virge.c
View File

@@ -211,6 +211,7 @@ typedef struct virge_t {
uint8_t pci_regs[256];
uint8_t pci_slot;
uint8_t type;
int chip;
int bilinear_enabled;
@@ -5140,9 +5141,11 @@ s3_virge_init(const device_t *info)
virge_t *virge = (virge_t *) calloc(1, sizeof(virge_t));
reset_state = calloc(1, sizeof(virge_t));
virge->type = (info->local & 0xff);
virge->bilinear_enabled = device_get_config_int("bilinear");
virge->dithering_enabled = device_get_config_int("dithering");
if (info->local >= S3_VIRGE_GX2)
if (virge->type >= S3_VIRGE_GX2)
virge->memory_size = 4;
else
virge->memory_size = device_get_config_int("memory");
@@ -5150,7 +5153,7 @@ s3_virge_init(const device_t *info)
virge->onboard = !!(info->local & 0x100);
if (!virge->onboard)
switch (info->local) {
switch (virge->type) {
case S3_VIRGE_325:
bios_fn = ROM_VIRGE_325;
break;
@@ -5197,7 +5200,7 @@ s3_virge_init(const device_t *info)
virge->svga.hwcursor.cur_ysize = 64;
if (bios_fn != NULL) {
if (info->local == S3_VIRGE_GX2)
if (virge->type == S3_VIRGE_GX2)
rom_init(&virge->bios_rom, bios_fn, 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL);
else
rom_init(&virge->bios_rom, bios_fn, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
@@ -5251,7 +5254,7 @@ s3_virge_init(const device_t *info)
virge->virge_id = 0xe1;
virge->is_agp = !!(info->flags & DEVICE_AGP);
switch (info->local) {
switch (virge->type) {
case S3_VIRGE_325:
case S3_DIAMOND_STEALTH3D_2000:
case S3_MIROCRYSTAL_3D:
@@ -5356,7 +5359,7 @@ s3_virge_init(const device_t *info)
default:
break;
}
if (info->local == S3_VIRGE_GX)
if (virge->type == S3_VIRGE_GX)
virge->svga.crtc[0x36] |= (1 << 2);
}