From 8d3e395e7105f065d4047581a30eacc9060270ee Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Thu, 29 Jun 2023 09:56:46 -0700
Subject: [PATCH] gpu: update to latest Zig APIs

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 libs/gpu/src/adapter.zig       | 2 +-
 libs/gpu/src/device.zig        | 6 +++++-
 libs/gpu/src/instance.zig      | 2 +-
 libs/gpu/src/shader_module.zig | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libs/gpu/src/adapter.zig b/libs/gpu/src/adapter.zig
index 4371a42a..8725758c 100644
--- a/libs/gpu/src/adapter.zig
+++ b/libs/gpu/src/adapter.zig
@@ -97,7 +97,7 @@ pub const Adapter = opaque {
         const Helper = struct {
             pub fn cCallback(status: RequestDeviceStatus, device: *Device, message: ?[*:0]const u8, userdata: ?*anyopaque) callconv(.C) void {
                 callback(
-                    if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(Context), userdata))),
+                    if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))),
                     status,
                     device,
                     message,
diff --git a/libs/gpu/src/device.zig b/libs/gpu/src/device.zig
index 06a00d71..7d7b4eb7 100644
--- a/libs/gpu/src/device.zig
+++ b/libs/gpu/src/device.zig
@@ -120,7 +120,11 @@ pub const Device = opaque {
                     status,
                     compute_pipeline,
                     message,
+<<<<<<< Updated upstream
                     if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(Context), userdata))),
+=======
+                    if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))),
+>>>>>>> Stashed changes
                 );
             }
         };
@@ -179,7 +183,7 @@ pub const Device = opaque {
                 userdata: ?*anyopaque,
             ) callconv(.C) void {
                 callback(
-                    if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(Context), userdata))),
+                    if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))),
                     status,
                     pipeline,
                     message,
diff --git a/libs/gpu/src/instance.zig b/libs/gpu/src/instance.zig
index aca679fb..a39828d5 100644
--- a/libs/gpu/src/instance.zig
+++ b/libs/gpu/src/instance.zig
@@ -45,7 +45,7 @@ pub const Instance = opaque {
                 userdata: ?*anyopaque,
             ) callconv(.C) void {
                 callback(
-                    if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(Context), userdata))),
+                    if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))),
                     status,
                     adapter,
                     message,
diff --git a/libs/gpu/src/shader_module.zig b/libs/gpu/src/shader_module.zig
index 9f3a363f..41b41797 100644
--- a/libs/gpu/src/shader_module.zig
+++ b/libs/gpu/src/shader_module.zig
@@ -46,7 +46,7 @@ pub const ShaderModule = opaque {
                 userdata: ?*anyopaque,
             ) callconv(.C) void {
                 callback(
-                    if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(Context), userdata))),
+                    if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))),
                     status,
                     compilation_info,
                 );