zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpu: update to latest Zig APIs

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2023-06-29 09:56:46 -07:00
parent 4bc32adeb8
commit 8d3e395e71
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/gpu/src/adapter.zig
View file

@ -97,7 +97,7 @@ pub const Adapter = opaque {
const Helper = struct { const Helper = struct {
pub fn cCallback(status: RequestDeviceStatus, device: *Device, message: ?[*:0]const u8, userdata: ?*anyopaque) callconv(.C) void { pub fn cCallback(status: RequestDeviceStatus, device: *Device, message: ?[*:0]const u8, userdata: ?*anyopaque) callconv(.C) void {
callback( callback(
if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(Context), userdata))), if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))),
status, status,
device, device,
message, message,

6
libs/gpu/src/device.zig
View file

@ -120,7 +120,11 @@ pub const Device = opaque {
status, status,
compute_pipeline, compute_pipeline,
message, message,
<<<<<<< Updated upstream
if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(Context), userdata))), 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, userdata: ?*anyopaque,
) callconv(.C) void { ) callconv(.C) void {
callback( callback(
if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(Context), userdata))), if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))),
status, status,
pipeline, pipeline,
message, message,

2
libs/gpu/src/instance.zig
View file

@ -45,7 +45,7 @@ pub const Instance = opaque {
userdata: ?*anyopaque, userdata: ?*anyopaque,
) callconv(.C) void { ) callconv(.C) void {
callback( callback(
if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(Context), userdata))), if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))),
status, status,
adapter, adapter,
message, message,

2
libs/gpu/src/shader_module.zig
View file

@ -46,7 +46,7 @@ pub const ShaderModule = opaque {
userdata: ?*anyopaque, userdata: ?*anyopaque,
) callconv(.C) void { ) callconv(.C) void {
callback( callback(
if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(Context), userdata))), if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))),
status, status,
compilation_info, compilation_info,
); );