1 files changed, 3 insertions, 6 deletions

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;
     }
 };