allow for dxvk usage and installation only during player routine

vinegarhq · Aug 3, 2023 · c5c20ca · c5c20ca
1 parent a34246e
commit c5c20ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/config.go b/config.go
@@ -65,11 +65,6 @@ func LoadConfigFile() Configuration {
 		config.Env["PATH"] = filepath.Join(config.WineRoot, "bin") + ":" + os.Getenv("PATH")
 	}
 
-	if config.Dxvk {
-		// Tells wine to use the DXVK DLLs
-		config.Env["WINEDLLOVERRIDES"] += "d3d10core=n;d3d11=n;d3d9=n;dxgi=n"
-	}
-
 	for name, value := range config.Env {
 		os.Setenv(name, value)
 	}

diff --git a/roblox.go b/roblox.go
@@ -184,6 +184,13 @@ func RobloxPlayer(args ...string) {
 	rblx.GetVersion("version")
 
 	rblx.Setup()
+
+	DxvkStrap()
+	if config.Dxvk {
+		// Tells wine to use the DXVK DLLs
+		config.Env["WINEDLLOVERRIDES"] += "d3d10core=n;d3d11=n;d3d9=n;dxgi=n"
+	}
+
 	rblx.ApplyFFlags("Client")
 	rblx.Execute("RobloxPlayerBeta.exe", args)
 	RobloxKillPfx()
@@ -200,7 +207,6 @@ func RobloxStudio(args ...string) {
 	rblx.PackageDests = StudioPackages()
 	rblx.SetupURL(channel)
 	rblx.GetVersion("versionQTStudio")
-	Config.Dxvk = false // Dxvk doesnt work under Studio
 
 	rblx.Setup()
 	rblx.ApplyFFlags("Studio")