mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-28 09:54:21 -07:00
Code Issues Packages Projects Releases Activity

Onboard video memory config overhaul part 2: S3 cards

Browse Source
This commit is contained in:
win2kgamer
2026-02-26 22:26:15 -06:00
parent 7da97a8987
commit e617405539
2 changed files with 87 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/video/vid_s3.c
View File

@@ -11606,6 +11606,14 @@ s3_init(const device_t *info)
if (vram)
vram_size = vram << 20;
else if (info->local == S3_86C805_ONBOARD) {
vram_size = 1024 << 10;
vram = 1;
}
else if (info->local == S3_PHOENIX_TRIO32_ONBOARD) {
vram_size = 1024 << 10;
vram = 1;
}
else
vram_size = 512 << 10;
@@ -12651,6 +12659,36 @@ static const device_config_t s3_trio64v_config[] = {
{ .name = "", .description = "", .type = CONFIG_END }
};
static const device_config_t s3_trio64v_onboard_config[] = {
{
.name = "memory",
.description = "Memory size",
.type = CONFIG_SELECTION,
.default_string = NULL,
.default_int = 2,
.file_filter = NULL,
.spinner = { 0 },
.selection = {
{ .description = "1 MB", .value = 1 },
{ .description = "2 MB", .value = 2 },
{ .description = "" }
},
.bios = { { 0 } }
},
{
.name = "colorkey",
.description = "Video chroma-keying",
.type = CONFIG_BINARY,
.default_string = NULL,
.default_int = 1,
.file_filter = NULL,
.spinner = { 0 },
.selection = { { 0 } },
.bios = { { 0 } }
},
{ .name = "", .description = "", .type = CONFIG_END }
};
static const device_config_t s3_standard_config[] = {
{
.name = "memory",
@@ -12793,7 +12831,7 @@ const device_t s3_86c805_onboard_vlb_device = {
.available = NULL,
.speed_changed = s3_speed_changed,
.force_redraw = s3_force_redraw,
.config = s3_9fx_config
.config = NULL
};
const device_t s3_spea_mirage_86c805_vlb_device = {
@@ -13172,7 +13210,7 @@ const device_t s3_phoenix_trio32_onboard_vlb_device = {
.available = NULL,
.speed_changed = s3_speed_changed,
.force_redraw = s3_force_redraw,
.config = s3_phoenix_trio32_config
.config = NULL
};
const device_t s3_phoenix_trio32_vlb_device = {
@@ -13200,7 +13238,7 @@ const device_t s3_phoenix_trio32_onboard_pci_device = {
.available = NULL,
.speed_changed = s3_speed_changed,
.force_redraw = s3_force_redraw,
.config = s3_phoenix_trio32_config
.config = s3_9fx_config
};
const device_t s3_phoenix_trio32_pci_device = {
@@ -13270,7 +13308,7 @@ const device_t s3_phoenix_trio64_onboard_pci_device = {
.available = NULL,
.speed_changed = s3_speed_changed,
.force_redraw = s3_force_redraw,
.config = s3_standard_config
.config = s3_9fx_config
};
const device_t s3_phoenix_trio64_pci_device = {
@@ -13312,7 +13350,7 @@ const device_t s3_phoenix_trio64vplus_onboard_pci_device = {
.available = NULL,
.speed_changed = s3_speed_changed,
.force_redraw = s3_force_redraw,
.config = s3_trio64v_config
.config = s3_trio64v_onboard_config
};
const device_t s3_phoenix_trio64vplus_pci_device = {
@@ -13494,5 +13532,5 @@ const device_t s3_trio64v2_dx_onboard_pci_device = {
.available = NULL,
.speed_changed = s3_speed_changed,
.force_redraw = s3_force_redraw,
.config = s3_trio64v_config
.config = s3_trio64v_onboard_config
};

45
src/video/vid_s3_virge.c
View File

@@ -5336,6 +5336,10 @@ s3_virge_init(const device_t *info)
virge->dithering_enabled = device_get_config_int("dithering");
if (virge->type >= S3_VIRGE_GX2)
virge->memory_size = 4;
else if (virge->type == S3_VIRGE_325 && info->local & 0x100)
virge->memory_size = 2;
else if (virge->type == S3_VIRGE_DX && info->local & 0x100)
virge->memory_size = 2;
else
virge->memory_size = device_get_config_int("memory");
@@ -5749,6 +5753,43 @@ static const device_config_t s3_virge_config[] = {
// clang-format on
};
static const device_config_t s3_virge_onboard_config[] = {
// clang-format off
{
.name = "bilinear",
.description = "Bilinear filtering",
.type = CONFIG_BINARY,
.default_int = 1,
.file_filter = NULL,
.spinner = { 0 },
.selection = { { 0 } },
.bios = { { 0 } }
},
{
.name = "colorkey",
.description = "Video chroma-keying",
.type = CONFIG_BINARY,
.default_string = NULL,
.default_int = 1,
.file_filter = NULL,
.spinner = { 0 },
.selection = { { 0 } },
.bios = { { 0 } }
},
{
.name = "dithering",
.description = "Dithering",
.type = CONFIG_BINARY,
.default_int = 1,
.file_filter = NULL,
.spinner = { 0 },
.selection = { { 0 } },
.bios = { { 0 } }
},
{ .name = "", .description = "", .type = CONFIG_END }
// clang-format on
};
static const device_config_t s3_virge_stb_config[] = {
// clang-format off
{
@@ -5933,7 +5974,7 @@ const device_t s3_virge_325_onboard_pci_device = {
.available = NULL,
.speed_changed = s3_virge_speed_changed,
.force_redraw = s3_virge_force_redraw,
.config = s3_virge_config
.config = s3_virge_onboard_config
};
const device_t s3_diamond_stealth_2000_pci_device = {
@@ -6017,7 +6058,7 @@ const device_t s3_virge_375_onboard_pci_device = {
.available = NULL,
.speed_changed = s3_virge_speed_changed,
.force_redraw = s3_virge_force_redraw,
.config = s3_virge_config
.config = s3_virge_onboard_config
};
const device_t s3_diamond_stealth_2000pro_pci_device = {