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

15
glfw/src/main.zig
View file

@ -68,8 +68,7 @@ pub inline fn init(hints: InitHints) error{ PlatformError }!void {
initHint(init_hint, init_value) catch |err| switch (err) {
// TODO: Consider this; should not be reachable, given that all of the hint tags and hint values
// are coming in from a strict set of predefined values in 'InitHints' and 'InitHint'
Error.InvalidValue,
Error.InvalidEnum,
error.InvalidValue,
=> unreachable,
else => unreachable,
};
@ -77,7 +76,7 @@ pub inline fn init(hints: InitHints) error{ PlatformError }!void {
_ = c.glfwInit();
getError() catch |err| return switch (err) {
Error.PlatformError => err,
Error.PlatformError => @errSetCast(error{ PlatformError }, err),
else => unreachable,
};
}
@ -182,7 +181,7 @@ fn initHint(hint: InitHint, value: anytype) error{ InvalidValue }!void {
}
getError() catch |err| return switch (err) {
Error.InvalidEnum => unreachable, // impossible for any valid 'InitHint' value
Error.InvalidValue => err,
Error.InvalidValue => @errSetCast(error{ InvalidValue }, err),
else => unreachable,
};
}
@ -238,7 +237,7 @@ pub inline fn pollEvents() error{ PlatformError }!void {
internal_debug.assertInitialized();
c.glfwPollEvents();
getError() catch |err| return switch (err) {
Error.PlatformError => err,
Error.PlatformError => @errSetCast(error{ PlatformError }, err),
else => unreachable,
};
}
@ -277,7 +276,7 @@ pub inline fn waitEvents() error{ PlatformError }!void {
internal_debug.assertInitialized();
c.glfwWaitEvents();
getError() catch |err| return switch (err) {
Error.PlatformError => err,
Error.PlatformError => @errSetCast(error{ PlatformError }, err),
else => unreachable,
};
}
@ -324,7 +323,7 @@ pub inline fn waitEventsTimeout(timeout: f64) error{ InvalidValue, PlatformError
// and make its branch unreachable.
Error.InvalidValue,
Error.PlatformError,
=> err,
=> @errSetCast(error{ InvalidValue, PlatformError }, err),
else => unreachable,
};
}
@ -343,7 +342,7 @@ pub inline fn postEmptyEvent() error{ PlatformError }!void {
internal_debug.assertInitialized();
c.glfwPostEmptyEvent();
getError() catch |err| return switch (err) {
Error.PlatformError => err,
Error.PlatformError => @errSetCast(error{ PlatformError }, err),
else => unreachable,
};
}