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

Merge pull request #6036 from unreal9010/master

Browse Source 
Diamond Stealth 3D 4000 changes
This commit is contained in:
Miran Grča
2025-08-24 14:26:31 +02:00
committed by GitHub
parent 109f068034 29363baa20
commit 0b66fccf0c
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -576,7 +576,6 @@ extern const device_t s3_diamond_stealth_2000pro_pci_device;
extern const device_t s3_virge_385_pci_device;
extern const device_t s3_virge_357_pci_device;
extern const device_t s3_virge_357_agp_device;
extern const device_t s3_diamond_stealth_4000_pci_device;
extern const device_t s3_diamond_stealth_4000_agp_device;
extern const device_t s3_trio3d2x_pci_device;
extern const device_t s3_trio3d2x_agp_device;

30
src/video/vid_s3_virge.c
View File

@@ -5758,6 +5758,22 @@ static const device_config_t s3_virge_stb_config[] = {
static const device_config_t s3_virge_357_config[] = {
// clang-format off
{
.name = "memory",
.description = "Memory size",
.type = CONFIG_SELECTION,
.default_string = NULL,
.default_int = 4,
.file_filter = NULL,
.spinner = { 0 },
.selection = {
{ .description = "2 MB", .value = 2 },
{ .description = "4 MB", .value = 4 },
{ .description = "" }
},
.bios = { { 0 } }
},
{
.name = "bilinear",
.description = "Bilinear filtering",
.type = CONFIG_BINARY,
@@ -6014,20 +6030,6 @@ const device_t s3_virge_357_agp_device = {
.config = s3_virge_357_config
};
const device_t s3_diamond_stealth_4000_pci_device = {
.name = "S3 ViRGE/GX2 (Diamond Stealth 3D 4000) PCI",
.internal_name = "stealth3d_4000_pci",
.flags = DEVICE_PCI,
.local = S3_DIAMOND_STEALTH3D_4000,
.init = s3_virge_init,
.close = s3_virge_close,
.reset = s3_virge_reset,
.available = s3_virge_357_diamond_available,
.speed_changed = s3_virge_speed_changed,
.force_redraw = s3_virge_force_redraw,
.config = s3_virge_357_config
};
const device_t s3_diamond_stealth_4000_agp_device = {
.name = "S3 ViRGE/GX2 (Diamond Stealth 3D 4000) AGP",
.internal_name = "stealth3d_4000_agp",

1
src/video/vid_table.c
View File

@@ -230,7 +230,6 @@ video_cards[] = {
{ .device = &s3_diamond_stealth_2000pro_pci_device, .flags = VIDEO_FLAG_TYPE_NONE },
{ .device = &s3_virge_385_pci_device, .flags = VIDEO_FLAG_TYPE_NONE },
{ .device = &s3_virge_357_pci_device, .flags = VIDEO_FLAG_TYPE_NONE },
{ .device = &s3_diamond_stealth_4000_pci_device, .flags = VIDEO_FLAG_TYPE_NONE },
{ .device = &s3_trio3d2x_pci_device, .flags = VIDEO_FLAG_TYPE_NONE },
{ .device = &millennium_device, .flags = VIDEO_FLAG_TYPE_NONE },
{ .device = &millennium_ii_device, .flags = VIDEO_FLAG_TYPE_NONE },