joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

add config option 'voodoo_maxmem'; 'voodoo' is now 'voodoo_card' in [voodoo] section

Browse Source
This commit is contained in:
Wengier
2020-08-27 17:30:14 -04:00
parent e7ff0a91cf
commit 8fc4bcaea0
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG
View File

@@ -140,8 +140,16 @@
still shows 10 slots as before, but you can now go
to the previous or next page (up to 10 pages) for
more save slots (100 in total). (Wengier).
- Added support for Glide wrapper. The library file
glide2x.dll/libglide2x.so/libglide2x.dylib will be
- Add config option "voodoo_maxmem" (default: true)
to specify whether to use the maximum memory size
(12MB instead of the standard 4MB) for the Vooodoo
card. The [pci] section is now [voodoo] section,
and its only config option "voodoo" is now named
"voodoo_card" to make it clear it is for emulating
the Voodoo card hardware. (Wengier)
- Added support for Glide wrapper. It can be enabled
with "glide=true" in [voodoo] section. The library
file glide2x.dll/libglide2x.so/libglide2x.dylib is
required for Glide to work. Be sure to use 32-bit
dll for 32-bit DOSBox-X binary, and 64-bit dll for
64-bit DOSBox-X binary. (Wengier)

10
src/dosbox.cpp
View File

@@ -2390,11 +2390,15 @@ void DOSBOX_SetupConfigSections(void) {
Pstring->Set_values(auxdevices);
Pstring->Set_help("Type of PS/2 mouse attached to the AUX port");
secprop=control->AddSection_prop("pci",&Null_Init,false); //PCI bus
secprop=control->AddSection_prop("voodoo",&Null_Init,false); //Voodoo
Pstring = secprop->Add_string("voodoo",Property::Changeable::WhenIdle,"auto");
Pstring = secprop->Add_string("voodoo_card",Property::Changeable::WhenIdle,"auto");
Pstring->Set_values(voodoo_settings);
Pstring->Set_help("Enable VOODOO support.");
Pstring->Set_help("Enable VOODOO card support.");
Pbool = secprop->Add_bool("voodoo_maxmem",Property::Changeable::OnlyAtStart,true);
Pbool->Set_help("Specify whether to enable maximum memory size for the VOODOO card.\n"
"If set (on by default), the memory size will be 12MB (4MB front buffer + 2x4MB texture units)\n"
"Otherwise, the memory size will be the standard 4MB (2MB front buffer + 1x2MB texture unit)");
Pbool = secprop->Add_bool("glide",Property::Changeable::WhenIdle,false);
Pbool->Set_help("Enable Glide emulation (requires glide2x.dll/libglide2x.so/libglide2x.dylib).");
//Phex = secprop->Add_hex("grport",Property::Changeable::WhenIdle,0x600);

4
src/hardware/glide.cpp
View File

@@ -461,7 +461,7 @@ void GLIDE_ShutDown(Section* sec) {
}
void GLIDE_Init() {
test = new GLIDE(control->GetSection("pci"));
test = new GLIDE(control->GetSection("voodoo"));
AddExitFunction(AddExitFunctionFuncPair(GLIDE_ShutDown),true);
}
@@ -951,7 +951,7 @@ static void process_msg(Bitu value)
FP.grFunction0 = (pfunc0)fn_pt[i];
FP.grFunction0();
Section_prop *section=static_cast<Section_prop *>(control->GetSection("pci"));
Section_prop *section=static_cast<Section_prop *>(control->GetSection("voodoo"));
if (section) glide.splash = section->Get_bool("splash");
#if LOG_GLIDE

8
src/hardware/voodoo.cpp
View File

@@ -91,7 +91,7 @@ public:
emulation_type=-1;
Section_prop * section=static_cast<Section_prop *>(configuration);
std::string voodoo_type_str(section->Get_string("voodoo"));
std::string voodoo_type_str(section->Get_string("voodoo_card"));
if (voodoo_type_str=="false") {
emulation_type=0;
} else if (voodoo_type_str=="software") {
@@ -109,6 +109,10 @@ public:
Bits card_type = 1;
bool max_voodoomem = true;
if (section->Get_bool("voodoo_maxmem"))
max_voodoomem = true;
else
max_voodoomem = false;
bool needs_pci_device = false;
@@ -226,7 +230,7 @@ void VOODOO_OnPowerOn(Section* /*sec*/) {
if (voodoo_dev == NULL) {
voodoo_pci_enabled = true;
voodoo_current_lfb=(VOODOO_INITIAL_LFB&0xffff0000);
voodoo_dev = new VOODOO(control->GetSection("pci"));
voodoo_dev = new VOODOO(control->GetSection("voodoo"));
voodoo_lfb_cb_init();
}