Add an option to force use of wasi server if desktop server is used.

Author: antaalt

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Added
+
+- User can request the wasi server instead of the desktop server.
+
 ## [1.2.0] - 2025-10-04
 
 ### Changed

package.json

@@ -266,6 +266,11 @@
             "description": "Override configuration with a path to a specific configuration file.",
             "type": "string",
             "default": ""
+          },
+          "shader-validator.useWasiServer": {
+            "description": "Use the wasi server instead of the native server. Only working for platform where DXC is available.",
+            "type": "boolean",
+            "default": false
           }
         }
       },

src/client.ts

@@ -107,13 +107,10 @@ export class ServerVersion {
             this.path = ServerVersion.getPlatformBinaryUri(extensionUri, null, this.platform);
             this.cwd = ServerVersion.getPlatformBinaryDirectoryPath(extensionUri, null, this.platform);
         }
-    }
-    update() {
-
     }
     private static getUserServerPathAndVersion(platform: ServerPlatform) : [string, string] | null {
-        if (isRunningOnWeb()) {
-            return null;
+        if (platform === ServerPlatform.wasi) {
+            return null; // Bundled wasi version
         } else {
             // Check configuration.
             let serverPath = vscode.workspace.getConfiguration("shader-validator").get<string>("serverPath");
@@ -201,10 +198,14 @@ export class ServerVersion {
         return vscode.Uri.joinPath(ServerVersion.getPlatformBinaryDirectoryPath(extensionUri, serverPath, platform), ServerVersion.getPlatformBinaryName(serverPath, platform));
     }
     static getServerPlatform() : ServerPlatform {
-        if (isRunningOnWeb()) {
+        let useWasiServer = vscode.workspace.getConfiguration("shader-validator").get<boolean>("useWasiServer")!;
+        if (isRunningOnWeb() || useWasiServer) {
             return ServerPlatform.wasi;
         } else {
             // Dxc only built for linux x64 & windows x64. Fallback to WASI for every other situations.
+            // TODO: ARM DLL available aswell, need to bundle them, along with correct version of server. 
+            // Should have an extension version per platform.
+            // Could have a setting for user provided DLL path aswell, but useless if server does not match the platform.
             switch (process.platform) {
                 case "win32":
                     return (process.arch === 'x64') ? ServerPlatform.windows : ServerPlatform.wasi;
@@ -280,7 +281,7 @@ export class ShaderLanguageClient {
         this.statusChangedCallback = statusChangedCallback;
     }
 
-    async start(context: vscode.ExtensionContext): Promise<ServerStatus> {
+    async start(context: vscode.ExtensionContext, updateServerUsed: boolean): Promise<ServerStatus> {
         if (this.serverStatus === ServerStatus.running) {
             return ServerStatus.running;
         }
@@ -296,20 +297,25 @@ export class ShaderLanguageClient {
                 this.channel = null;
                 break;
         }
-        this.serverVersion.update();
+        if (updateServerUsed) {
+            this.updateServerVersion(context.extensionUri);
+        }
         this.client = await this.createLanguageClient(context);
         this.serverStatus = this.client !== null ? ServerStatus.running : ServerStatus.error;
         return this.serverStatus;
     }
     async restart(context: vscode.ExtensionContext) {
         await this.stop();
-        await this.start(context);
+        await this.start(context, true);
     }
     async stop() {
         await this.client?.stop(100).catch(_ => {});
         this.dispose();
         this.serverStatus = ServerStatus.stopped;
     }
+    updateServerVersion(extensionUri: vscode.Uri) {
+        this.serverVersion = new ServerVersion(extensionUri);
+    }
     updateStatus(status: ServerStatus) {
         this.serverStatus = status;
         this.statusChangedCallback(status);

src/extension.ts

@@ -52,7 +52,7 @@ export async function activate(context: vscode.ExtensionContext)
     // Create language client
     const server = new ShaderLanguageClient(context);
     context.subscriptions.push(server);
-    const serverStatus = await server.start(context);
+    const serverStatus = await server.start(context, false);
 
     // Create sidebar
     sidebar = new ShaderVariantTreeDataProvider(context, server);
@@ -67,8 +67,8 @@ export async function activate(context: vscode.ExtensionContext)
         //client.sendRequest()
         vscode.window.showInformationMessage("Cannot validate file manually for now");
     }));
-    context.subscriptions.push(vscode.commands.registerCommand("shader-validator.startServer", async () => {
-        await server.start(context);
+    context.subscriptions.push(vscode.commands.registerCommand("shader-validator.startServer", async (updateServerUsed: boolean) => {
+        await server.start(context, updateServerUsed);
         statusBar.updateStatusBar();
         sidebar.onServerStart();
     }));
@@ -150,6 +150,7 @@ export async function activate(context: vscode.ExtensionContext)
                     "shader-validator.hlsl.enabled",
                     "shader-validator.glsl.enabled",
                     "shader-validator.wgsl.enabled",
+                    "shader-validator.useWasiServer",
                 ];
                 let requiresRestart = false;
                 for (let configuration of configurationRequiringAServerRestart) {

src/view/shaderStatusBar.ts

@@ -52,10 +52,10 @@ export class ShaderStatusBar {
             case ServerStatus.stopped:
                 this.statusBar.color = new vscode.ThemeColor("statusBarItem.warningForeground");
                 this.statusBar.backgroundColor = new vscode.ThemeColor("statusBarItem.warningBackground");
-                this.statusBar.command = "shader-validator.startServer";
+                this.statusBar.command = "shader-validator.startServer true";
                 this.statusBar.text = "$(play-circle) shader-validator";
                 statusString = `Server stopped.`;
-                statusCommand = `[$(debug-start) Start Server](command:shader-validator.startServer "Start the server")`;
+                statusCommand = `[$(debug-start) Start Server](command:shader-validator.startServer?%22true%22 "Start the server")`;
                 break;
             default:
                 break;