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

glfw: replace `glfw.dont_care as sentinel value

Browse source 
Apply same pattern to other hints which can take on the value of `glfw.dont_care`.
This commit is contained in:
InKryption 2021-12-10 04:00:17 +01:00 • committed by Stephen Gutekanst
parent 4252ee0b1f
commit f8be8582af
1 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

56
glfw/src/Window.zig
View file

@ -173,23 +173,23 @@ pub const Hints = struct {
scale_to_monitor: bool = false, scale_to_monitor: bool = false,
/// Framebuffer hints /// Framebuffer hints
red_bits: c_int = 8, red_bits: ?PositiveCInt = 8,
green_bits: c_int = 8, green_bits: ?PositiveCInt = 8,
blue_bits: c_int = 8, blue_bits: ?PositiveCInt = 8,
alpha_bits: c_int = 8, alpha_bits: ?PositiveCInt = 8,
depth_bits: c_int = 24, depth_bits: ?PositiveCInt = 24,
stencil_bits: c_int = 8, stencil_bits: ?PositiveCInt = 8,
accum_red_bits: c_int = 0, accum_red_bits: ?PositiveCInt = 0,
accum_green_bits: c_int = 0, accum_green_bits: ?PositiveCInt = 0,
accum_blue_bits: c_int = 0, accum_blue_bits: ?PositiveCInt = 0,
accum_alpha_bits: c_int = 0, accum_alpha_bits: ?PositiveCInt = 0,
aux_buffers: c_int = 0, aux_buffers: ?PositiveCInt = 0,
/// Framebuffer MSAA samples /// Framebuffer MSAA samples
samples: c_int = 0, samples: ?PositiveCInt = 0,
/// Monitor refresh rate /// Monitor refresh rate
refresh_rate: ?std.math.IntFittingRange(0, std.math.maxInt(c_int)) = null, refresh_rate: ?PositiveCInt = null,
/// OpenGL stereoscopic rendering /// OpenGL stereoscopic rendering
stereo: bool = false, stereo: bool = false,
@ -233,6 +233,8 @@ pub const Hints = struct {
/// X11 specific /// X11 specific
x11_instance_name: [:0]const u8 = "", x11_instance_name: [:0]const u8 = "",
pub const PositiveCInt = std.math.IntFittingRange(0, std.math.maxInt(c_int));
pub const ClientAPI = enum(c_int) { pub const ClientAPI = enum(c_int) {
opengl_api = c.GLFW_OPENGL_API, opengl_api = c.GLFW_OPENGL_API,
opengl_es_api = c.GLFW_OPENGL_ES_API, opengl_es_api = c.GLFW_OPENGL_ES_API,
@ -268,32 +270,30 @@ pub const Hints = struct {
inline for (comptime std.meta.fieldNames(Hint)) |field_name| { inline for (comptime std.meta.fieldNames(Hint)) |field_name| {
const hint_tag = @enumToInt(@field(Hint, field_name)); const hint_tag = @enumToInt(@field(Hint, field_name));
const hint_value = @field(hints, field_name); const hint_value = @field(hints, field_name);
switch (@field(Hint, field_name)) { switch (@TypeOf(hint_value)) {
.refresh_rate => c.glfwWindowHint(hint_tag, if (hint_value) |refresh_rate| refresh_rate else glfw.dont_care), bool => c.glfwWindowHint(hint_tag, @boolToInt(hint_value)),
else => switch (@TypeOf(hint_value)) { ?PositiveCInt => c.glfwWindowHint(hint_tag, if (hint_value) |refresh_rate| refresh_rate else glfw.dont_care),
bool => c.glfwWindowHint(hint_tag, @boolToInt(hint_value)), c_int => c.glfwWindowHint(hint_tag, hint_value),
c_int => c.glfwWindowHint(hint_tag, hint_value),
ClientAPI, ClientAPI,
ContextCreationAPI, ContextCreationAPI,
ContextRobustness, ContextRobustness,
ContextReleaseBehavior, ContextReleaseBehavior,
OpenGLProfile, OpenGLProfile,
=> c.glfwWindowHint(hint_tag, @enumToInt(hint_value)), => c.glfwWindowHint(hint_tag, @enumToInt(hint_value)),
[:0]const u8 => c.glfwWindowHintString(hint_tag, hint_value.ptr), [:0]const u8 => c.glfwWindowHintString(hint_tag, hint_value.ptr),
else => unreachable, else => unreachable,
}
} }
getError() catch |err| return switch (err) { getError() catch |err| return switch (err) {
Error.NotInitialized => unreachable, Error.NotInitialized => unreachable,
Error.InvalidEnum => unreachable, Error.InvalidEnum => unreachable,
else => unreachable, else => unreachable,
}; };
} }
} }
}; };