Skip to content

Run Windows games on Apple Silicon — free, open source, with an open compatibility database that tells you what actually works.

d3dmetal: apply the fps cap through dxmt's config

itsOwen14926c586391
diff --git a/Sources/HighballKit/Bottle.swift b/Sources/HighballKit/Bottle.swift
index 351c298..888fad5 100644
--- a/Sources/HighballKit/Bottle.swift
+++ b/Sources/HighballKit/Bottle.swift
@@ -501,7 +501,7 @@ public struct Bottle: Sendable {
switch r {
case .dxvk: env["DXVK_FRAME_RATE"] = String(settings.fpsCap)
case .vkd3d: env["DXVK_FRAME_RATE"] = String(settings.fpsCap); env["VKD3D_FRAME_RATE"] = String(settings.fpsCap)
- case .dxmt: env["DXMT_CONFIG"] = "d3d11.preferredMaxFrameRate=\(settings.fpsCap);"
+ case .dxmt, .d3dmetal: env["DXMT_CONFIG"] = "d3d11.preferredMaxFrameRate=\(settings.fpsCap);" // 32-bit titles on d3dmetal run on dxmt
default: break
}
}
diff --git a/Tests/HighballKitTests/EnvironmentTests.swift b/Tests/HighballKitTests/EnvironmentTests.swift
index 53a3ebf..9d00f3e 100644
--- a/Tests/HighballKitTests/EnvironmentTests.swift
+++ b/Tests/HighballKitTests/EnvironmentTests.swift
@@ -194,4 +194,17 @@ final class EnvironmentTests: XCTestCase {
XCTAssertEqual(try Renderer.d3dmetal.environment(engine: engine)["WINEDLLPATH_PREPEND"], "\(d3dmetal):\(dxmt.path):\(d9vk)",
"dxmt comes after d3dmetal, so d3dmetal still serves everything it ships")
}
+
+ // the fps cap reaches the 32-bit games dxmt serves on a d3dmetal environment
+ func testD3DMetalPassesTheFpsCapToDXMT() throws {
+ let engine = try d3dmetalEngine()
+ defer { try? FileManager.default.removeItem(at: engine.root) }
+ var bottle = Bottle(url: URL(fileURLWithPath: "/tmp/hb-test-bottle"),
+ settings: BottleSettings(name: "t", engineID: engine.id))
+ XCTAssertNil(try bottle.environment(engine: engine, renderer: .d3dmetal)["DXMT_CONFIG"], "uncapped sets nothing")
+ bottle.settings.fpsCap = 45
+ let env = try bottle.environment(engine: engine, renderer: .d3dmetal)
+ XCTAssertEqual(env["DXMT_CONFIG"], "d3d11.preferredMaxFrameRate=45;")
+ XCTAssertNil(env["DXVK_FRAME_RATE"], "d3dmetal has no dxvk cap channel")
+ }
}