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

Merge remote-tracking branch 'origin/master' into feature/machine_and_kb

Browse Source
This commit is contained in:
OBattler
2021-09-26 22:52:33 +02:00
parent 5ad606a8f2 fe48e3b36d
commit 5231ab4e44
6 changed files with 710 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -373,19 +373,18 @@ extern const device_t s3_trio64v2_dx_pci_device;
extern const device_t s3_trio64v2_dx_onboard_pci_device;
/* S3 ViRGE */
extern const device_t s3_virge_325_vlb_device;
extern const device_t s3_virge_325_pci_device;
extern const device_t s3_virge_vlb_device;
extern const device_t s3_virge_pci_device;
extern const device_t s3_virge_988_vlb_device;
extern const device_t s3_virge_988_pci_device;
extern const device_t s3_virge_375_vlb_device;
extern const device_t s3_diamond_stealth_2000_pci_device;
extern const device_t s3_diamond_stealth_3000_pci_device;
extern const device_t s3_virge_375_pci_device;
extern const device_t s3_virge_375_4_vlb_device;
extern const device_t s3_virge_375_4_pci_device;
#if defined(DEV_BRANCH) && defined(USE_S3TRIO3D2X)
extern const device_t s3_trio3d_2x_pci_device;
#endif
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;
/* Sigma Color 400 */
extern const device_t sigma_device;