Disable DXVK by default

nipkownix · Mar 21, 2023 · e7c4fa8 · e7c4fa8
1 parent 07f6974
commit e7c4fa8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/dllmain/Settings.cpp b/dllmain/Settings.cpp
@@ -112,13 +112,13 @@ void ReadSettingsIni(std::wstring ini_path, setType type)
 	if ((type == MAIN) || (type == ALL))
 	{
 		// VULKAN
-		re4t::dxvk::cfg->bUseVulkanRenderer = ini.getBool("VULKAN", "UseVulkanRenderer", re4t::dxvk::cfg->bUseVulkanRenderer);
-		re4t::dxvk::cfg->bShowFPS = ini.getBool("VULKAN", "ShowFPS", re4t::dxvk::cfg->bShowFPS);
-		re4t::dxvk::cfg->bShowGPULoad = ini.getBool("VULKAN", "ShowGPULoad", re4t::dxvk::cfg->bShowGPULoad);
-		re4t::dxvk::cfg->bShowDeviceInfo = ini.getBool("VULKAN", "ShowDeviceInfo", re4t::dxvk::cfg->bShowDeviceInfo);
+		re4t::dxvk::cfg->bUseVulkanRenderer = ini.getBool("RENDERER", "UseVulkanRenderer", re4t::dxvk::cfg->bUseVulkanRenderer);
+		re4t::dxvk::cfg->bShowFPS = ini.getBool("RENDERER", "ShowFPS", re4t::dxvk::cfg->bShowFPS);
+		re4t::dxvk::cfg->bShowGPULoad = ini.getBool("RENDERER", "ShowGPULoad", re4t::dxvk::cfg->bShowGPULoad);
+		re4t::dxvk::cfg->bShowDeviceInfo = ini.getBool("RENDERER", "ShowDeviceInfo", re4t::dxvk::cfg->bShowDeviceInfo);
 
-		re4t::dxvk::cfg->DXVK_HUD = ini.getString("VULKAN", "DXVK_HUD", re4t::dxvk::cfg->DXVK_HUD);
-		re4t::dxvk::cfg->DXVK_FILTER_DEVICE_NAME = ini.getString("VULKAN", "DXVK_FILTER_DEVICE_NAME", re4t::dxvk::cfg->DXVK_FILTER_DEVICE_NAME);
+		re4t::dxvk::cfg->DXVK_HUD = ini.getString("RENDERER", "DXVK_HUD", re4t::dxvk::cfg->DXVK_HUD);
+		re4t::dxvk::cfg->DXVK_FILTER_DEVICE_NAME = ini.getString("RENDERER", "DXVK_FILTER_DEVICE_NAME", re4t::dxvk::cfg->DXVK_FILTER_DEVICE_NAME);
 
 		// DISPLAY
 		re4t::cfg->fFOVAdditional = ini.getFloat("DISPLAY", "FOVAdditional", re4t::cfg->fFOVAdditional);
@@ -600,10 +600,10 @@ void re4t_cfg::WriteSettings(bool trainerOnly)
 		iniReader ini(iniPath);
 
 		// VULKAN
-		ini.setBool("VULKAN", "UseVulkanRenderer", re4t::dxvk::cfg->bUseVulkanRenderer);
-		ini.setBool("VULKAN", "ShowFPS", re4t::dxvk::cfg->bShowFPS);
-		ini.setBool("VULKAN", "ShowGPULoad", re4t::dxvk::cfg->bShowGPULoad);
-		ini.setBool("VULKAN", "ShowDeviceInfo", re4t::dxvk::cfg->bShowDeviceInfo);
+		ini.setBool("RENDERER", "UseVulkanRenderer", re4t::dxvk::cfg->bUseVulkanRenderer);
+		ini.setBool("RENDERER", "ShowFPS", re4t::dxvk::cfg->bShowFPS);
+		ini.setBool("RENDERER", "ShowGPULoad", re4t::dxvk::cfg->bShowGPULoad);
+		ini.setBool("RENDERER", "ShowDeviceInfo", re4t::dxvk::cfg->bShowDeviceInfo);
 
 		// DISPLAY
 		ini.setFloat("DISPLAY", "FOVAdditional", re4t::cfg->fFOVAdditional);

diff --git a/dxvk/src/config.h b/dxvk/src/config.h
@@ -3,8 +3,7 @@
 
 class dxvk_cfg {
 public:
-
-	bool bUseVulkanRenderer = true;
+	bool bUseVulkanRenderer = false;
 	bool bShowFPS = false;
 	bool bShowGPULoad = false;
 	bool bShowDeviceInfo = false;

diff --git a/dxvk/src/util/log/log.cpp b/dxvk/src/util/log/log.cpp
@@ -83,7 +83,7 @@ namespace dxvk {
     }};
 
     iniReader ini;
-    const std::string logLevelStr = ini.getString("VULKAN", "DXVK_LOG_LEVEL", "none");
+    const std::string logLevelStr = ini.getString("RENDERER", "DXVK_LOG_LEVEL", "none");
 
     for (const auto& pair : logLevels) {
       if (logLevelStr == pair.first)

diff --git a/settings/settings.ini b/settings/settings.ini
@@ -1,7 +1,7 @@
-[VULKAN]
+[RENDERER]
 ; Enables the use of the DXVK-based vulkan renderer, which provides better performance on newer hardware.
 ; (Not recommended on older GPUs)
-UseVulkanRenderer = true
+UseVulkanRenderer = false
 
 ; Shows a frame rate counter on the top left of the screen.
 ShowFPS = false