update for zig 0.7.1

4 files changed, 4 insertions, 12 deletions

diff --git a/src/control.zig b/src/control.zig
index ed5c987..cbdea05 100644
--- a/src/control.zig
+++ b/src/control.zig
@@ -3,8 +3,6 @@ const gl = @import("gl.zig");
 const std = @import("std");
 const cfg = @import("config.zig");
 
-const param_prefix = "/param/";
-
 fn verify_args(expected: u8, got: []const u8) !void {
     for (got) |typ| {
         if (typ != expected)
@@ -71,7 +69,6 @@ pub const ControlServer = struct {
                     .udp => c.LO_UDP,
                     .tcp => c.LO_TCP,
                     .unix => c.LO_UNIX,
-                    else => unreachable,
                 };
 
                 std.debug.warn(
@@ -84,7 +81,6 @@ pub const ControlServer = struct {
                 std.debug.warn("listening for OSC messages at {s}\n", .{url});
                 self.server = c.lo_server_new_from_url(url[0..].ptr, handle_error);
             },
-            else => unreachable,
         }
 
         if (self.server == null)
diff --git a/src/gl.zig b/src/gl.zig
index 9aab754..4c91b50 100644
--- a/src/gl.zig
+++ b/src/gl.zig
@@ -234,7 +234,6 @@ const CachedUniform = struct {
             .DOUBLE_MAT4x2 => |*value| c.glProgramUniformMatrix4x2dv(program, location, 1, c.GL_FALSE, value),
             .DOUBLE_MAT4x3 => |*value| c.glProgramUniformMatrix4x3dv(program, location, 1, c.GL_FALSE, value),
             .SAMPLER_1D, .SAMPLER_2D, .SAMPLER_3D, .SAMPLER_CUBE, .SAMPLER_1D_SHADOW, .SAMPLER_2D_SHADOW, .SAMPLER_1D_ARRAY, .SAMPLER_2D_ARRAY, .SAMPLER_1D_ARRAY_SHADOW, .SAMPLER_2D_ARRAY_SHADOW, .SAMPLER_2D_MULTISAMPLE, .SAMPLER_2D_MULTISAMPLE_ARRAY, .SAMPLER_CUBE_SHADOW, .SAMPLER_BUFFER, .SAMPLER_2D_RECT, .SAMPLER_2D_RECT_SHADOW, .INT_SAMPLER_1D, .INT_SAMPLER_2D, .INT_SAMPLER_3D, .INT_SAMPLER_CUBE, .INT_SAMPLER_1D_ARRAY, .INT_SAMPLER_2D_ARRAY, .INT_SAMPLER_2D_MULTISAMPLE, .INT_SAMPLER_2D_MULTISAMPLE_ARRAY, .INT_SAMPLER_BUFFER, .INT_SAMPLER_2D_RECT, .UNSIGNED_INT_SAMPLER_1D, .UNSIGNED_INT_SAMPLER_2D, .UNSIGNED_INT_SAMPLER_3D, .UNSIGNED_INT_SAMPLER_CUBE, .UNSIGNED_INT_SAMPLER_1D_ARRAY, .UNSIGNED_INT_SAMPLER_2D_ARRAY, .UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE, .UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY, .UNSIGNED_INT_SAMPLER_BUFFER, .UNSIGNED_INT_SAMPLER_2D_RECT => |value| c.glProgramUniform1i(program, location, value),
-            else => unreachable,
         }
     }
 
@@ -282,7 +281,6 @@ const CachedUniform = struct {
             .DOUBLE_MAT4x2 => |*value| c.glGetUniformdv(program, location, value),
             .DOUBLE_MAT4x3 => |*value| c.glGetUniformdv(program, location, value),
             .SAMPLER_1D, .SAMPLER_2D, .SAMPLER_3D, .SAMPLER_CUBE, .SAMPLER_1D_SHADOW, .SAMPLER_2D_SHADOW, .SAMPLER_1D_ARRAY, .SAMPLER_2D_ARRAY, .SAMPLER_1D_ARRAY_SHADOW, .SAMPLER_2D_ARRAY_SHADOW, .SAMPLER_2D_MULTISAMPLE, .SAMPLER_2D_MULTISAMPLE_ARRAY, .SAMPLER_CUBE_SHADOW, .SAMPLER_BUFFER, .SAMPLER_2D_RECT, .SAMPLER_2D_RECT_SHADOW, .INT_SAMPLER_1D, .INT_SAMPLER_2D, .INT_SAMPLER_3D, .INT_SAMPLER_CUBE, .INT_SAMPLER_1D_ARRAY, .INT_SAMPLER_2D_ARRAY, .INT_SAMPLER_2D_MULTISAMPLE, .INT_SAMPLER_2D_MULTISAMPLE_ARRAY, .INT_SAMPLER_BUFFER, .INT_SAMPLER_2D_RECT, .UNSIGNED_INT_SAMPLER_1D, .UNSIGNED_INT_SAMPLER_2D, .UNSIGNED_INT_SAMPLER_3D, .UNSIGNED_INT_SAMPLER_CUBE, .UNSIGNED_INT_SAMPLER_1D_ARRAY, .UNSIGNED_INT_SAMPLER_2D_ARRAY, .UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE, .UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY, .UNSIGNED_INT_SAMPLER_BUFFER, .UNSIGNED_INT_SAMPLER_2D_RECT => |*value| c.glGetnUniformiv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            else => unreachable,
         }
     }
     // zig fmt: on
@@ -364,7 +362,6 @@ pub const UniformCache = struct {
             self.allocator.free(entry.key);
         }
 
-        self.uniforms.clear();
         self.uniforms.deinit();
     }
 
@@ -404,7 +401,7 @@ pub const UniformCache = struct {
                     self.allocator.free(removed.key);
                 }
             } else {
-                var uniform = self.uniforms.get(name).?.value;
+                var uniform = self.uniforms.get(name).?;
                 uniform.location = self.shader.uniformLocation(name.ptr) catch unreachable;
                 uniform.setShaderValue(self.shader.*);
             }
@@ -418,14 +415,14 @@ pub const UniformCache = struct {
 
         var result = try self.uniforms.getOrPut(cloned_name);
         if (!result.found_existing) {
-            result.kv.value = CachedUniform.init(self.shader.*, name.ptr) catch {
+            result.entry.value = CachedUniform.init(self.shader.*, name.ptr) catch {
                 _ = self.uniforms.remove(cloned_name);
                 self.allocator.free(cloned_name);
                 return null;
             };
         }
 
-        return &result.kv.value;
+        return &result.entry.value;
     }
 };
 
diff --git a/src/main.zig b/src/main.zig
index d69bd66..b580dd9 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -172,7 +172,7 @@ fn reloadShader(current: *gl.ShaderProgram, frag_file: fs.File, size: u64) !void
         \\}
     ;
 
-    if (gl.ShaderProgram.create(vert_source, frag_source[0..length])) |new_program| {
+    if (gl.ShaderProgram.create(vert_source, frag_source)) |new_program| {
         current.destroy();
         current.* = new_program;
     } else |err| {
diff --git a/src/output.zig b/src/output.zig
index 5c8aa19..2aa6802 100644
--- a/src/output.zig
+++ b/src/output.zig
@@ -21,7 +21,6 @@ pub const Output = struct {
     ) *Output {
         return switch (config.type) {
             .window => WindowOutput.create(allocator, config, constants),
-            else => unreachable,
         };
     }
 };