DXR Support Toggle

Whisky-App · Oct 24, 2024 · 3587bb2 · 3587bb2
1 parent c500441
commit 3587bb2
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 5 deletions.
diff --git a/Whisky/Localizable.xcstrings b/Whisky/Localizable.xcstrings
@@ -3558,6 +3558,28 @@
         }
       }
     },
+    "config.dxr" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DirectX Raytracing"
+          }
+        }
+      }
+    },
+    "config.dxr.info" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Enables raytracing support in DirectX 12 titles "
+          }
+        }
+      }
+    },
     "config.dxvk" : {
       "localizations" : {
         "ar" : {

diff --git a/Whisky/Views/Bottle/ConfigView.swift b/Whisky/Views/Bottle/ConfigView.swift
@@ -141,6 +141,15 @@ struct ConfigView: View {
                     Text("config.metalTrace")
                     Text("config.metalTrace.info")
                 }
+                if let device = MTLCreateSystemDefaultDevice() {
+                    // Represents the Apple family 9 GPU features that correspond to the Apple A17, M3, and M4 GPUs.
+                    if device.supportsFamily(.apple9) {
+                        Toggle(isOn: $bottle.settings.dxrEnabled) {
+                            Text("config.dxr")
+                            Text("config.dxr.info")
+                        }
+                    }
+                }
             }
         }
         .formStyle(.grouped)

diff --git a/WhiskyKit/Sources/WhiskyKit/Whisky/BottleSettings.swift b/WhiskyKit/Sources/WhiskyKit/Whisky/BottleSettings.swift
@@ -104,13 +104,15 @@ public struct BottleWineConfig: Codable, Equatable {
 public struct BottleMetalConfig: Codable, Equatable {
     var metalHud: Bool = false
     var metalTrace: Bool = false
+    var dxrEnabled: Bool = false
 
     public init() {}
 
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.metalHud = try container.decodeIfPresent(Bool.self, forKey: .metalHud) ?? false
         self.metalTrace = try container.decodeIfPresent(Bool.self, forKey: .metalTrace) ?? false
+        self.dxrEnabled = try container.decodeIfPresent(Bool.self, forKey: .dxrEnabled) ?? false
     }
 }
 
@@ -178,6 +180,11 @@ public struct BottleSettings: Codable, Equatable {
         set { wineConfig.windowsVersion = newValue }
     }
 
+    public var avxEnabled: Bool {
+        get { return wineConfig.avxEnabled }
+        set { wineConfig.avxEnabled = newValue }
+    }
+
     /// The pinned programs on this bottle
     public var pins: [PinnedProgram] {
         get { return info.pins }
@@ -205,6 +212,11 @@ public struct BottleSettings: Codable, Equatable {
         set { metalConfig.metalTrace = newValue }
     }
 
+    public var dxrEnabled: Bool {
+        get { return metalConfig.dxrEnabled }
+        set { metalConfig.dxrEnabled = newValue }
+    }
+
     public var dxvk: Bool {
         get { return dxvkConfig.dxvk }
         set { dxvkConfig.dxvk = newValue }
@@ -220,11 +232,6 @@ public struct BottleSettings: Codable, Equatable {
         set { dxvkConfig.dxvkHud = newValue }
     }
 
-    public var avxEnabled: Bool {
-        get { return wineConfig.avxEnabled }
-        set { wineConfig.avxEnabled = newValue }
-    }
-
     @discardableResult
     public static func decode(from metadataURL: URL) throws -> BottleSettings {
         guard FileManager.default.fileExists(atPath: metadataURL.path(percentEncoded: false)) else {
@@ -306,5 +313,9 @@ public struct BottleSettings: Codable, Equatable {
         if avxEnabled {
             wineEnv.updateValue("1", forKey: "ROSETTA_ADVERTISE_AVX")
         }
+
+        if dxrEnabled {
+            wineEnv.updateValue("1", forKey: "D3DM_SUPPORT_DXR")
+        }
     }
 }