all: remove support for stage1

With almost all tests/examples working on all platforms now with the new compiler, hexops/mach#180, it's time to remove stage1 support. Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
hexops · Sep 10, 2022 · 60cee43 · 60cee43
1 parent 9c5ae59
commit 60cee43
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 149 deletions.
diff --git a/examples/sample_utils.zig b/examples/sample_utils.zig
@@ -233,16 +233,7 @@ pub const AutoReleasePool = if (!@import("builtin").target.isDarwin()) opaque {
 pub fn msgSend(obj: anytype, sel_name: [:0]const u8, args: anytype, comptime ReturnType: type) ReturnType {
     const args_meta = @typeInfo(@TypeOf(args)).Struct.fields;
 
-    const FnType = if (@import("builtin").zig_backend == .stage1)
-        switch (args_meta.len) {
-            0 => fn (@TypeOf(obj), objc.SEL) callconv(.C) ReturnType,
-            1 => fn (@TypeOf(obj), objc.SEL, args_meta[0].field_type) callconv(.C) ReturnType,
-            2 => fn (@TypeOf(obj), objc.SEL, args_meta[0].field_type, args_meta[1].field_type) callconv(.C) ReturnType,
-            3 => fn (@TypeOf(obj), objc.SEL, args_meta[0].field_type, args_meta[1].field_type, args_meta[2].field_type) callconv(.C) ReturnType,
-            4 => fn (@TypeOf(obj), objc.SEL, args_meta[0].field_type, args_meta[1].field_type, args_meta[2].field_type, args_meta[3].field_type) callconv(.C) ReturnType,
-            else => @compileError("Unsupported number of args"),
-        }
-    else switch (args_meta.len) {
+    const FnType = switch (args_meta.len) {
         0 => *const fn (@TypeOf(obj), objc.SEL) callconv(.C) ReturnType,
         1 => *const fn (@TypeOf(obj), objc.SEL, args_meta[0].field_type) callconv(.C) ReturnType,
         2 => *const fn (@TypeOf(obj), objc.SEL, args_meta[0].field_type, args_meta[1].field_type) callconv(.C) ReturnType,
@@ -252,10 +243,7 @@ pub fn msgSend(obj: anytype, sel_name: [:0]const u8, args: anytype, comptime Ret
     };
 
     // NOTE: func is a var because making it const causes a compile error which I believe is a compiler bug
-    var func = if (@import("builtin").zig_backend == .stage1)
-        @ptrCast(FnType, objc.objc_msgSend)
-    else
-        @ptrCast(FnType, &objc.objc_msgSend);
+    var func = @ptrCast(FnType, &objc.objc_msgSend);
     const sel = objc.sel_getUid(@ptrCast([*c]const u8, sel_name));
 
     return @call(.{}, func, .{ obj, sel } ++ args);

diff --git a/src/buffer.zig b/src/buffer.zig
@@ -4,10 +4,7 @@ const MapModeFlags = @import("types.zig").MapModeFlags;
 const Impl = @import("interface.zig").Impl;
 
 pub const Buffer = opaque {
-    pub const MapCallback = if (@import("builtin").zig_backend == .stage1)
-        fn (status: MapAsyncStatus, userdata: ?*anyopaque) callconv(.C) void
-    else
-        *const fn (status: MapAsyncStatus, userdata: ?*anyopaque) callconv(.C) void;
+    pub const MapCallback = *const fn (status: MapAsyncStatus, userdata: ?*anyopaque) callconv(.C) void;
 
     pub const BindingType = enum(u32) {
         undef = 0x00000000,

diff --git a/src/callbacks.zig b/src/callbacks.zig
@@ -10,101 +10,48 @@ const Adapter = @import("adapter.zig").Adapter;
 const ComputePipeline = @import("compute_pipeline.zig").ComputePipeline;
 const RenderPipeline = @import("render_pipeline.zig").RenderPipeline;
 
-pub const CompilationInfoCallback = if (@import("builtin").zig_backend == .stage1)
-    fn (
-        status: CompilationInfoRequestStatus,
-        compilation_info: *const CompilationInfo,
-        userdata: ?*anyopaque,
-    ) callconv(.C) void
-else
-    *const fn (
-        status: CompilationInfoRequestStatus,
-        compilation_info: *const CompilationInfo,
-        userdata: ?*anyopaque,
-    ) callconv(.C) void;
+pub const CompilationInfoCallback = *const fn (
+    status: CompilationInfoRequestStatus,
+    compilation_info: *const CompilationInfo,
+    userdata: ?*anyopaque,
+) callconv(.C) void;
 
-pub const ErrorCallback = if (@import("builtin").zig_backend == .stage1)
-    fn (
-        typ: ErrorType,
-        message: [*:0]const u8,
-        userdata: ?*anyopaque,
-    ) callconv(.C) void
-else
-    *const fn (
-        typ: ErrorType,
-        message: [*:0]const u8,
-        userdata: ?*anyopaque,
-    ) callconv(.C) void;
+pub const ErrorCallback = *const fn (
+    typ: ErrorType,
+    message: [*:0]const u8,
+    userdata: ?*anyopaque,
+) callconv(.C) void;
 
-pub const LoggingCallback = if (@import("builtin").zig_backend == .stage1)
-    fn (
-        typ: LoggingType,
-        message: [*:0]const u8,
-        userdata: ?*anyopaque,
-    ) callconv(.C) void
-else
-    *const fn (
-        typ: LoggingType,
-        message: [*:0]const u8,
-        userdata: ?*anyopaque,
-    ) callconv(.C) void;
+pub const LoggingCallback = *const fn (
+    typ: LoggingType,
+    message: [*:0]const u8,
+    userdata: ?*anyopaque,
+) callconv(.C) void;
 
-pub const RequestDeviceCallback = if (@import("builtin").zig_backend == .stage1)
-    fn (
-        status: RequestDeviceStatus,
-        device: *Device,
-        message: ?[*:0]const u8,
-        userdata: ?*anyopaque,
-    ) callconv(.C) void
-else
-    *const fn (
-        status: RequestDeviceStatus,
-        device: *Device,
-        message: ?[*:0]const u8,
-        userdata: ?*anyopaque,
-    ) callconv(.C) void;
+pub const RequestDeviceCallback = *const fn (
+    status: RequestDeviceStatus,
+    device: *Device,
+    message: ?[*:0]const u8,
+    userdata: ?*anyopaque,
+) callconv(.C) void;
 
-pub const RequestAdapterCallback = if (@import("builtin").zig_backend == .stage1)
-    fn (
-        status: RequestAdapterStatus,
-        adapter: *Adapter,
-        message: ?[*:0]const u8,
-        userdata: ?*anyopaque,
-    ) callconv(.C) void
-else
-    *const fn (
-        status: RequestAdapterStatus,
-        adapter: *Adapter,
-        message: ?[*:0]const u8,
-        userdata: ?*anyopaque,
-    ) callconv(.C) void;
+pub const RequestAdapterCallback = *const fn (
+    status: RequestAdapterStatus,
+    adapter: *Adapter,
+    message: ?[*:0]const u8,
+    userdata: ?*anyopaque,
+) callconv(.C) void;
 
-pub const CreateComputePipelineAsyncCallback = if (@import("builtin").zig_backend == .stage1)
-    fn (
-        status: CreatePipelineAsyncStatus,
-        compute_pipeline: *ComputePipeline,
-        message: [*:0]const u8,
-        userdata: ?*anyopaque,
-    ) callconv(.C) void
-else
-    *const fn (
-        status: CreatePipelineAsyncStatus,
-        compute_pipeline: *ComputePipeline,
-        message: [*:0]const u8,
-        userdata: ?*anyopaque,
-    ) callconv(.C) void;
+pub const CreateComputePipelineAsyncCallback = *const fn (
+    status: CreatePipelineAsyncStatus,
+    compute_pipeline: *ComputePipeline,
+    message: [*:0]const u8,
+    userdata: ?*anyopaque,
+) callconv(.C) void;
 
-pub const CreateRenderPipelineAsyncCallback = if (@import("builtin").zig_backend == .stage1)
-    fn (
-        status: CreatePipelineAsyncStatus,
-        pipeline: *RenderPipeline,
-        message: [*:0]const u8,
-        userdata: ?*anyopaque,
-    ) callconv(.C) void
-else
-    *const fn (
-        status: CreatePipelineAsyncStatus,
-        pipeline: *RenderPipeline,
-        message: [*:0]const u8,
-        userdata: ?*anyopaque,
-    ) callconv(.C) void;
+pub const CreateRenderPipelineAsyncCallback = *const fn (
+    status: CreatePipelineAsyncStatus,
+    pipeline: *RenderPipeline,
+    message: [*:0]const u8,
+    userdata: ?*anyopaque,
+) callconv(.C) void;
diff --git a/src/dawn_impl.zig b/src/dawn_impl.zig
@@ -1,18 +1,9 @@
 const gpu = @import("main.zig");
 
-const c = if (@import("builtin").zig_backend == .stage1 or !@import("builtin").target.isDarwin())
-    @cImport({
-        @cInclude("dawn/webgpu.h");
-        @cInclude("mach_dawn.h");
-    })
-else
-    // TODO(self-hosted): HACK: workaround https://github.com/ziglang/zig/issues/12483
-    //
-    // cd gpu/src/
-    // echo '#include <dawn/webgpu.h>' > tmp.c
-    // echo '#include "mach_dawn.h"' >> tmp.c
-    // zig translate-c tmp.c -I ../zig-cache/mach/gpu-dawn/release-777728f/include/ > dawn_webgpu_h.zig
-    @import("dawn_webgpu_h.zig");
+const c = @cImport({
+    @cInclude("dawn/webgpu.h");
+    @cInclude("mach_dawn.h");
+});
 
 var procs: c.DawnProcTable = undefined;
 

diff --git a/src/device.zig b/src/device.zig
@@ -31,18 +31,11 @@ const Impl = @import("interface.zig").Impl;
 const dawn = @import("dawn.zig");
 
 pub const Device = opaque {
-    pub const LostCallback = if (@import("builtin").zig_backend == .stage1)
-        fn (
-            reason: LostReason,
-            message: [*:0]const u8,
-            userdata: ?*anyopaque,
-        ) callconv(.C) void
-    else
-        *const fn (
-            reason: LostReason,
-            message: [*:0]const u8,
-            userdata: ?*anyopaque,
-        ) callconv(.C) void;
+    pub const LostCallback = *const fn (
+        reason: LostReason,
+        message: [*:0]const u8,
+        userdata: ?*anyopaque,
+    ) callconv(.C) void;
 
     pub const LostReason = enum(u32) {
         undef = 0x00000000,

diff --git a/src/queue.zig b/src/queue.zig
@@ -9,16 +9,10 @@ const CopyTextureForBrowserOptions = @import("types.zig").CopyTextureForBrowserO
 const Impl = @import("interface.zig").Impl;
 
 pub const Queue = opaque {
-    pub const WorkDoneCallback = if (@import("builtin").zig_backend == .stage1)
-        fn (
-            status: WorkDoneStatus,
-            userdata: ?*anyopaque,
-        ) callconv(.C) void
-    else
-        *const fn (
-            status: WorkDoneStatus,
-            userdata: ?*anyopaque,
-        ) callconv(.C) void;
+    pub const WorkDoneCallback = *const fn (
+        status: WorkDoneStatus,
+        userdata: ?*anyopaque,
+    ) callconv(.C) void;
 
     pub const WorkDoneStatus = enum(u32) {
         success = 0x00000000,

diff --git a/src/types.zig b/src/types.zig
@@ -17,10 +17,7 @@ pub const whole_size = 0xffffffffffffffff;
 
 /// Generic function pointer type, used for returning API function pointers. Must be
 /// cast to the right `fn (...) callconv(.C) T` type before use.
-pub const Proc = if (@import("builtin").zig_backend == .stage1)
-    fn () callconv(.C) void
-else
-    *const fn () callconv(.C) void;
+pub const Proc = *const fn () callconv(.C) void;
 
 pub const ComputePassTimestampWrite = extern struct {
     query_set: *QuerySet,