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

glfw: force init error type work around

Browse source
This commit is contained in:
InKryption 2021-11-21 20:42:32 +01:00 • committed by Stephen Gutekanst
parent 9f241b5109
commit 44fee8f1f1
10 changed files with 67 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

9
glfw/src/opengl.zig
View file

@ -37,7 +37,7 @@ pub inline fn makeContextCurrent(window: ?Window) error{ NoWindowContext, Platfo
getError() catch |err| return switch (err) {
Error.NoWindowContext,
Error.PlatformError,
=> err,
=> @errSetCast(error{ NoWindowContext, PlatformError }, err),
else => unreachable,
};
}
@ -54,8 +54,7 @@ pub inline fn makeContextCurrent(window: ?Window) error{ NoWindowContext, Platfo
/// @thread_safety This function may be called from any thread.
///
/// see also: context_current, glfwMakeContextCurrent
// TODO: Remove error stub
pub inline fn getCurrentContext() error{}!?Window {
pub inline fn getCurrentContext() std.mem.Allocator.Error!?Window {
internal_debug.assertInitialized();
const handle = c.glfwGetCurrentContext();
getError() catch unreachable; // Only error 'GLFW_NOT_INITIALIZED' is impossible
@ -102,7 +101,7 @@ pub inline fn swapInterval(interval: isize) error{ NoCurrentContext, PlatformErr
getError() catch |err| return switch (err) {
Error.NoCurrentContext,
Error.PlatformError,
=> err,
=> @errSetCast(error{ NoCurrentContext, PlatformError }, err),
else => unreachable,
};
}
@ -138,7 +137,7 @@ pub inline fn extensionSupported(extension: [*:0]const u8) error{ NoCurrentConte
getError() catch |err| return switch (err) {
Error.NoCurrentContext,
Error.InvalidValue,
=> err,
=> @errSetCast(error{ NoCurrentContext, InvalidValue }, err),
else => unreachable,
};
return supported == c.GLFW_TRUE;