Fix shader compile/load on windows.

Author: OndraVoves

.github/workflows/test.yaml

@@ -44,6 +44,7 @@ jobs:
 
       - name: Install Zig
         uses: mlugg/setup-zig@v2
+      
       - name: Lint
         run: zig fmt --check . --exclude libs/
 
@@ -71,6 +72,8 @@ jobs:
 
       - name: Install Zig
         uses: mlugg/setup-zig@v2
+        with:
+          cache-size-limit: 4096
 
       - name: Build examples
         shell: bash

build.zig

@@ -24,6 +24,8 @@ pub fn build(b: *std.Build) !void {
     const options_module = options_step.createModule();
     _ = options_module; // autofix
 
+    const use_lld = !target.result.os.tag.isDarwin();
+
     const common_options = [_][]const u8{
         "-fno-sanitize=undefined", // Spentime... 3 fucking days... and randomly found this https://ruoyusun.com/2022/02/27/zig-cc.html (Thx ;))
         "-fno-strict-aliasing",
@@ -58,6 +60,7 @@ pub fn build(b: *std.Build) !void {
             .optimize = optimize,
         }),
         .use_llvm = true,
+        .use_lld = use_lld,
     });
     b.installArtifact(combine_shader_parts);
 
@@ -69,6 +72,7 @@ pub fn build(b: *std.Build) !void {
             .optimize = optimize,
         }),
         .use_llvm = true,
+        .use_lld = use_lld,
     });
     b.installArtifact(combine_shaders);
 
@@ -83,6 +87,7 @@ pub fn build(b: *std.Build) !void {
             .optimize = optimize,
         }),
         .use_llvm = true,
+        .use_lld = use_lld,
     });
     bx.addCSourceFiles(.{
         .flags = &cxx_options,
@@ -105,6 +110,7 @@ pub fn build(b: *std.Build) !void {
             .optimize = optimize,
         }),
         .use_llvm = true,
+        .use_lld = use_lld,
     });
     bimg.addCSourceFiles(.{
         .flags = &cxx_options,
@@ -133,6 +139,7 @@ pub fn build(b: *std.Build) !void {
             .optimize = optimize,
         }),
         .use_llvm = true,
+        .use_lld = use_lld,
     });
     b.installArtifact(bgfx);
     bxInclude(b, bgfx, target, optimize);
@@ -243,6 +250,7 @@ pub fn build(b: *std.Build) !void {
                 .optimize = options.shaderc_optimize,
             }),
             .use_llvm = true,
+            .use_lld = use_lld,
         });
 
         b.installArtifact(shaderc);
@@ -330,6 +338,7 @@ pub fn build(b: *std.Build) !void {
                 .optimize = options.shaderc_optimize,
             }),
             .use_llvm = true,
+            .use_lld = use_lld,
         });
 
         fcpp_lib.addIncludePath(b.path(fcpp_path));
@@ -365,6 +374,7 @@ pub fn build(b: *std.Build) !void {
                 .optimize = options.shaderc_optimize,
             }),
             .use_llvm = true,
+            .use_lld = use_lld,
         });
         spirv_opt_lib.addIncludePath(b.path(spirv_opt_path));
         spirv_opt_lib.addIncludePath(b.path(spirv_opt_path ++ "include"));
@@ -400,6 +410,7 @@ pub fn build(b: *std.Build) !void {
                 .optimize = options.shaderc_optimize,
             }),
             .use_llvm = true,
+            .use_lld = use_lld,
         });
         spirv_cross_lib.addIncludePath(b.path(spirv_cross_path ++ "include"));
         spirv_cross_lib.addCSourceFiles(.{
@@ -439,6 +450,7 @@ pub fn build(b: *std.Build) !void {
                 .optimize = options.shaderc_optimize,
             }),
             .use_llvm = true,
+            .use_lld = use_lld,
         });
         glslang_lib.addIncludePath(b.path("libs/bgfx/3rdparty"));
         glslang_lib.addIncludePath(b.path(glslang_path));
@@ -512,6 +524,7 @@ pub fn build(b: *std.Build) !void {
                 .optimize = options.shaderc_optimize,
             }),
             .use_llvm = true,
+            .use_lld = use_lld,
         });
         glsl_optimizer_lib.addIncludePath(b.path(glsl_optimizer_path ++ "include"));
         glsl_optimizer_lib.addIncludePath(b.path(glsl_optimizer_path ++ "src"));

build.zig.zon

@@ -1,14 +1,13 @@
 .{
     .name = .zbgfx,
     .fingerprint = 0xc48ed871c4086e4a,
-    .version = "0.8.0",
+    .version = "0.8.1",
     .minimum_zig_version = "0.15.2",
     .paths = .{
         "includes",
         "libs",
         "shaders",
         "src",
-        "tools",
         "build.zig",
         "build.zig.zon",
     },

src/shaderc.zig

@@ -295,19 +295,27 @@ pub fn compileShader(
     const varying_f = try std.fs.createFileAbsolute(varying_file_path, .{});
     try varying_f.writeAll(varying);
     varying_f.close();
-
     defer std.fs.deleteFileAbsolute(varying_file_path) catch undefined;
 
+    const use_file_output = builtin.os.tag == .windows; // FIXME: Problem only on windows. Load shader in bgfx failed.
+
     // Create shader output path
-    var out_random_path: [RANDOM_PATH_LEN]u8 = undefined;
-    generateRandomFileName(&out_random_path);
-    const out_file_path = try std.fs.path.join(allocator, &.{ tmp_dir_path, &out_random_path });
-    defer allocator.free(out_file_path);
+    var out_file_path: ?[]u8 = null;
+    defer {
+        if (out_file_path) |p| allocator.free(p);
+    }
 
     var new_options = options;
     new_options.inputFilePath = source_file_path;
     new_options.varyingFilePath = varying_file_path;
 
+    if (use_file_output) {
+        var out_random_path: [RANDOM_PATH_LEN]u8 = undefined;
+        generateRandomFileName(&out_random_path);
+        out_file_path = try std.fs.path.join(allocator, &.{ tmp_dir_path, &out_random_path });
+        new_options.outputFilePath = out_file_path;
+    }
+
     var shadercp = try shadercProcess(allocator, executable_path, new_options);
 
     var buffer: [1024]u8 = undefined;
@@ -326,12 +334,26 @@ pub fn compileShader(
     if (term.Exited != 0) {
         const out = try writer.toOwnedSlice();
         defer allocator.free(out);
-        std.log.err("Shaderc error:\n{s}", .{out[10..]});
+        std.log.err("Shaderc error:\n{s}", .{if (use_file_output) out else out[10..]});
         return error.ShaderCompileError;
     } else {
-        const data = try writer.toOwnedSlice();
-        // std.log.debug("BEGIN\n{s}\nEND", .{data});
-        return data;
+        if (out_file_path) |output_path| {
+            defer std.fs.deleteFileAbsolute(output_path) catch undefined;
+
+            const out_f = try std.fs.openFileAbsolute(output_path, .{ .mode = .read_only });
+            defer out_f.close();
+
+            const size = try out_f.getEndPos();
+            const data = try allocator.alloc(u8, size);
+            _ = try out_f.readAll(data);
+
+            // std.log.debug("BEGIN\n{s}\nEND", .{data});
+            return data;
+        } else {
+            const data = try writer.toOwnedSlice();
+            // std.log.debug("BEGIN\n{s}\nEND", .{data});
+            return data;
+        }
     }
 }