Bump DXVK to v2.1

nipkownix · Mar 18, 2023 · 09dbd46 · 09dbd46
1 parent 674116a
commit 09dbd46
Show file tree

Hide file tree

Showing 361 changed files with 34,892 additions and 37,387 deletions.
diff --git a/dllmain/D3D9hook.cpp b/dllmain/D3D9hook.cpp
@@ -39,7 +39,7 @@ static IDirect3D9* WINAPI hook_Direct3DCreate9(UINT SDKVersion)
 
 				// Save cache
 				std::ofstream out(cachePath, std::ios::binary);
-				out.write(reinterpret_cast<char*>(&dxvk_cache_data[0]), dxvk_cache_size);
+				out.write(reinterpret_cast<const char*>(&dxvk_cache_data[0]), dxvk_cache_size);
 				out.close();
 			}
 

diff --git a/dllmain/Settings.cpp b/dllmain/Settings.cpp
@@ -108,7 +108,6 @@ void ReadSettingsIni(std::wstring ini_path)
 		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->bDisableAsync = ini.getBool("VULKAN", "DisableAsync", re4t::dxvk::cfg->bDisableAsync);
 
 		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);
@@ -595,7 +594,6 @@ void re4t_cfg::WriteSettings(bool trainerOnly)
 		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("VULKAN", "DisableAsync", re4t::dxvk::cfg->bDisableAsync);
 
 		// DISPLAY
 		ini.setFloat("DISPLAY", "FOVAdditional", re4t::cfg->fFOVAdditional);

diff --git a/dllmain/cfgMenu.cpp b/dllmain/cfgMenu.cpp
@@ -390,6 +390,7 @@ void cfgMenuRender()
 
 						ImGui::Dummy(ImVec2(10, 10 * esHook._cur_monitor_dpi));
 						ImGui::TextWrapped("Enables the use of the DXVK-based vulkan renderer, which provides better performance on newer hardware.");
+						ImGui::TextWrapped("(Not recommended on older GPUs)");
 
 						ImGui::Dummy(ImVec2(10, 10 * esHook._cur_monitor_dpi));
 
@@ -423,16 +424,6 @@ void cfgMenuRender()
 
 						ImGui::TextWrapped("Shows the name of the GPU and the driver version.");
 
-						ImGui::Dummy(ImVec2(10, 10 * esHook._cur_monitor_dpi));
-
-						if (ImGui::Checkbox("DisableAsync", &re4t::dxvk::cfg->bDisableAsync))
-						{
-							re4t::cfg->HasUnsavedChanges = true;
-							NeedsToRestart = true;
-						}
-
-						ImGui::TextWrapped("Disables asynchronous shader compilation. Not recommended.");
-
 						ImGui::EndDisabled();
 					}
 

diff --git a/dllmain/dllmain.vcxproj b/dllmain/dllmain.vcxproj