Skip to content

Play your Steam library's Windows games on a jailbroken PS5.

C++

Ask Unity and Unreal for Direct3D 12 with vkd3d-proton

Leonardo Lobatob040b8fd8b97
diff --git a/src/runtime/game_settings.cpp b/src/runtime/game_settings.cpp
index 57a97fd..803bd73 100644
--- a/src/runtime/game_settings.cpp
+++ b/src/runtime/game_settings.cpp
@@ -659,6 +659,13 @@ bool BuildEffectiveSettings(const GameRecipe& recipe, const SettingsPreset* pres
// get Vulkan instead. A player's Extra arguments still come last and win.
if (kit.opengl_zink && recipe.detected.rfind("godot", 0) == 0)
ReplaceAll(&arguments, "--rendering-driver opengl3", "--rendering-driver vulkan");
+ // Generated recipes ask Unity and Unreal for Direct3D 11, which DXVK draws. With Direct3D 12 on vkd3d-proton they
+ // ask for Direct3D 12 instead (CULTIC stays black on 11). Arguments the player typed are left as they are.
+ if (IsGeneratedRecipeId(recipe.id) && required.source != ValueSource::kUser &&
+ out.values["d3d12"].value == "vkd3d-proton") {
+ ReplaceAll(&arguments, "-force-d3d11", "-force-d3d12");
+ ReplaceAll(&arguments, "-dx11", "-dx12");
+ }
std::string resolution_arguments = recipe.resolution_arguments;
const auto& resolution = out.values["resolution"].value;
const auto x = resolution.find('x');
diff --git a/tests/game_settings_test.cpp b/tests/game_settings_test.cpp
index 80ee78f..9437e98 100644
--- a/tests/game_settings_test.cpp
+++ b/tests/game_settings_test.cpp
@@ -1273,6 +1273,24 @@ int main(int argc, char** argv) {
CHECK(BuildEffectiveSettings(hl2, nullptr, {{"dll_overrides", std::string("d3d9=n;") + kVkd3dProtonDxgiOverrides}},
vkd3d_dxvk_kit, &settings, &error));
CHECK(!settings.vkd3d_proton && settings.dll_overrides == "d3d9=n");
+ // Generated Unity and Unreal recipes ask for Direct3D 12 while vkd3d-proton draws it; arguments the player typed
+ // stay as they are.
+ {
+ auto engine = generated;
+ engine.arguments = "-force-d3d11 -dx11";
+ CHECK(BuildEffectiveSettings(engine, nullptr, {}, vkd3d_kit, &settings, &error));
+ CHECK(settings.arguments == "-force-d3d11 -dx11");
+ CHECK(BuildEffectiveSettings(engine, nullptr, {{"d3d12", "vkd3d-proton"}}, vkd3d_kit, &settings, &error));
+ CHECK(settings.arguments == "-force-d3d12 -dx12");
+ CHECK(BuildEffectiveSettings(engine, nullptr, {{"d3d12", "vkd3d-proton"}, {"arguments", "-dx11"}}, vkd3d_kit,
+ &settings, &error));
+ CHECK(settings.arguments == "-dx11");
+ auto shipped = engine;
+ shipped.id = hl2.id;
+ CHECK(BuildEffectiveSettings(shipped, nullptr, {{"d3d12", "vkd3d-proton"}, {"unlock.graphics", "on"}}, vkd3d_kit,
+ &settings, &error));
+ CHECK(settings.arguments == "-force-d3d11 -dx11");
+ }
CHECK(KitCapabilitiesFromManifest({kKitVkd3dProton}, false).vkd3d_proton &&
!KitCapabilitiesFromManifest({kKitDxvk}, false).vkd3d_proton);
// A locked row keeps the recipe's value until the player changes it anyway.