diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gl.zig | 2 | ||||
| -rw-r--r-- | src/main.zig | 7 |
2 files changed, 7 insertions, 2 deletions
@@ -170,7 +170,7 @@ const CachedUniform = struct { value: UniformValue, location: c.GLint, - pub fn init(shader: ShaderProgram, name: [*]const u8) !CachedUniform { + pub fn init(allocator: std.mem.Allocator, shader: ShaderProgram, name: [*]const u8) !CachedUniform { var index: c.GLuint = undefined; c.glGetUniformIndices(shader.program_id, 1, &name, &index); diff --git a/src/main.zig b/src/main.zig index 1c76c61..94ccab9 100644 --- a/src/main.zig +++ b/src/main.zig @@ -2,6 +2,7 @@ const std = @import("std"); const fs = std.fs; const debug = std.debug; const panic = debug.panic; +const process = std.process; const c = @import("c.zig"); const debug_gl = @import("debug_gl.zig"); const cfg = @import("config.zig"); @@ -20,7 +21,11 @@ pub fn main() !void { var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); defer arena.deinit(); - var config = try cfg.Config.parse(&arena.allocator(), "config.yaml"); + var args = process.args(); + _ = args.next(); + + const filename = args.next() orelse "config.yaml"; + var config = try cfg.Config.parse(&arena.allocator(), filename); _ = c.glfwSetErrorCallback(errorCallback); |