allow indexing uniforms, fix bug

1 files changed, 216 insertions, 180 deletions

diff --git a/src/gl.zig b/src/gl.zig
index 3e2c917..8b7ef3b 100644
--- a/src/gl.zig
+++ b/src/gl.zig
@@ -81,92 +81,116 @@ const UniformType = enum(c.GLint) {
 };
 
 const UniformValue = union(UniformType) {
-    FLOAT: f32,
-    FLOAT_VEC2: [2]f32,
-    FLOAT_VEC3: [3]f32,
-    FLOAT_VEC4: [4]f32,
-    DOUBLE: f64,
-    DOUBLE_VEC2: [2]f64,
-    DOUBLE_VEC3: [3]f64,
-    DOUBLE_VEC4: [4]f64,
-    INT: c_int, // i32 but bug
-    INT_VEC2: [2]c_int,
-    INT_VEC3: [3]c_int,
-    INT_VEC4: [4]c_int,
-    UNSIGNED_INT: c_uint,
-    UNSIGNED_INT_VEC2: [2]c_uint,
-    UNSIGNED_INT_VEC3: [3]c_uint,
-    UNSIGNED_INT_VEC4: [4]c_uint,
-    BOOL: c_uint,
-    BOOL_VEC2: [2]c_uint,
-    BOOL_VEC3: [3]c_uint,
-    BOOL_VEC4: [4]c_uint,
-    FLOAT_MAT2: [2 * 2]f32,
-    FLOAT_MAT3: [3 * 3]f32,
-    FLOAT_MAT4: [4 * 4]f32,
-    FLOAT_MAT2x3: [2 * 3]f32,
-    FLOAT_MAT2x4: [2 * 4]f32,
-    FLOAT_MAT3x2: [3 * 2]f32,
-    FLOAT_MAT3x4: [3 * 4]f32,
-    FLOAT_MAT4x2: [4 * 2]f32,
-    FLOAT_MAT4x3: [4 * 3]f32,
-    DOUBLE_MAT2: [2 * 2]f64,
-    DOUBLE_MAT3: [3 * 3]f64,
-    DOUBLE_MAT4: [4 * 4]f64,
-    DOUBLE_MAT2x3: [2 * 3]f64,
-    DOUBLE_MAT2x4: [2 * 4]f64,
-    DOUBLE_MAT3x2: [3 * 2]f64,
-    DOUBLE_MAT3x4: [3 * 4]f64,
-    DOUBLE_MAT4x2: [4 * 2]f64,
-    DOUBLE_MAT4x3: [4 * 3]f64,
-    SAMPLER_1D: c_int,
-    SAMPLER_2D: c_int,
-    SAMPLER_3D: c_int,
-    SAMPLER_CUBE: c_int,
-    SAMPLER_1D_SHADOW: c_int,
-    SAMPLER_2D_SHADOW: c_int,
-    SAMPLER_1D_ARRAY: c_int,
-    SAMPLER_2D_ARRAY: c_int,
-    SAMPLER_1D_ARRAY_SHADOW: c_int,
-    SAMPLER_2D_ARRAY_SHADOW: c_int,
-    SAMPLER_2D_MULTISAMPLE: c_int,
-    SAMPLER_2D_MULTISAMPLE_ARRAY: c_int,
-    SAMPLER_CUBE_SHADOW: c_int,
-    SAMPLER_BUFFER: c_int,
-    SAMPLER_2D_RECT: c_int,
-    SAMPLER_2D_RECT_SHADOW: c_int,
-    INT_SAMPLER_1D: c_int,
-    INT_SAMPLER_2D: c_int,
-    INT_SAMPLER_3D: c_int,
-    INT_SAMPLER_CUBE: c_int,
-    INT_SAMPLER_1D_ARRAY: c_int,
-    INT_SAMPLER_2D_ARRAY: c_int,
-    INT_SAMPLER_2D_MULTISAMPLE: c_int,
-    INT_SAMPLER_2D_MULTISAMPLE_ARRAY: c_int,
-    INT_SAMPLER_BUFFER: c_int,
-    INT_SAMPLER_2D_RECT: c_int,
-    UNSIGNED_INT_SAMPLER_1D: c_int,
-    UNSIGNED_INT_SAMPLER_2D: c_int,
-    UNSIGNED_INT_SAMPLER_3D: c_int,
-    UNSIGNED_INT_SAMPLER_CUBE: c_int,
-    UNSIGNED_INT_SAMPLER_1D_ARRAY: c_int,
-    UNSIGNED_INT_SAMPLER_2D_ARRAY: c_int,
-    UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE: c_int,
-    UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY: c_int,
-    UNSIGNED_INT_SAMPLER_BUFFER: c_int,
-    UNSIGNED_INT_SAMPLER_2D_RECT: c_int,
-
-    pub fn init(utype: UniformType) UniformValue {
-        inline for (@typeInfo(UniformType).Enum.fields) |field| {
-            if (@as(UniformType, @enumFromInt(field.value)) == utype)
-                return @unionInit(UniformValue, field.name, undefined);
+    FLOAT: *f32,
+    FLOAT_VEC2: *[2]f32,
+    FLOAT_VEC3: *[3]f32,
+    FLOAT_VEC4: *[4]f32,
+    DOUBLE: *f64,
+    DOUBLE_VEC2: *[2]f64,
+    DOUBLE_VEC3: *[3]f64,
+    DOUBLE_VEC4: *[4]f64,
+    INT: *c_int, // i32 but bug
+    INT_VEC2: *[2]c_int,
+    INT_VEC3: *[3]c_int,
+    INT_VEC4: *[4]c_int,
+    UNSIGNED_INT: *c_uint,
+    UNSIGNED_INT_VEC2: *[2]c_uint,
+    UNSIGNED_INT_VEC3: *[3]c_uint,
+    UNSIGNED_INT_VEC4: *[4]c_uint,
+    BOOL: *c_uint,
+    BOOL_VEC2: *[2]c_uint,
+    BOOL_VEC3: *[3]c_uint,
+    BOOL_VEC4: *[4]c_uint,
+    FLOAT_MAT2: *[2 * 2]f32,
+    FLOAT_MAT3: *[3 * 3]f32,
+    FLOAT_MAT4: *[4 * 4]f32,
+    FLOAT_MAT2x3: *[2 * 3]f32,
+    FLOAT_MAT2x4: *[2 * 4]f32,
+    FLOAT_MAT3x2: *[3 * 2]f32,
+    FLOAT_MAT3x4: *[3 * 4]f32,
+    FLOAT_MAT4x2: *[4 * 2]f32,
+    FLOAT_MAT4x3: *[4 * 3]f32,
+    DOUBLE_MAT2: *[2 * 2]f64,
+    DOUBLE_MAT3: *[3 * 3]f64,
+    DOUBLE_MAT4: *[4 * 4]f64,
+    DOUBLE_MAT2x3: *[2 * 3]f64,
+    DOUBLE_MAT2x4: *[2 * 4]f64,
+    DOUBLE_MAT3x2: *[3 * 2]f64,
+    DOUBLE_MAT3x4: *[3 * 4]f64,
+    DOUBLE_MAT4x2: *[4 * 2]f64,
+    DOUBLE_MAT4x3: *[4 * 3]f64,
+    SAMPLER_1D: *c_int,
+    SAMPLER_2D: *c_int,
+    SAMPLER_3D: *c_int,
+    SAMPLER_CUBE: *c_int,
+    SAMPLER_1D_SHADOW: *c_int,
+    SAMPLER_2D_SHADOW: *c_int,
+    SAMPLER_1D_ARRAY: *c_int,
+    SAMPLER_2D_ARRAY: *c_int,
+    SAMPLER_1D_ARRAY_SHADOW: *c_int,
+    SAMPLER_2D_ARRAY_SHADOW: *c_int,
+    SAMPLER_2D_MULTISAMPLE: *c_int,
+    SAMPLER_2D_MULTISAMPLE_ARRAY: *c_int,
+    SAMPLER_CUBE_SHADOW: *c_int,
+    SAMPLER_BUFFER: *c_int,
+    SAMPLER_2D_RECT: *c_int,
+    SAMPLER_2D_RECT_SHADOW: *c_int,
+    INT_SAMPLER_1D: *c_int,
+    INT_SAMPLER_2D: *c_int,
+    INT_SAMPLER_3D: *c_int,
+    INT_SAMPLER_CUBE: *c_int,
+    INT_SAMPLER_1D_ARRAY: *c_int,
+    INT_SAMPLER_2D_ARRAY: *c_int,
+    INT_SAMPLER_2D_MULTISAMPLE: *c_int,
+    INT_SAMPLER_2D_MULTISAMPLE_ARRAY: *c_int,
+    INT_SAMPLER_BUFFER: *c_int,
+    INT_SAMPLER_2D_RECT: *c_int,
+    UNSIGNED_INT_SAMPLER_1D: *c_int,
+    UNSIGNED_INT_SAMPLER_2D: *c_int,
+    UNSIGNED_INT_SAMPLER_3D: *c_int,
+    UNSIGNED_INT_SAMPLER_CUBE: *c_int,
+    UNSIGNED_INT_SAMPLER_1D_ARRAY: *c_int,
+    UNSIGNED_INT_SAMPLER_2D_ARRAY: *c_int,
+    UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE: *c_int,
+    UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY: *c_int,
+    UNSIGNED_INT_SAMPLER_BUFFER: *c_int,
+    UNSIGNED_INT_SAMPLER_2D_RECT: *c_int,
+
+    pub fn init(allocator: std.mem.Allocator, comptime utype: UniformType) !UniformValue {
+        const data = try allocator.create(std.meta.Child(std.meta.TagPayload(UniformValue, utype)));
+        return @unionInit(UniformValue, @tagName(utype), data);
+    }
+
+    pub fn deinit(self: *const UniformValue, allocator: std.mem.Allocator) void {
+        switch (self.*) {
+            inline else => |value| allocator.destroy(value),
         }
+    }
+
+    pub fn index(self: *const UniformValue, i: u8) !UniformValue {
+        const length: u8 = switch (self.*) {
+            .FLOAT_VEC2, .DOUBLE_VEC2, .INT_VEC2, .BOOL_VEC2, .UNSIGNED_INT_VEC2 => 2,
+            .FLOAT_VEC3, .DOUBLE_VEC3, .INT_VEC3, .UNSIGNED_INT_VEC3 => 3,
+            .BOOL_VEC3, .FLOAT_VEC4, .DOUBLE_VEC4, .INT_VEC4, .UNSIGNED_INT_VEC4, .BOOL_VEC4 => 4,
+            else => return error.notIndexable,
+        };
 
-        unreachable;
+        if (i >= length) {
+            return error.invalidIndex;
+        }
+
+        return switch (self.*) {
+            .FLOAT_VEC2, .FLOAT_VEC3, .FLOAT_VEC4 => |v| .{ .FLOAT = &v[i] },
+            .DOUBLE_VEC2, .DOUBLE_VEC3, .DOUBLE_VEC4 => |v| .{ .DOUBLE = &v[i] },
+            .INT_VEC2, .INT_VEC3, .INT_VEC4 => |v| .{ .INT = &v[i] },
+            .UNSIGNED_INT_VEC2, .UNSIGNED_INT_VEC3, .UNSIGNED_INT_VEC4 => |v| .{ .UNSIGNED_INT = &v[i] },
+            .BOOL_VEC2, .BOOL_VEC3, .BOOL_VEC4 => |v| .{ .BOOL = &v[i] },
+            else => unreachable,
+        };
     }
 };
 
-const CachedUniform = struct {
+pub const CachedUniform = struct {
     value: UniformValue,
     location: c.GLint,
 
@@ -177,16 +201,22 @@ const CachedUniform = struct {
         if (index == c.GL_INVALID_INDEX)
             return error.invalidUniform;
 
-        var utype: c.GLint = undefined;
-        c.glGetActiveUniformsiv(shader.program_id, 1, &index, c.GL_UNIFORM_TYPE, &utype);
+        var _utype: c.GLint = undefined;
+        c.glGetActiveUniformsiv(shader.program_id, 1, &index, c.GL_UNIFORM_TYPE, &_utype);
 
-        var self = CachedUniform{
-            .value = UniformValue.init(@as(UniformType, @enumFromInt(utype))),
-            .location = try shader.uniformLocation(name),
-        };
+        switch (@as(UniformType, @enumFromInt(_utype))) {
+            inline else => |utype| {
+                const location = try shader.uniformLocation(name);
+                const value = try UniformValue.init(allocator, utype);
+                errdefer value.deinit(allocator);
 
-        self.getShaderValue(shader);
-        return self;
+                return .{ .value = value, .location = location };
+            },
+        }
+    }
+
+    pub fn deinit(self: *const CachedUniform, allocator: std.mem.Allocator) void {
+        self.value.deinit(allocator);
     }
 
     // zig fmt: off
@@ -195,45 +225,45 @@ const CachedUniform = struct {
         const location = self.location;
 
         switch (self.value) {
-            .FLOAT => |*value| c.glProgramUniform1fv(program, location, 1, value),
-            .FLOAT_VEC2 => |*value| c.glProgramUniform2fv(program, location, 1, value),
-            .FLOAT_VEC3 => |*value| c.glProgramUniform3fv(program, location, 1, value),
-            .FLOAT_VEC4 => |*value| c.glProgramUniform4fv(program, location, 1, value),
-            .DOUBLE => |*value| c.glProgramUniform1dv(program, location, 1, value),
-            .DOUBLE_VEC2 => |*value| c.glProgramUniform1dv(program, location, 1, value),
-            .DOUBLE_VEC3 => |*value| c.glProgramUniform2dv(program, location, 1, value),
-            .DOUBLE_VEC4 => |*value| c.glProgramUniform3dv(program, location, 1, value),
-            .INT => |*value| c.glProgramUniform1iv(program, location, 1, value),
-            .INT_VEC2 => |*value| c.glProgramUniform2iv(program, location, 1, value),
-            .INT_VEC3 => |*value| c.glProgramUniform3iv(program, location, 1, value),
-            .INT_VEC4 => |*value| c.glProgramUniform4iv(program, location, 1, value),
-            .UNSIGNED_INT => |*value| c.glProgramUniform1uiv(program, location, 1, value),
-            .UNSIGNED_INT_VEC2 => |*value| c.glProgramUniform2uiv(program, location, 1, value),
-            .UNSIGNED_INT_VEC3 => |*value| c.glProgramUniform3uiv(program, location, 1, value),
-            .UNSIGNED_INT_VEC4 => |*value| c.glProgramUniform4uiv(program, location, 1, value),
-            .BOOL => |*value| c.glProgramUniform1uiv(program, location, 1, value),
-            .BOOL_VEC2 => |*value| c.glProgramUniform2uiv(program, location, 1, value),
-            .BOOL_VEC3 => |*value| c.glProgramUniform3uiv(program, location, 1, value),
-            .BOOL_VEC4 => |*value| c.glProgramUniform4uiv(program, location, 1, value),
-            .FLOAT_MAT2 => |*value| c.glProgramUniformMatrix2fv(program, location, 1, c.GL_FALSE, value),
-            .FLOAT_MAT3 => |*value| c.glProgramUniformMatrix3fv(program, location, 1, c.GL_FALSE, value),
-            .FLOAT_MAT4 => |*value| c.glProgramUniformMatrix4fv(program, location, 1, c.GL_FALSE, value),
-            .FLOAT_MAT2x3 => |*value| c.glProgramUniformMatrix2x3fv(program, location, 1, c.GL_FALSE, value),
-            .FLOAT_MAT2x4 => |*value| c.glProgramUniformMatrix2x4fv(program, location, 1, c.GL_FALSE, value),
-            .FLOAT_MAT3x2 => |*value| c.glProgramUniformMatrix3x2fv(program, location, 1, c.GL_FALSE, value),
-            .FLOAT_MAT3x4 => |*value| c.glProgramUniformMatrix3x4fv(program, location, 1, c.GL_FALSE, value),
-            .FLOAT_MAT4x2 => |*value| c.glProgramUniformMatrix4x2fv(program, location, 1, c.GL_FALSE, value),
-            .FLOAT_MAT4x3 => |*value| c.glProgramUniformMatrix4x3fv(program, location, 1, c.GL_FALSE, value),
-            .DOUBLE_MAT2 => |*value| c.glProgramUniformMatrix2dv(program, location, 1, c.GL_FALSE, value),
-            .DOUBLE_MAT3 => |*value| c.glProgramUniformMatrix3dv(program, location, 1, c.GL_FALSE, value),
-            .DOUBLE_MAT4 => |*value| c.glProgramUniformMatrix4dv(program, location, 1, c.GL_FALSE, value),
-            .DOUBLE_MAT2x3 => |*value| c.glProgramUniformMatrix2x3dv(program, location, 1, c.GL_FALSE, value),
-            .DOUBLE_MAT2x4 => |*value| c.glProgramUniformMatrix2x4dv(program, location, 1, c.GL_FALSE, value),
-            .DOUBLE_MAT3x2 => |*value| c.glProgramUniformMatrix3x2dv(program, location, 1, c.GL_FALSE, value),
-            .DOUBLE_MAT3x4 => |*value| c.glProgramUniformMatrix3x4dv(program, location, 1, c.GL_FALSE, value),
-            .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),
+            .FLOAT => |value| c.glProgramUniform1fv(program, location, 1, value),
+            .FLOAT_VEC2 => |value| c.glProgramUniform2fv(program, location, 1, value),
+            .FLOAT_VEC3 => |value| c.glProgramUniform3fv(program, location, 1, value),
+            .FLOAT_VEC4 => |value| c.glProgramUniform4fv(program, location, 1, value),
+            .DOUBLE => |value| c.glProgramUniform1dv(program, location, 1, value),
+            .DOUBLE_VEC2 => |value| c.glProgramUniform1dv(program, location, 1, value),
+            .DOUBLE_VEC3 => |value| c.glProgramUniform2dv(program, location, 1, value),
+            .DOUBLE_VEC4 => |value| c.glProgramUniform3dv(program, location, 1, value),
+            .INT => |value| c.glProgramUniform1iv(program, location, 1, value),
+            .INT_VEC2 => |value| c.glProgramUniform2iv(program, location, 1, value),
+            .INT_VEC3 => |value| c.glProgramUniform3iv(program, location, 1, value),
+            .INT_VEC4 => |value| c.glProgramUniform4iv(program, location, 1, value),
+            .UNSIGNED_INT => |value| c.glProgramUniform1uiv(program, location, 1, value),
+            .UNSIGNED_INT_VEC2 => |value| c.glProgramUniform2uiv(program, location, 1, value),
+            .UNSIGNED_INT_VEC3 => |value| c.glProgramUniform3uiv(program, location, 1, value),
+            .UNSIGNED_INT_VEC4 => |value| c.glProgramUniform4uiv(program, location, 1, value),
+            .BOOL => |value| c.glProgramUniform1uiv(program, location, 1, value),
+            .BOOL_VEC2 => |value| c.glProgramUniform2uiv(program, location, 1, value),
+            .BOOL_VEC3 => |value| c.glProgramUniform3uiv(program, location, 1, value),
+            .BOOL_VEC4 => |value| c.glProgramUniform4uiv(program, location, 1, value),
+            .FLOAT_MAT2 => |value| c.glProgramUniformMatrix2fv(program, location, 1, c.GL_FALSE, value),
+            .FLOAT_MAT3 => |value| c.glProgramUniformMatrix3fv(program, location, 1, c.GL_FALSE, value),
+            .FLOAT_MAT4 => |value| c.glProgramUniformMatrix4fv(program, location, 1, c.GL_FALSE, value),
+            .FLOAT_MAT2x3 => |value| c.glProgramUniformMatrix2x3fv(program, location, 1, c.GL_FALSE, value),
+            .FLOAT_MAT2x4 => |value| c.glProgramUniformMatrix2x4fv(program, location, 1, c.GL_FALSE, value),
+            .FLOAT_MAT3x2 => |value| c.glProgramUniformMatrix3x2fv(program, location, 1, c.GL_FALSE, value),
+            .FLOAT_MAT3x4 => |value| c.glProgramUniformMatrix3x4fv(program, location, 1, c.GL_FALSE, value),
+            .FLOAT_MAT4x2 => |value| c.glProgramUniformMatrix4x2fv(program, location, 1, c.GL_FALSE, value),
+            .FLOAT_MAT4x3 => |value| c.glProgramUniformMatrix4x3fv(program, location, 1, c.GL_FALSE, value),
+            .DOUBLE_MAT2 => |value| c.glProgramUniformMatrix2dv(program, location, 1, c.GL_FALSE, value),
+            .DOUBLE_MAT3 => |value| c.glProgramUniformMatrix3dv(program, location, 1, c.GL_FALSE, value),
+            .DOUBLE_MAT4 => |value| c.glProgramUniformMatrix4dv(program, location, 1, c.GL_FALSE, value),
+            .DOUBLE_MAT2x3 => |value| c.glProgramUniformMatrix2x3dv(program, location, 1, c.GL_FALSE, value),
+            .DOUBLE_MAT2x4 => |value| c.glProgramUniformMatrix2x4dv(program, location, 1, c.GL_FALSE, value),
+            .DOUBLE_MAT3x2 => |value| c.glProgramUniformMatrix3x2dv(program, location, 1, c.GL_FALSE, value),
+            .DOUBLE_MAT3x4 => |value| c.glProgramUniformMatrix3x4dv(program, location, 1, c.GL_FALSE, value),
+            .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.*),
         }
     }
 
@@ -242,45 +272,45 @@ const CachedUniform = struct {
         const location = self.location;
 
         switch (self.value) {
-            .FLOAT => |*value| c.glGetnUniformfv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .FLOAT_VEC2 => |*value| c.glGetnUniformfv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .FLOAT_VEC3 => |*value| c.glGetnUniformfv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .FLOAT_VEC4 => |*value| c.glGetnUniformfv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .DOUBLE => |*value| c.glGetnUniformdv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .DOUBLE_VEC2 => |*value| c.glGetnUniformdv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .DOUBLE_VEC3 => |*value| c.glGetnUniformdv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .DOUBLE_VEC4 => |*value| c.glGetnUniformdv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .INT => |*value| c.glGetnUniformiv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .INT_VEC2 => |*value| c.glGetnUniformiv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .INT_VEC3 => |*value| c.glGetnUniformiv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .INT_VEC4 => |*value| c.glGetnUniformiv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .UNSIGNED_INT => |*value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .UNSIGNED_INT_VEC2 => |*value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .UNSIGNED_INT_VEC3 => |*value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .UNSIGNED_INT_VEC4 => |*value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .BOOL => |*value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .BOOL_VEC2 => |*value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .BOOL_VEC3 => |*value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .BOOL_VEC4 => |*value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
-            .FLOAT_MAT2 => |*value| c.glGetUniformfv(program, location, value),
-            .FLOAT_MAT3 => |*value| c.glGetUniformfv(program, location, value),
-            .FLOAT_MAT4 => |*value| c.glGetUniformfv(program, location, value),
-            .FLOAT_MAT2x3 => |*value| c.glGetUniformfv(program, location, value),
-            .FLOAT_MAT2x4 => |*value| c.glGetUniformfv(program, location, value),
-            .FLOAT_MAT3x2 => |*value| c.glGetUniformfv(program, location, value),
-            .FLOAT_MAT3x4 => |*value| c.glGetUniformfv(program, location, value),
-            .FLOAT_MAT4x2 => |*value| c.glGetUniformfv(program, location, value),
-            .FLOAT_MAT4x3 => |*value| c.glGetUniformfv(program, location, value),
-            .DOUBLE_MAT2 => |*value| c.glGetUniformdv(program, location, value),
-            .DOUBLE_MAT3 => |*value| c.glGetUniformdv(program, location, value),
-            .DOUBLE_MAT4 => |*value| c.glGetUniformdv(program, location, value),
-            .DOUBLE_MAT2x3 => |*value| c.glGetUniformdv(program, location, value),
-            .DOUBLE_MAT2x4 => |*value| c.glGetUniformdv(program, location, value),
-            .DOUBLE_MAT3x2 => |*value| c.glGetUniformdv(program, location, value),
-            .DOUBLE_MAT3x4 => |*value| c.glGetUniformdv(program, location, value),
-            .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),
+            .FLOAT => |value| c.glGetnUniformfv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .FLOAT_VEC2 => |value| c.glGetnUniformfv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .FLOAT_VEC3 => |value| c.glGetnUniformfv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .FLOAT_VEC4 => |value| c.glGetnUniformfv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .DOUBLE => |value| c.glGetnUniformdv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .DOUBLE_VEC2 => |value| c.glGetnUniformdv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .DOUBLE_VEC3 => |value| c.glGetnUniformdv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .DOUBLE_VEC4 => |value| c.glGetnUniformdv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .INT => |value| c.glGetnUniformiv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .INT_VEC2 => |value| c.glGetnUniformiv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .INT_VEC3 => |value| c.glGetnUniformiv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .INT_VEC4 => |value| c.glGetnUniformiv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .UNSIGNED_INT => |value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .UNSIGNED_INT_VEC2 => |value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .UNSIGNED_INT_VEC3 => |value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .UNSIGNED_INT_VEC4 => |value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .BOOL => |value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .BOOL_VEC2 => |value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .BOOL_VEC3 => |value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .BOOL_VEC4 => |value| c.glGetnUniformuiv(program, location, @sizeOf(@TypeOf(value.*)), value),
+            .FLOAT_MAT2 => |value| c.glGetUniformfv(program, location, value),
+            .FLOAT_MAT3 => |value| c.glGetUniformfv(program, location, value),
+            .FLOAT_MAT4 => |value| c.glGetUniformfv(program, location, value),
+            .FLOAT_MAT2x3 => |value| c.glGetUniformfv(program, location, value),
+            .FLOAT_MAT2x4 => |value| c.glGetUniformfv(program, location, value),
+            .FLOAT_MAT3x2 => |value| c.glGetUniformfv(program, location, value),
+            .FLOAT_MAT3x4 => |value| c.glGetUniformfv(program, location, value),
+            .FLOAT_MAT4x2 => |value| c.glGetUniformfv(program, location, value),
+            .FLOAT_MAT4x3 => |value| c.glGetUniformfv(program, location, value),
+            .DOUBLE_MAT2 => |value| c.glGetUniformdv(program, location, value),
+            .DOUBLE_MAT3 => |value| c.glGetUniformdv(program, location, value),
+            .DOUBLE_MAT4 => |value| c.glGetUniformdv(program, location, value),
+            .DOUBLE_MAT2x3 => |value| c.glGetUniformdv(program, location, value),
+            .DOUBLE_MAT2x4 => |value| c.glGetUniformdv(program, location, value),
+            .DOUBLE_MAT3x2 => |value| c.glGetUniformdv(program, location, value),
+            .DOUBLE_MAT3x4 => |value| c.glGetUniformdv(program, location, value),
+            .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),
         }
     }
     // zig fmt: on
