hot reloading

1 files changed, 25 insertions, 33 deletions

diff --git a/src/gl.zig b/src/gl.zig
index c974cea..bd2c652 100644
--- a/src/gl.zig
+++ b/src/gl.zig
@@ -1,12 +1,12 @@
+const std = @import("std");
 const c_allocator = @import("std").heap.c_allocator;
 const panic = @import("std").debug.panic;
 const c = @import("c.zig");
 
 pub const ShaderProgram = struct {
     program_id: c.GLuint,
-    vertex_id: c.GLuint,
-    fragment_id: c.GLuint,
-    maybe_geometry_id: ?c.GLuint,
+    vert_id: c.GLuint,
+    frag_id: c.GLuint,
 
     pub fn bind(self: ShaderProgram) void {
         c.glUseProgram(self.program_id);
@@ -52,26 +52,23 @@ pub const ShaderProgram = struct {
         c.glUniformMatrix4fv(uniform_id, 1, c.GL_FALSE, &value[0][0]);
     }
 
-    pub fn create(
-        vertex_source: []const u8,
-        frag_source: []const u8,
-        maybe_geometry_source: ?[]u8,
-    ) !ShaderProgram {
+    pub fn create(vert_source: []const u8, frag_source: []const u8) !ShaderProgram {
         var self: ShaderProgram = undefined;
-        self.vertex_id = try initGlShader(vertex_source, "vertex", c.GL_VERTEX_SHADER);
-        self.fragment_id = try initGlShader(frag_source, "fragment", c.GL_FRAGMENT_SHADER);
-        self.maybe_geometry_id = if (maybe_geometry_source) |geo_source|
-            try initGlShader(geo_source, "geometry", c.GL_GEOMETRY_SHADER)
-        else
-            null;
+        
+        self.vert_id = try initGlShader(vert_source, "vertex", c.GL_VERTEX_SHADER);
+        errdefer c.glDeleteShader(self.vert_id);
+        
+        self.frag_id = try initGlShader(frag_source, "fragment", c.GL_FRAGMENT_SHADER);
+        errdefer c.glDeleteShader(self.frag_id);
 
         self.program_id = c.glCreateProgram();
-        c.glAttachShader(self.program_id, self.vertex_id);
-        c.glAttachShader(self.program_id, self.fragment_id);
-        if (self.maybe_geometry_id) |geo_id| {
-            c.glAttachShader(self.program_id, geo_id);
-        }
+        c.glAttachShader(self.program_id, self.vert_id);
+        c.glAttachShader(self.program_id, self.frag_id);
         c.glLinkProgram(self.program_id);
+        
+        errdefer c.glDeleteProgram(self.program_id);
+        errdefer c.glDetachShader(self.program_id, self.frag_id);
+        errdefer c.glDetachShader(self.program_id, self.vert_id);
 
         var ok: c.GLint = undefined;
         c.glGetProgramiv(self.program_id, c.GL_LINK_STATUS, &ok);
@@ -81,21 +78,16 @@ pub const ShaderProgram = struct {
         c.glGetProgramiv(self.program_id, c.GL_INFO_LOG_LENGTH, &error_size);
         const message = try c_allocator.alloc(u8, @intCast(usize, error_size));
         c.glGetProgramInfoLog(self.program_id, error_size, &error_size, message.ptr);
-        panic("Error linking shader program: {s}\n", .{ @ptrCast([*:0]const u8, message.ptr) });
+        std.debug.warn("Error linking shader program: {s}\n", .{ @ptrCast([*:0]const u8, message.ptr) });
+        return error.LinkError;
     }
 
     pub fn destroy(self: *ShaderProgram) void {
-        if (self.maybe_geometry_id) |geo_id| {
-            c.glDetachShader(self.program_id, geo_id);
-        }
-        c.glDetachShader(self.program_id, self.fragment_id);
-        c.glDetachShader(self.program_id, self.vertex_id);
+        c.glDetachShader(self.program_id, self.frag_id);
+        c.glDetachShader(self.program_id, self.vert_id);
 
-        if (self.maybe_geometry_id) |geo_id| {
-            c.glDeleteShader(geo_id);
-        }
-        c.glDeleteShader(self.fragment_id);
-        c.glDeleteShader(self.vertex_id);
+        c.glDeleteShader(self.frag_id);
+        c.glDeleteShader(self.vert_id);
 
         c.glDeleteProgram(self.program_id);
     }
@@ -103,6 +95,7 @@ pub const ShaderProgram = struct {
 
 fn initGlShader(source: []const u8, name: []const u8, kind: c.GLenum) !c.GLuint {
     const shader_id = c.glCreateShader(kind);
+    errdefer c.glDeleteShader(shader_id);
     const source_ptr: ?[*]const u8 = source.ptr;
     const source_len = @intCast(c.GLint, source.len);
     c.glShaderSource(shader_id, 1, &source_ptr, &source_len);
@@ -117,7 +110,8 @@ fn initGlShader(source: []const u8, name: []const u8, kind: c.GLenum) !c.GLuint
 
     const message = try c_allocator.alloc(u8, @intCast(usize, error_size));
     c.glGetShaderInfoLog(shader_id, error_size, &error_size, message.ptr);
-    panic("Error compiling {s} shader:\n{s}\n", .{ name, @ptrCast([*:0]const u8, message.ptr) });
+    std.debug.warn("Error compiling {s} shader:\n{s}\n", .{ name, @ptrCast([*:0]const u8, message.ptr) });
+    return error.CompileError;
 }
 
 pub const FramebufferObject = struct {
@@ -233,8 +227,6 @@ pub const Constants = struct {
             \\void main(){
             \\  color = texture(colorTexture, uv);
             \\}
-        ,
-            null
         );
 
         const vertices = [_]c.GLfloat{