config: error on dxvk && no d3d renderer

config/cardpick.go

@@ -3,7 +3,6 @@ package config
 import (
 	"errors"
 	"fmt"
-	"log"
 	"strconv"
 
 	"github.com/vinegarhq/vinegar/sysinfo"
@@ -36,7 +35,7 @@ func (b *Binary) pickCard() error {
 
 	// Check if the system actually has PRIME offload and there's no ambiguity with the GPUs.
 	if prime {
-		vk := (b.Dxvk && b.Renderer == "D3D11") || b.Renderer == "Vulkan"
+		vk := b.Dxvk || b.Renderer == "Vulkan"
 
 		if n != 2 && (!vk && n != 1) {
 			return fmt.Errorf("opengl is not capable of choosing the right gpu, it must be explicitly defined")
@@ -59,8 +58,6 @@ func (b *Binary) pickCard() error {
 		return errors.New("gpu not found")
 	}
 
-	log.Printf("Using Card index: %d", idx)
-
 	b.Env.Set("MESA_VK_DEVICE_SELECT_FORCE_DEFAULT_DEVICE", "1")
 	b.Env.Set("DRI_PRIME", strconv.Itoa(idx))
 

config/config.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"dario.cat/mergo"
 	"github.com/BurntSushi/toml"
@@ -83,24 +84,24 @@ func Default() Config {
 		DxvkVersion: "2.3",
 
 		Global: Binary{
-			ForcedGpu: "prime-discrete",
+			ForcedGpu:      "prime-discrete",
 			Dxvk:           true,
 			AutoKillPrefix: true,
 			Env: Environment{
 				"WINEARCH":         "win64",
 				"WINEDEBUG":        "err-kerberos,err-ntlm",
 				"WINEESYNC":        "1",
 				"WINEDLLOVERRIDES": "dxdiagn,winemenubuilder.exe,mscoree,mshtml=",
-	
+
 				"DXVK_LOG_LEVEL": "warn",
 				"DXVK_LOG_PATH":  "none",
-	
+
 				"MESA_GL_VERSION_OVERRIDE":    "4.4",
 				"__GL_THREADED_OPTIMIZATIONS": "1",
 			},
 		},
 		Player: Binary{
-			DiscordRPC:     true,
+			DiscordRPC: true,
 			FFlags: roblox.FFlags{
 				"DFIntTaskSchedulerTargetFps": 640,
 			},
@@ -127,6 +128,10 @@ func (b *Binary) setup() error {
 		return err
 	}
 
+	if !strings.HasPrefix(b.Renderer, "D3D11") && b.Dxvk {
+		return errors.New("dxvk is only valid with d3d renderers")
+	}
+
 	b.Env.Setenv()
 	return nil
 }