aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authors-ol <s+removethis@s-ol.nu>2024-11-13 19:07:20 +0000
committers-ol <s+removethis@s-ol.nu>2024-11-13 19:07:20 +0000
commitb57565b654021852c165592cdf282654a5170c98 (patch)
treef05edad3508c6b6a838397c34bdc4cc05405ab88 /src
parentinject #line directives for better error reporting (diff)
downloadglsl-view-b57565b654021852c165592cdf282654a5170c98.tar.gz
glsl-view-b57565b654021852c165592cdf282654a5170c98.zip
update for zig 0.13.0
Diffstat (limited to 'src')
-rw-r--r--src/config.zig7
-rw-r--r--src/control.zig2
-rw-r--r--src/output.zig4
3 files changed, 7 insertions, 6 deletions
diff --git a/src/config.zig b/src/config.zig
index 27d0b44..f3d8c01 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -63,7 +63,8 @@ pub const Config = struct {
const len: usize = try file.read(buffer[0..]);
c.yaml_parser_set_input_string(&parser, buffer[0..], len);
- const dirname = fs.path.dirname(filename) orelse "";
+ const dirname = fs.path.dirname(filename) orelse ".";
+ debug.print("file/dirname is {s} / {s}\n", .{filename, dirname});
var config: Config = .{
.width = 1920,
.height = 1080,
@@ -220,7 +221,7 @@ fn parseOutputs(parser: *c.yaml_parser_t, allocator: *const std.mem.Allocator) !
switch (seqEvent.type) {
c.YAML_SEQUENCE_END_EVENT => break,
c.YAML_MAPPING_START_EVENT => {
- var output = &outputs[output_count];
+ const output = &outputs[output_count];
output.* = defaultOutput;
while (true) {
@@ -285,7 +286,7 @@ fn parseParameters(parser: *c.yaml_parser_t, allocator: *const std.mem.Allocator
switch (seqEvent.type) {
c.YAML_SEQUENCE_END_EVENT => break,
c.YAML_MAPPING_START_EVENT => {
- var param = &parameters[param_count];
+ const param = &parameters[param_count];
var have_name = false;
var have_type = false;
diff --git a/src/control.zig b/src/control.zig
index 344badc..2e63b44 100644
--- a/src/control.zig
+++ b/src/control.zig
@@ -154,7 +154,7 @@ pub const ControlServer = struct {
var uniform: *gl.CachedUniform = undefined;
if (parts.next()) |uniform_name| {
- var nameZ = try self.allocator.dupeZ(u8, uniform_name);
+ const nameZ = try self.allocator.dupeZ(u8, uniform_name);
defer self.allocator.free(nameZ);
const res = try self.cache.get(nameZ);
diff --git a/src/output.zig b/src/output.zig
index 96b3f3e..459bedb 100644
--- a/src/output.zig
+++ b/src/output.zig
@@ -66,7 +66,7 @@ pub const WindowOutput = struct {
}
fn update(output: *Output, texture_id: c.GLuint) bool {
- const self = @fieldParentPtr(WindowOutput, "output", output);
+ const self: *WindowOutput = @fieldParentPtr("output", output);
if (c.glfwWindowShouldClose(self.window) == c.GL_TRUE)
return true;
@@ -109,7 +109,7 @@ pub const WindowOutput = struct {
}
fn destroy(output: *Output) void {
- const self = @fieldParentPtr(WindowOutput, "output", output);
+ const self: *WindowOutput = @fieldParentPtr("output", output);
c.glfwDestroyWindow(self.window);
}