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

glfw: make glfw.getProcAddress conform to GLFW C ABI

Browse source 
Having `glfw.getProcAddress` conform to the GLFW C ABI is important as it is often
likely to be passed into libraries which expect exactly that ABI for OpenGL function
loading.

Fixes hexops/mach#52

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2021-10-29 16:45:41 -07:00 • committed by Stephen Gutekanst
parent 8c31529f8a
commit ac4bfe5e0b
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
glfw/src/opengl.zig
View file

@ -142,7 +142,11 @@ pub const GLProc = fn () callconv(.C) void;
/// @param[in] procname The ASCII encoded name of the function. /// @param[in] procname The ASCII encoded name of the function.
/// @return The address of the function, or null if an error occurred. /// @return The address of the function, or null if an error occurred.
/// ///
/// Possible errors include glfw.Error.NotInitialized, glfw.Error.NoCurrentContext and glfw.Error.PlatformError. /// To maintain ABI compatability with the C glfwGetProcAddress, as it is commonly passed into
/// libraries expecting that exact ABI, this function does not return an error. Instead, if
/// glfw.Error.NotInitialized, glfw.Error.NoCurrentContext, or glfw.Error.PlatformError would
/// occur this function will panic. You should ensure a valid OpenGL context exists and the
/// GLFW is initialized before calling this function.
/// ///
/// The address of a given function is not guaranteed to be the same between contexts. /// The address of a given function is not guaranteed to be the same between contexts.
/// ///
@ -155,9 +159,9 @@ pub const GLProc = fn () callconv(.C) void;
/// @thread_safety This function may be called from any thread. /// @thread_safety This function may be called from any thread.
/// ///
/// see also: context_glext, glfwExtensionSupported /// see also: context_glext, glfwExtensionSupported
pub inline fn getProcAddress(proc_name: [*c]const u8) Error!?GLProc { pub inline fn getProcAddress(proc_name: [*c]const u8) ?GLProc {
const proc_address = c.glfwGetProcAddress(proc_name); const proc_address = c.glfwGetProcAddress(proc_name);
try getError(); getError() catch |err| @panic(@errorName(err));
if (proc_address) |addr| return addr; if (proc_address) |addr| return addr;
return null; return null;
} }
@ -221,7 +225,7 @@ test "getProcAddress" {
defer window.destroy(); defer window.destroy();
try glfw.makeContextCurrent(window); try glfw.makeContextCurrent(window);
_ = glfw.getProcAddress("foobar") catch |err| std.debug.print("failed to get proc address, error={}\n", .{err}); _ = glfw.getProcAddress("foobar");
} }
test "extensionSupported" { test "extensionSupported" {