@@ -359,6 +389,7 @@ pub const UniformCache = struct {
     pub fn deinit(self: *UniformCache) void {
         var it = self.uniforms.iterator();
         while (it.next()) |entry| {
+            entry.value_ptr.deinit(self.allocator);
             self.allocator.free(entry.key_ptr.*);
         }
 
@@ -408,21 +439,26 @@ pub const UniformCache = struct {
         }
     }
 
-    // name has to be zero-terminated!
-    pub fn get(self: *UniformCache, name: []const u8) !?*CachedUniform {
-        const cloned_name = try self.allocator.dupe(u8, name);
-        errdefer self.allocator.free(cloned_name);
-
-        var result = try self.uniforms.getOrPut(cloned_name);
-        if (!result.found_existing) {
-            result.value_ptr.* = CachedUniform.init(self.shader.*, name.ptr) catch {
-                _ = self.uniforms.remove(cloned_name);
-                self.allocator.free(cloned_name);
-                return null;
-            };
+    pub fn get(self: *UniformCache, name: [:0]u8) !?*CachedUniform {
+        var getValue = false;
+
+        if (!self.uniforms.contains(name)) {
+            const cloned_name = try self.allocator.dupe(u8, name);
+            errdefer self.allocator.free(cloned_name);
+
+            const uniform = CachedUniform.init(self.allocator, self.shader.*, name.ptr) catch return null;
+            errdefer uniform.deinit(self.allocator);
+
+            try self.uniforms.put(cloned_name, uniform);
+            getValue = true;
+        }
+
+        if (self.uniforms.getPtr(name)) |ptr| {
+            ptr.getShaderValue(self.shader.*);
+            return ptr;
         }
 
-        return result.value_ptr;
+        return null;
     }
 };