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

gpu: correct context pointer alignments

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-07-31 17:09:35 -07:00 • committed by Stephen Gutekanst
parent 4ed932be0f
commit 8a0d47b94b
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gpu/src/adapter.zig
View file

@ -88,7 +88,7 @@ pub const Adapter = opaque {
status, status,
device, device,
message, message,
if (Context == void) {} else @ptrCast(Context, userdata), if (Context == void) {} else @ptrCast(Context, @alignCast(@alignOf(Context), userdata)),
); );
} }
}; };

2
gpu/src/buffer.zig
View file

@ -100,7 +100,7 @@ pub const Buffer = opaque {
const Context = @TypeOf(context); const Context = @TypeOf(context);
const Helper = struct { const Helper = struct {
pub fn callback(status: MapAsyncStatus, userdata: ?*anyopaque) callconv(.C) void { pub fn callback(status: MapAsyncStatus, userdata: ?*anyopaque) callconv(.C) void {
callback(status, if (Context == void) {} else @ptrCast(Context, userdata)); callback(status, if (Context == void) {} else @ptrCast(Context, @alignCast(@alignOf(Context), userdata)));
} }
}; };
Impl.bufferMapAsync(buffer, mode, offset, size, Helper.callback, if (Context == void) null else context); Impl.bufferMapAsync(buffer, mode, offset, size, Helper.callback, if (Context == void) null else context);

12
gpu/src/device.zig
View file

@ -92,7 +92,7 @@ pub const Device = opaque {
status, status,
compute_pipeline, compute_pipeline,
message, message,
if (Context == void) {} else @ptrCast(Context, userdata), if (Context == void) {} else @ptrCast(Context, @alignCast(@alignOf(Context), userdata)),
); );
} }
}; };
@ -150,7 +150,7 @@ pub const Device = opaque {
status, status,
pipeline, pipeline,
message, message,
if (Context == void) {} else @ptrCast(Context, userdata), if (Context == void) {} else @ptrCast(Context, @alignCast(@alignOf(Context), userdata)),
); );
} }
}; };
@ -209,7 +209,7 @@ pub const Device = opaque {
const Context = @TypeOf(context); const Context = @TypeOf(context);
const Helper = struct { const Helper = struct {
pub fn callback(typ: ErrorType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void { pub fn callback(typ: ErrorType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void {
callback(typ, message, if (Context == void) {} else @ptrCast(Context, userdata)); callback(typ, message, if (Context == void) {} else @ptrCast(Context, @alignCast(@alignOf(Context), userdata)));
} }
}; };
return Impl.devicePopErrorScope(device, Helper.callback, if (Context == void) null else context); return Impl.devicePopErrorScope(device, Helper.callback, if (Context == void) null else context);
@ -228,7 +228,7 @@ pub const Device = opaque {
const Context = @TypeOf(context); const Context = @TypeOf(context);
const Helper = struct { const Helper = struct {
pub fn callback(reason: LostReason, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void { pub fn callback(reason: LostReason, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void {
callback(reason, message, if (Context == void) {} else @ptrCast(Context, userdata)); callback(reason, message, if (Context == void) {} else @ptrCast(Context, @alignCast(@alignOf(Context), userdata)));
} }
}; };
Impl.deviceSetDeviceLostCallback(device, Helper.callback, if (Context == void) null else context); Impl.deviceSetDeviceLostCallback(device, Helper.callback, if (Context == void) null else context);
@ -247,7 +247,7 @@ pub const Device = opaque {
const Context = @TypeOf(context); const Context = @TypeOf(context);
const Helper = struct { const Helper = struct {
pub fn callback(typ: LoggingType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void { pub fn callback(typ: LoggingType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void {
callback(typ, message, if (Context == void) {} else @ptrCast(Context, userdata)); callback(typ, message, if (Context == void) {} else @ptrCast(Context, @alignCast(@alignOf(Context), userdata)));
} }
}; };
Impl.deviceSetLoggingCallback(device, Helper.callback, if (Context == void) null else context); Impl.deviceSetLoggingCallback(device, Helper.callback, if (Context == void) null else context);
@ -262,7 +262,7 @@ pub const Device = opaque {
const Context = @TypeOf(context); const Context = @TypeOf(context);
const Helper = struct { const Helper = struct {
pub fn callback(typ: ErrorType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void { pub fn callback(typ: ErrorType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void {
callback(typ, message, if (Context == void) {} else @ptrCast(Context, userdata)); callback(typ, message, if (Context == void) {} else @ptrCast(Context, @alignCast(@alignOf(Context), userdata)));
} }
}; };
Impl.deviceSetUncapturedErrorCallback(device, Helper.callback, if (Context == void) null else context); Impl.deviceSetUncapturedErrorCallback(device, Helper.callback, if (Context == void) null else context);

2
gpu/src/instance.zig
View file

@ -38,7 +38,7 @@ pub const Instance = opaque {
status, status,
adapter, adapter,
message, message,
if (Context == void) {} else @ptrCast(Context, userdata), if (Context == void) {} else @ptrCast(Context, @alignCast(@alignOf(Context), userdata)),
); );
} }
}; };

2
gpu/src/queue.zig
View file

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

2
gpu/src/shader_module.zig
View file

@ -40,7 +40,7 @@ pub const ShaderModule = opaque {
callback( callback(
status, status,
compilation_info, compilation_info,
if (Context == void) {} else @ptrCast(Context, userdata), if (Context == void) {} else @ptrCast(Context, @alignCast(@alignOf(Context), userdata)),
); );
} }
}; };