big rework towards Zig 0.15

src/SpirvWriter.zig

@@ -1,55 +1,65 @@
-const cnzsl = @import("nzsl-c.zig");
-const nzsl = @import("lib.zig");
 const std = @import("std");
+const Module = @import("Module.zig");
+const BackendParameters = @import("BackendParameters.zig");
+const cnzsl = @cImport({
+    @cInclude("CNZSL/CNZSL.h");
+});
 
-pub const SpirvWriterEnvironment = cnzsl.nzslSpirvWriterEnvironment;
+const Self = @This();
 
-pub const SpirvWriter = struct {
-    instance: *cnzsl.nzslSpirvWriter,
+instance: *cnzsl.nzslSpirvWriter,
 
-    pub fn create() SpirvWriter {
-        return .{.instance = cnzsl.nzslSpirvWriterCreate() orelse unreachable};
-    }
+pub fn init() !Self {
+    const cwriter = cnzsl.nzslSpirvWriterCreate() orelse return error.NullPointer;
+    return .{
+        .instance = cwriter,
+    };
+}
 
-    pub fn release(self: SpirvWriter) void {
-        cnzsl.nzslSpirvWriterDestroy(self.instance);
-    }
+pub fn deinit(self: Self) void {
+    cnzsl.nzslSpirvWriterDestroy(self.instance);
+}
 
-    pub fn getLastError(self: SpirvWriter) [*c]const u8 {
-        return cnzsl.nzslSpirvWriterGetLastError(self.instance);
-    }
+pub fn getLastError(self: Self) ![]const u8 {
+    const err = cnzsl.nzslSpirvWriterGetLastError(self.instance) orelse return error.NullPointer;
+    return std.mem.span(err);
+}
 
-    pub fn setEnv(self: SpirvWriter, env: SpirvWriterEnvironment) void {
-        return cnzsl.nzslSpirvWriterSetEnv(self.instance, env);
-    }
+pub fn setEnv(self: Self, env: Environment) void {
+    const SpirvEnv = extern struct {
+        spv_major_version: u32,
+        spv_minor_version: u32,
+    };
+    const cenv: SpirvEnv = .{
+        .spv_major_version = @intCast(env.spv_version.major),
+        .spv_minor_version = @intCast(env.spv_version.minor),
+    };
+    return cnzsl.nzslSpirvWriterSetEnv(self.instance, @ptrCast(&cenv));
+}
 
-    pub fn generate(self: SpirvWriter, module: nzsl.Module, states: nzsl.WriterStates) SpirvOutput {
-        var output: ?*cnzsl.nzslSpirvOutput = null;
-
-        output = cnzsl.nzslSpirvWriterGenerate(self.instance, module.instance, states.instance);
-
-        if(output == null) {
-            std.log.err("Failed to generate spirv output: {s}", .{ self.getLastError() });
-
-            return error.FailedToGenerateSpirv;
-        }
-
-        return .{.instance = output orelse unreachable};
-    }
+pub fn generate(self: Self, module: Module, backend_parameters: BackendParameters) !Output {
+    const output = cnzsl.nzslSpirvWriterGenerate(self.instance, @ptrCast(module.instance), @ptrCast(backend_parameters.instance)) orelse return error.FailedToGenerateSpirv;
+    return .{
+        .instance = output,
+    };
+}
 
+pub const Environment = struct {
+    spv_version: std.SemanticVersion,
 };
 
-pub const SpirvOutput = struct {
+pub const Output = struct {
+    const InnerSelf = @This();
+
     instance: *cnzsl.nzslSpirvOutput,
 
-    pub fn release(self: SpirvOutput) void {
+    pub fn deinit(self: InnerSelf) void {
         cnzsl.nzslSpirvOutputDestroy(self.instance);
     }
 
-    pub fn getCode(self: SpirvOutput) []const u32 {
+    pub fn getCode(self: InnerSelf) []const u32 {
         var size: usize = undefined;
         const code = cnzsl.nzslSpirvOutputGetSpirv(self.instance, &size);
-
         return code[0..size];
     }
 };