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

glfw: dont call getError unless we need to

Browse source
This commit is contained in:
Lee Cannon 2022-02-08 01:49:22 +00:00 • committed by Stephen Gutekanst
parent 746b0dd1f0
commit 3e79a12f3d
11 changed files with 111 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

6
glfw/src/opengl.zig
View file

@ -57,12 +57,11 @@ pub inline fn makeContextCurrent(window: ?Window) error{ NoWindowContext, Platfo
/// see also: context_current, glfwMakeContextCurrent
pub inline fn getCurrentContext() std.mem.Allocator.Error!?Window {
internal_debug.assertInitialized();
const handle = c.glfwGetCurrentContext();
if (c.glfwGetCurrentContext()) |handle| return try Window.from(handle);
getError() catch |err| return switch (err) {
Error.NotInitialized => unreachable,
else => unreachable,
};
if (handle) |h| return try Window.from(h);
return null;
}
@ -194,9 +193,8 @@ pub const GLProc = fn () callconv(.C) void;
/// see also: context_glext, glfwExtensionSupported
pub fn getProcAddress(proc_name: [*:0]const u8) callconv(.C) ?GLProc {
internal_debug.assertInitialized();
const proc_address = c.glfwGetProcAddress(proc_name);
if (c.glfwGetProcAddress(proc_name)) |proc_address| return proc_address;
getError() catch |err| @panic(@errorName(err));
if (proc_address) |addr| return addr;
return null;
}