From 6961700b949df1876d3130009caeb10a3f5f27f0 Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Tue, 26 Jul 2022 20:46:55 -0700
Subject: [PATCH] gpu: remove invalid TODOs, fix bufferMapAsync return type

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 gpu/src/buffer.zig    |  4 ++--
 gpu/src/dawn.zig      |  2 --
 gpu/src/interface.zig | 10 ++++------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/gpu/src/buffer.zig b/gpu/src/buffer.zig
index 569579f8..a28c20ac 100644
--- a/gpu/src/buffer.zig
+++ b/gpu/src/buffer.zig
@@ -24,8 +24,8 @@ pub const Buffer = *opaque {
         return impl.bufferGetUsage(buffer);
     }
 
-    pub inline fn bufferMapAsync(buffer: Buffer, mode: MapModeFlags, offset: usize, size: usize, callback: BufferMapCallback, userdata: *anyopaque) u64 {
-        return impl.bufferMapAsync(buffer, mode, offset, size, callback, userdata);
+    pub inline fn bufferMapAsync(buffer: Buffer, mode: MapModeFlags, offset: usize, size: usize, callback: BufferMapCallback, userdata: *anyopaque) void {
+        impl.bufferMapAsync(buffer, mode, offset, size, callback, userdata);
     }
 
     pub inline fn bufferSetLabel(buffer: Buffer, label: [*:0]const u8) void {
diff --git a/gpu/src/dawn.zig b/gpu/src/dawn.zig
index 94adf56a..a3c2519b 100644
--- a/gpu/src/dawn.zig
+++ b/gpu/src/dawn.zig
@@ -3,13 +3,11 @@ const Texture = @import("texture.zig").Texture;
 const TextureUsageFlags = @import("texture.zig").TextureUsageFlags;
 
 pub const CacheDeviceDescriptor = extern struct {
-    // TODO: file an issue on Dawn: why not named nextInChain?
     chain: ChainedStruct,
     isolation_key: [*:0]const u8,
 };
 
 pub const EncoderInternalUsageDescriptor = extern struct {
-    // TODO: file an issue on Dawn: why not named nextInChain?
     chain: ChainedStruct,
     use_internal_usages: bool,
 };
diff --git a/gpu/src/interface.zig b/gpu/src/interface.zig
index d685e609..965644f3 100644
--- a/gpu/src/interface.zig
+++ b/gpu/src/interface.zig
@@ -38,7 +38,7 @@ pub fn Interface(comptime Impl: type) type {
     assertDecl(Impl, "bufferGetMappedRange", fn (buffer: gpu.Buffer, offset: usize, size: usize) callconv(.Inline) *anyopaque);
     assertDecl(Impl, "bufferGetSize", fn (buffer: gpu.Buffer) callconv(.Inline) u64);
     assertDecl(Impl, "bufferGetUsage", fn (buffer: gpu.Buffer) callconv(.Inline) gpu.BufferUsage);
-    assertDecl(Impl, "bufferMapAsync", fn (buffer: gpu.Buffer, mode: gpu.MapMode, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) callconv(.Inline) u64);
+    assertDecl(Impl, "bufferMapAsync", fn (buffer: gpu.Buffer, mode: gpu.MapMode, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) callconv(.Inline) void);
     assertDecl(Impl, "bufferSetLabel", fn (buffer: gpu.Buffer, label: [*:0]const u8) callconv(.Inline) void);
     assertDecl(Impl, "bufferUnmap", fn (buffer: gpu.Buffer) callconv(.Inline) void);
     assertDecl(Impl, "bufferReference", fn (buffer: gpu.Buffer) callconv(.Inline) void);
@@ -340,8 +340,8 @@ pub fn Export(comptime Impl: type) type {
         // TODO: Zig cannot currently export a packed struct gpu.MapModeFlags, so we use a u32 for
         // now.
         // WGPU_EXPORT void wgpuBufferMapAsync(WGPUBuffer buffer, WGPUMapModeFlags mode, size_t offset, size_t size, WGPUBufferMapCallback callback, void * userdata);
-        export fn wgpuBufferMapAsync(buffer: gpu.Buffer, mode: u32, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) u64 {
-            return Impl.bufferMapAsync(buffer, @bitCast(gpu.MapMode, mode), offset, size, callback, userdata);
+        export fn wgpuBufferMapAsync(buffer: gpu.Buffer, mode: u32, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) void {
+            Impl.bufferMapAsync(buffer, @bitCast(gpu.MapMode, mode), offset, size, callback, userdata);
         }
 
         // WGPU_EXPORT void wgpuBufferSetLabel(WGPUBuffer buffer, char const * label);
@@ -1367,8 +1367,7 @@ pub const StubInterface = Interface(struct {
         unreachable;
     }
 
-    // TODO: should return void, I typo'd it
-    pub inline fn bufferMapAsync(buffer: gpu.Buffer, mode: gpu.MapMode, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) u64 {
+    pub inline fn bufferMapAsync(buffer: gpu.Buffer, mode: gpu.MapMode, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) void {
         _ = buffer;
         _ = mode;
         _ = offset;
@@ -1676,7 +1675,6 @@ pub const StubInterface = Interface(struct {
         unreachable;
     }
 
-    // TODO: should be deviceCreateBuffer elsewhere
     pub inline fn deviceCreateBuffer(device: gpu.Device, descriptor: *const gpu.BufferDescriptor) gpu.Buffer {
         _ = device;
         _ = descriptor;