From cf14ea506f3c292db7d46ec4118958a3de1b0147 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 24 Oct 2022 14:35:42 -0700 Subject: [PATCH] update zig --- flake.lock | 6 +++--- nix/devshell.nix | 2 ++ src/main.zig | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 420f3952c..e395c6ffc 100644 --- a/flake.lock +++ b/flake.lock @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1666526970, - "narHash": "sha256-qfhQNN36Bc1RNGtIC63Gc2UcE27Y9FQ/+uKuujimKms=", + "lastModified": 1666613499, + "narHash": "sha256-kdzazArGy067Z8G6SbnQHVRCIKbsSiKnyq+s2OcEL4Y=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "c6d01ab96647f8dc4b5f99bc2eb71eeec48d1330", + "rev": "9fe7a7038a5115cf00f2f91b2541caeab93779f8", "type": "github" }, "original": { diff --git a/nix/devshell.nix b/nix/devshell.nix index c5846ed94..bbabb955c 100644 --- a/nix/devshell.nix +++ b/nix/devshell.nix @@ -7,6 +7,7 @@ , python , scdoc , tracy +, valgrind , vulkan-loader , vttest , wabt @@ -63,6 +64,7 @@ in mkShell rec { parallel python tracy + valgrind vttest wraptest diff --git a/src/main.zig b/src/main.zig index 7371fb811..990d1f354 100644 --- a/src/main.zig +++ b/src/main.zig @@ -99,6 +99,8 @@ pub fn tracy_enabled() bool { return options.tracy_enabled; } +//pub const log_level: std.log.Level = .debug; + fn glfwErrorCallback(code: glfw.Error, desc: [:0]const u8) void { log.warn("glfw error={} message={s}", .{ code, desc }); }