Run Windows games on Apple Silicon — free, open source, with an open compatibility database that tells you what actually works.
Swift apple-silicond3dmetaldxmtdxvkfexgame-porting-toolkitgamingmac-gamingmacosmetalmoltenvksteamswiftuivkd3d-protonwhisky-alternativewindows-gameswinewine-wrapper
Fix D3D9 games silently falling back to wined3d under the DXVK renderer
Gauthier Piarrette5781e8be544f
diff --git a/Sources/HighballKit/Bottle.swift b/Sources/HighballKit/Bottle.swiftindex 15beea0..446accb 100644--- a/Sources/HighballKit/Bottle.swift+++ b/Sources/HighballKit/Bottle.swift@@ -28,8 +28,15 @@ public enum Renderer: String, Codable, CaseIterable, Sendable {env["DYLD_FALLBACK_LIBRARY_PATH+"] = externalenv["DYLD_FALLBACK_FRAMEWORK_PATH+"] = externalcase .dxvk:- guard let dir = engine.rendererDir("dxvk") else { throw HighballError.missing("dxvk renderer in engine \(engine.id)") }- env["WINEDLLPATH_PREPEND"] = dir.appending(path: "wine").path+ // DXVK's D3D10/11 live in the "dxvk" overlay, but its D3D9 ships in a *separate*+ // "d9vk" overlay. Both dirs must be on WINEDLLPATH_PREPEND or a D3D9 title's d3d9+ // resolves to builtin wined3d, whose D3D9 lacks the DF16/DF24 shadow-depth formats+ // Source's CSM check probes — CS:GO then quits with "graphics hardware does not+ // support all features (CSM)" (#21). d9vk is required for .dxvk: a missing overlay+ // must fail loudly, never silently regress D3D9 back to wined3d.+ guard let dxvk = engine.rendererDir("dxvk") else { throw HighballError.missing("dxvk renderer in engine \(engine.id)") }+ guard let d9vk = engine.rendererDir("d9vk") else { throw HighballError.missing("d9vk (DXVK D3D9) renderer in engine \(engine.id)") }+ env["WINEDLLPATH_PREPEND"] = [d9vk.appending(path: "wine").path, dxvk.appending(path: "wine").path].joined(separator: ":")env["WINEDLLOVERRIDES+"] = "dxgi,d3d9,d3d10core,d3d11=n,b"}return envdiff --git a/Tests/HighballKitTests/EnvironmentTests.swift b/Tests/HighballKitTests/EnvironmentTests.swiftindex c174559..36710a3 100644--- a/Tests/HighballKitTests/EnvironmentTests.swift+++ b/Tests/HighballKitTests/EnvironmentTests.swift@@ -79,14 +79,17 @@ final class EnvironmentTests: XCTestCase {XCTAssertEqual(env["ROSETTA_ADVERTISE_AVX"], "1")XCTAssertNil(env["DXVK_FRAME_RATE"], "wined3d has no fps cap channel")- // DXVK renderer needs its overlay dir on disk for environment() to succeed.+ // DXVK renderer needs BOTH overlay dirs on disk: d9vk (D3D9) and dxvk (D3D10/11).+ let d9vkWine = engine.renderersDir.appending(path: "d9vk/wine")let dxvkWine = engine.renderersDir.appending(path: "dxvk/wine")+ try FileManager.default.createDirectory(at: d9vkWine, withIntermediateDirectories: true)try FileManager.default.createDirectory(at: dxvkWine, withIntermediateDirectories: true)defer { try? FileManager.default.removeItem(at: engine.root) }env = try bottle.environment(engine: engine, renderer: .dxvk)XCTAssertEqual(env["DXVK_FRAME_RATE"], "60")XCTAssertEqual(env["DXVK_ASYNC"], "1", "dxvkAsync defaults on")- XCTAssertEqual(env["WINEDLLPATH_PREPEND"], dxvkWine.path)+ // d9vk must come first so DXVK's d3d9 wins the builtin search over wined3d (#21 CSM gate).+ XCTAssertEqual(env["WINEDLLPATH_PREPEND"], "\(d9vkWine.path):\(dxvkWine.path)")}// A renderer whose overlay is missing must throw, not silently fall back.@@ -94,4 +97,15 @@ final class EnvironmentTests: XCTestCase {let (engine, bottle) = try fixtures()XCTAssertThrowsError(try bottle.environment(engine: engine, renderer: .dxmt))}++ // .dxvk with the dxvk overlay present but d9vk (its D3D9) missing must throw — never+ // silently regress D3D9 to builtin wined3d, which is exactly the #21 CSM-gate failure.+ func testDxvkRequiresD9vkOverlay() throws {+ let (engine, bottle) = try fixtures()+ try FileManager.default.createDirectory(at: engine.renderersDir.appending(path: "dxvk/wine"),+ withIntermediateDirectories: true)+ defer { try? FileManager.default.removeItem(at: engine.root) }+ XCTAssertThrowsError(try bottle.environment(engine: engine, renderer: .dxvk),+ "dxvk present but d9vk missing must throw, not fall back to wined3d")+ }}