diff options
| author | s-ol <s-ol@users.noreply.github.com> | 2020-02-10 15:18:14 +0000 |
|---|---|---|
| committer | s-ol <s-ol@users.noreply.github.com> | 2020-02-10 15:18:14 +0000 |
| commit | 311d2fa85eadd9f76a1d084771b3cc3071ec86ba (patch) | |
| tree | 5aaa90710a1e6f29e29c07ef78f0bf0276863825 | |
| parent | remove hardcoded offset uniform (diff) | |
| download | glsl-view-311d2fa85eadd9f76a1d084771b3cc3071ec86ba.tar.gz glsl-view-311d2fa85eadd9f76a1d084771b3cc3071ec86ba.zip | |
format, remove debug GL output
| -rw-r--r-- | src/control.zig | 18 | ||||
| -rw-r--r-- | src/debug_gl.zig | 5 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/control.zig b/src/control.zig index 1f6c4ba..f41d32e 100644 --- a/src/control.zig +++ b/src/control.zig @@ -73,30 +73,24 @@ pub const ControlServer = struct { if (self.cache.get(buffer[0 .. param_name.len + 1]) catch null) |uniform| { if (std.mem.eql(u8, types, "f")) { uniform.value.FLOAT = argv[0].*.f; - } else if (std.mem.eql(u8, types, "[ff]") - or std.mem.eql(u8, types, "ff")) { + } else if (std.mem.eql(u8, types, "[ff]") or std.mem.eql(u8, types, "ff")) { for (uniform.value.FLOAT_VEC2) |*dest, i| dest.* = argv[i].*.f; - } else if (std.mem.eql(u8, types, "[fff]") - or std.mem.eql(u8, types, "fff")) { + } else if (std.mem.eql(u8, types, "[fff]") or std.mem.eql(u8, types, "fff")) { for (uniform.value.FLOAT_VEC3) |*dest, i| dest.* = argv[i].*.f; - } else if (std.mem.eql(u8, types, "[ffff]") - or std.mem.eql(u8, types, "ffff")) { + } else if (std.mem.eql(u8, types, "[ffff]") or std.mem.eql(u8, types, "ffff")) { for (uniform.value.FLOAT_VEC4) |*dest, i| dest.* = argv[i].*.f; } else if (std.mem.eql(u8, types, "i")) { uniform.value.INT = argv[0].*.i; - } else if (std.mem.eql(u8, types, "[ii]") - or std.mem.eql(u8, types, "ii")) { + } else if (std.mem.eql(u8, types, "[ii]") or std.mem.eql(u8, types, "ii")) { for (uniform.value.INT_VEC2) |*dest, i| dest.* = argv[i].*.i; - } else if (std.mem.eql(u8, types, "[iii]") - or std.mem.eql(u8, types, "iii")) { + } else if (std.mem.eql(u8, types, "[iii]") or std.mem.eql(u8, types, "iii")) { for (uniform.value.INT_VEC3) |*dest, i| dest.* = argv[i].*.i; - } else if (std.mem.eql(u8, types, "[iiii]") - or std.mem.eql(u8, types, "iiii")) { + } else if (std.mem.eql(u8, types, "[iiii]") or std.mem.eql(u8, types, "iiii")) { for (uniform.value.INT_VEC4) |*dest, i| dest.* = argv[i].*.i; } else { diff --git a/src/debug_gl.zig b/src/debug_gl.zig index ebb552f..7d02d2f 100644 --- a/src/debug_gl.zig +++ b/src/debug_gl.zig @@ -7,6 +7,11 @@ const builtin = @import("builtin"); pub const is_on = if (builtin.mode == builtin.Mode.ReleaseFast) c.GL_FALSE else c.GL_TRUE; fn glDebugMessage(source: c.GLenum, typ: c.GLenum, id: c.GLuint, severity: c.GLenum, length: c.GLsizei, _message: [*c]const u8, user: ?*const c_void) callconv(.C) void { + switch (typ) { + c.GL_DEBUG_TYPE_ERROR, c.GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR, c.GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR => {}, + else => return, + } + const message = _message[0..@intCast(usize, length)]; std.debug.warn("GL Callback [{}] {} / {}: {s}\n", .{ source, typ, severity, message }); } |