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

glfw: Fix pointer cast

Browse source 
The GLFW implementation takes a constant pointer to a `VkAllocationCallbacks` struct; casting it to a mutable pointer equivalent here doesn't break anything, but does prevent passing a valid const pointer, which is often what one should prefer to do.
As well, the `@alignOf` builtin takes the alignment expected of the type directly, so `@alignOf(*T)` returns the alignment of `*T`, not `T`, so that has also been corrected.
This commit is contained in:
InKryption 2021-11-29 19:41:48 +00:00 • committed by Stephen Gutekanst
parent 979a8bc978
commit cb4f911782
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
glfw/src/vulkan.zig
View file

@ -215,8 +215,8 @@ pub inline fn createWindowSurface(vk_instance: anytype, window: Window, vk_alloc
const v = c.glfwCreateWindowSurface( const v = c.glfwCreateWindowSurface(
instance, instance,
window.handle, window.handle,
if (vk_allocation_callbacks == null) null else @ptrCast(*c.VkAllocationCallbacks, @alignCast(@alignOf(*c.VkAllocationCallbacks), vk_allocation_callbacks)), if (vk_allocation_callbacks == null) null else @ptrCast(*const c.VkAllocationCallbacks, @alignCast(@alignOf(c.VkAllocationCallbacks), vk_allocation_callbacks)),
@ptrCast(*c.VkSurfaceKHR, @alignCast(@alignOf(*c.VkSurfaceKHR), vk_surface_khr)), @ptrCast(*c.VkSurfaceKHR, @alignCast(@alignOf(c.VkSurfaceKHR), vk_surface_khr)),
); );
getError() catch |err| return switch (err) { getError() catch |err| return switch (err) {
Error.InvalidValue => @panic("Attempted to use window with client api to create vulkan surface."), Error.InvalidValue => @panic("Attempted to use window with client api to create vulkan surface."),