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

gpu: update to latest zig API (#832)

Browse source
This commit is contained in:
Ali Chraghi 2023-06-29 11:26:27 -07:00 • committed by GitHub
parent 8d3e395e71
commit f7554d06ac
Failed to generate hash of commit
3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,7 +102,7 @@ pub const Buffer = opaque {
offset_bytes, offset_bytes,
size + size % 4, size + size % 4,
); );
return if (data) |d| @as([*]const T, @ptrCast(@alignCast(@alignOf(T), d)))[0..len] else null; return if (data) |d| @as([*]const T, @ptrCast(@alignCast(d)))[0..len] else null;
} }
/// Default `offset_bytes`: 0 /// Default `offset_bytes`: 0
@ -119,7 +119,7 @@ pub const Buffer = opaque {
offset_bytes, offset_bytes,
size + size % 4, size + size % 4,
); );
return if (data) |d| @as([*]T, @ptrCast(@alignCast(@alignOf(T), d)))[0..len] else null; return if (data) |d| @as([*]T, @ptrCast(@alignCast(d)))[0..len] else null;
} }
pub inline fn getSize(buffer: *Buffer) u64 { pub inline fn getSize(buffer: *Buffer) u64 {
@ -141,7 +141,7 @@ pub const Buffer = opaque {
const Context = @TypeOf(context); const Context = @TypeOf(context);
const Helper = struct { const Helper = struct {
pub fn cCallback(status: MapAsyncStatus, userdata: ?*anyopaque) callconv(.C) void { pub fn cCallback(status: MapAsyncStatus, userdata: ?*anyopaque) callconv(.C) void {
callback(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(std.meta.Child(Context)), userdata))), status); callback(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))), status);
} }
}; };
Impl.bufferMapAsync(buffer, mode, offset, size, Helper.cCallback, if (Context == void) null else context); Impl.bufferMapAsync(buffer, mode, offset, size, Helper.cCallback, if (Context == void) null else context);

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

@ -120,11 +120,7 @@ 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(userdata))), if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))),
>>>>>>> Stashed changes
); );
} }
}; };
@ -275,7 +271,7 @@ pub const Device = opaque {
const Context = @TypeOf(context); const Context = @TypeOf(context);
const Helper = struct { const Helper = struct {
pub fn cCallback(typ: ErrorType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void { pub fn cCallback(typ: ErrorType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void {
callback(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(std.meta.Child(Context)), userdata))), typ, message); callback(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))), typ, message);
} }
}; };
Impl.devicePopErrorScope(device, Helper.cCallback, if (Context == void) null else context); Impl.devicePopErrorScope(device, Helper.cCallback, if (Context == void) null else context);
@ -294,7 +290,7 @@ pub const Device = opaque {
const Context = @TypeOf(context); const Context = @TypeOf(context);
const Helper = struct { const Helper = struct {
pub fn cCallback(reason: LostReason, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void { pub fn cCallback(reason: LostReason, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void {
cb(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(std.meta.Child(Context)), userdata))), reason, message); cb(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))), reason, message);
} }
}; };
Impl.deviceSetDeviceLostCallback(device, Helper.cCallback, if (Context == void) null else context); Impl.deviceSetDeviceLostCallback(device, Helper.cCallback, if (Context == void) null else context);
@ -316,7 +312,7 @@ pub const Device = opaque {
const Context = @TypeOf(context); const Context = @TypeOf(context);
const Helper = struct { const Helper = struct {
pub fn cCallback(typ: LoggingType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void { pub fn cCallback(typ: LoggingType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void {
cb(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(std.meta.Child(Context)), userdata))), typ, message); cb(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))), typ, message);
} }
}; };
Impl.deviceSetLoggingCallback(device, Helper.cCallback, if (Context == void) null else context); Impl.deviceSetLoggingCallback(device, Helper.cCallback, if (Context == void) null else context);
@ -334,7 +330,7 @@ pub const Device = opaque {
const Context = @TypeOf(context); const Context = @TypeOf(context);
const Helper = struct { const Helper = struct {
pub fn cCallback(typ: ErrorType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void { pub fn cCallback(typ: ErrorType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void {
cb(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(std.meta.Child(Context)), userdata))), typ, message); cb(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))), typ, message);
} }
}; };
Impl.deviceSetUncapturedErrorCallback(device, Helper.cCallback, if (Context == void) null else context); Impl.deviceSetUncapturedErrorCallback(device, Helper.cCallback, if (Context == void) null else context);

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

@ -45,7 +45,7 @@ pub const Queue = opaque {
const Context = @TypeOf(context); const Context = @TypeOf(context);
const Helper = struct { const Helper = struct {
pub fn cCallback(status: WorkDoneStatus, userdata: ?*anyopaque) callconv(.C) void { pub fn cCallback(status: WorkDoneStatus, userdata: ?*anyopaque) callconv(.C) void {
callback(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(std.meta.Child(Context)), userdata))), status); callback(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))), status);
} }
}; };
Impl.queueOnSubmittedWorkDone(queue, signal_value, Helper.cCallback, if (Context == void) null else context); Impl.queueOnSubmittedWorkDone(queue, signal_value, Helper.cCallback, if (Context == void) null else context);