Use a slightly more correct calling convention for OpenGL/Vulkan procs

slimsag · Mar 2, 2024 · c5180a0 · c5180a0
1 parent 63da35e
commit c5180a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/opengl.zig b/src/opengl.zig
@@ -1,4 +1,5 @@
 const std = @import("std");
+const builtin = @import("builtin");
 
 const c = @import("c.zig").c;
 const Window = @import("Window.zig");
@@ -122,13 +123,12 @@ pub inline fn extensionSupported(extension: [:0]const u8) bool {
     return c.glfwExtensionSupported(extension.ptr) == c.GLFW_TRUE;
 }
 
-const builtin = @import("builtin");
 /// Client API function pointer type.
 ///
 /// Generic function pointer used for returning client API function pointers.
 ///
 /// see also: context_glext, glfwGetProcAddress
-pub const GLProc = *const fn () callconv(.C) void;
+pub const GLProc = *const fn () callconv(if (builtin.os.tag == .windows and builtin.cpu.arch == .x86) .Stdcall else .C) void;
 
 /// Returns the address of the specified function for the current context.
 ///

diff --git a/src/vulkan.zig b/src/vulkan.zig
@@ -1,4 +1,5 @@
 const std = @import("std");
+const builtin = @import("builtin");
 
 const c = @import("c.zig").c;
 const Window = @import("Window.zig");
@@ -93,7 +94,7 @@ pub inline fn getRequiredInstanceExtensions() ?[][*:0]const u8 {
 /// Generic function pointer used for returning Vulkan API function pointers.
 ///
 /// see also: vulkan_proc, glfw.getInstanceProcAddress
-pub const VKProc = *const fn () callconv(.C) void;
+pub const VKProc = *const fn () callconv(if (builtin.os.tag == .windows and builtin.cpu.arch == .x86) .Stdcall else .C) void;
 
 /// Returns the address of the specified Vulkan instance function.
 ///