Skip to content

Commit 3ae4a71

Browse files
committed
Fix WindowProvider ptrs UB
See zig-gamedev/zglfw#19
1 parent 6fb357d commit 3ae4a71

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/zgpu.zig

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ pub const WindowProvider = struct {
2222
window: *anyopaque,
2323
fn_getTime: *const fn () f64,
2424
fn_getFramebufferSize: *const fn (window: *const anyopaque) [2]u32,
25-
fn_getWin32Window: *const fn (window: *const anyopaque) ?*anyopaque = undefined,
26-
fn_getX11Display: *const fn () ?*anyopaque = undefined,
25+
fn_getWin32Window: *const fn (window: *const anyopaque) callconv(.c) *anyopaque = undefined,
26+
fn_getX11Display: *const fn () callconv(.c) *anyopaque = undefined,
2727
fn_getX11Window: *const fn (window: *const anyopaque) u32 = undefined,
28-
fn_getWaylandDisplay: ?*const fn () ?*anyopaque = null,
29-
fn_getWaylandSurface: ?*const fn (window: *const anyopaque) ?*anyopaque = null,
30-
fn_getCocoaWindow: *const fn (window: *const anyopaque) ?*anyopaque = undefined,
28+
fn_getWaylandDisplay: ?*const fn () callconv(.c) *anyopaque = null,
29+
fn_getWaylandSurface: ?*const fn (window: *const anyopaque) callconv(.c) *anyopaque = null,
30+
fn_getCocoaWindow: *const fn (window: *const anyopaque) callconv(.c) ?*anyopaque = undefined,
3131

3232
fn getTime(self: WindowProvider) f64 {
3333
return self.fn_getTime();

0 commit comments

Comments
 (0)