Remove non-working 16 MB Voodoo configuration, default to 8MB everywh…

…ere (#519)
schellingb · Sep 7, 2024 · 97291cf · 97291cf
1 parent 912dd46
commit 97291cf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/core_options.h b/core_options.h
@@ -475,7 +475,6 @@ static retro_core_option_v2_definition option_defs[] =
 		{
 			{ "8mb", "Enabled - 8MB memory (default)" },
 			{ "12mb", "Enabled - 12MB memory, Dual Texture" },
-			{ "16mb", "Enabled - 16MB memory (Experimental)" },
 			{ "4mb", "Enabled - 4MB memory, Low Resolution Only" },
 			{ "off", "Disabled" },
 		},

diff --git a/dosbox_pure_libretro.cpp b/dosbox_pure_libretro.cpp
@@ -2643,7 +2643,7 @@ static bool check_variables(bool is_startup = false)
 			DBP_ASSERT(prop);
 			std::string tmpval;
 			const char* old_val = (prop->Get_type() == Value::V_STRING ? (const char*)prop->GetValue() : (tmpval = prop->GetValue().ToString()).c_str());
-			if (!section || !strcmp(new_value, old_val) || prop->IsFixed()) return false;
+			if (!strcmp(new_value, old_val) || prop->IsFixed()) return false;
 
 			bool reInitSection = (dbp_state != DBPSTATE_BOOT);
 			if (disallow_in_game && dbp_game_running)
@@ -2854,7 +2854,7 @@ static bool check_variables(bool is_startup = false)
 	retro_set_visibility("dosbox_pure_voodoo_scale", machine_is_svga);
 	if (machine_is_svga)
 	{
-		Variables::DosBoxSet("pci", "voodoo", retro_get_variable("dosbox_pure_voodoo", "12mb"), true, true);
+		Variables::DosBoxSet("pci", "voodoo", retro_get_variable("dosbox_pure_voodoo", "8mb"), true, true);
 		const char* voodoo_perf = retro_get_variable("dosbox_pure_voodoo_perf", "1");
 		Variables::DosBoxSet("pci", "voodoo_perf", voodoo_perf);
 		if (dbp_hw_render.context_type == RETRO_HW_CONTEXT_NONE && (atoi(voodoo_perf) & 0x4))

diff --git a/src/dosbox.cpp b/src/dosbox.cpp
@@ -689,7 +689,7 @@ void DOSBOX_Init(void) {
 #ifdef C_DBP_ENABLE_VOODOO
 	void VOODOO_Init(Section*);
 	secprop->AddInitFunction(&VOODOO_Init,true);
-	secprop->Add_string("voodoo",Property::Changeable::OnlyAtStart,"12mb");
+	secprop->Add_string("voodoo",Property::Changeable::OnlyAtStart,"8mb");
 	secprop->Add_int("voodoo_perf",Property::Changeable::Always,1);
 	secprop->Add_int("voodoo_gamma",Property::Changeable::Always,1);
 	secprop->Add_int("voodoo_scale",Property::Changeable::Always,1);

diff --git a/src/hardware/voodoo.cpp b/src/hardware/voodoo.cpp
@@ -277,7 +277,6 @@ enum
 {
 	VOODOO_1_4MB,
 	VOODOO_1_DTMU,
-	VOODOO_1_16MB,
 	VOODOO_1_8MB,
 	VOODOO_2, // must be after all Voodoo 1 types
 	_VOODOO_TYPE_MAX,
@@ -8270,13 +8269,6 @@ static void voodoo_init(UINT8 type) {
 			tmumem1 = 0;
 			break;
 
-		case VOODOO_1_16MB:
-			v->regaccess = voodoo_register_access;
-			fbmemsize = 8;
-			tmumem0 = 8;
-			tmumem1 = 0;
-			break;
-
 		case VOODOO_1_DTMU:
 			v->regaccess = voodoo_register_access;
 			fbmemsize = 4;
@@ -8843,7 +8835,7 @@ void VOODOO_Init(Section* sec) {
 	const char* typestr = section->Get_string("voodoo");
 	switch (typestr[0])
 	{
-		case '1': type = (typestr[1] == '6' ? VOODOO_1_16MB : VOODOO_1_DTMU); break; //16mb / 12mb
+		case '1': type = VOODOO_1_DTMU; break; //12mb
 		case '8': type = VOODOO_1_8MB; break; //8mb
 		case '4': type = VOODOO_1_4MB; break; //4mb
 		default: return; // disabled