fix pr "Allow Zink to use System Vulkan driver"

This commit is contained in:
ShirosakiMio 2024-07-05 10:53:46 +08:00
parent cba98f12b0
commit b6279e9309
3 changed files with 11 additions and 1 deletions

View File

@ -426,6 +426,7 @@ public class DefaultLauncher extends Launcher {
renderer,
finalArgs
);
config.setUseVKDriverSystem(options.isVKDriverSystem());
return FCLauncher.launchMinecraft(config);
}
}

View File

@ -56,6 +56,7 @@ public class FCLConfig implements Serializable {
private final String workingDir;
private final Renderer renderer;
private final String[] args;
private boolean useVKDriverSystem = false;
public FCLConfig(Context context, String logDir, String javaPath, String workingDir, Renderer renderer, String[] args) {
this.context = context;
@ -90,4 +91,12 @@ public class FCLConfig implements Serializable {
return args;
}
public void setUseVKDriverSystem(boolean useVKDriverSystem) {
this.useVKDriverSystem = useVKDriverSystem;
}
public boolean isUseVKDriverSystem() {
return useVKDriverSystem;
}
}

View File

@ -140,7 +140,7 @@ public class FCLauncher {
envMap.put("PATH", FFmpegPlugin.libraryPath + ":" + envMap.get("PATH"));
envMap.put("LD_LIBRARY_PATH", FFmpegPlugin.libraryPath);
}
if (options.isVKDriverSystem()) {
if (config.isUseVKDriverSystem()) {
envMap.put("VULKAN_DRIVER_SYSTEM", "1");
}
}