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

gpu: correct alignment in pointer casts; handle void Context in all callbacks (#233)

Browse source 
* Fixed ErrorCallback.init() alignment
* Fixed callbacks alignments
* Fixed more of the callback alignment problems
* Added checks for void Context in callback
This commit is contained in:
PiergiorgioZagaria 2022-04-18 20:38:09 +02:00 • committed by GitHub
parent d664c8e55d
commit 169b1e2a42
Failed to generate hash of commit
10 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gpu/src/structs.zig
View file

@ -1,4 +1,5 @@
//! Structures which are not ABI compatible with webgpu.h
const std = @import("std");
const math = @import("std").math;
const Buffer = @import("Buffer.zig");
const Sampler = @import("Sampler.zig");
@ -150,7 +151,7 @@ pub const ErrorCallback = struct {
) ErrorCallback {
const erased = (struct {
pub inline fn erased(type_erased_ctx: *anyopaque, typ: ErrorType, message: [*:0]const u8) void {
callback(if (Context == void) {} else @ptrCast(Context, @alignCast(@alignOf(Context), type_erased_ctx)), typ, message);
callback(if (Context == void) {} else @ptrCast(Context, @alignCast(std.meta.alignment(Context), type_erased_ctx)), typ, message);
}
}).erased;
@ -172,7 +173,7 @@ pub const LoggingCallback = struct {
) LoggingCallback {
const erased = (struct {
pub inline fn erased(type_erased_ctx: *anyopaque, typ: LoggingType, message: [*:0]const u8) void {
callback(if (Context == void) {} else @ptrCast(Context, @alignCast(@alignOf(Context), type_erased_ctx)), typ, message);
callback(if (Context == void) {} else @ptrCast(Context, @alignCast(std.meta.alignment(Context), type_erased_ctx)), typ, message);
}
}).erased;