From 1b2ed56e3cbdc1401b5f4fef54ddf183ae59e038 Mon Sep 17 00:00:00 2001 From: IntegratedQuantum Date: Sat, 16 Sep 2023 20:21:02 +0200 Subject: [PATCH] =?UTF-8?q?Update=20zig=20version=20to=200.12.0-dev.389+61?= =?UTF-8?q?b70778b=20and=20display=20debug=20times=20in=20=C2=B5s=20instea?= =?UTF-8?q?d=20of=20ns.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.zig | 2 -- src/gui/windows/gpu_performance_measuring.zig | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build.zig b/build.zig index 539044c9..031ba5ce 100644 --- a/build.zig +++ b/build.zig @@ -81,8 +81,6 @@ pub fn build(b: *std.build.Builder) !void { exe.addAnonymousModule("gui", .{.source_file = .{.path = "src/gui/gui.zig"}}); exe.addAnonymousModule("server", .{.source_file = .{.path = "src/server/server.zig"}}); - @import("mach_freetype").brotli_import_path = "mach_freetype.freetype.brotli"; - @import("mach_freetype").freetype_import_path = "mach_freetype.freetype"; const mach_freetype_dep = b.dependency("mach_freetype", .{ .target = target, .optimize = optimize, diff --git a/src/gui/windows/gpu_performance_measuring.zig b/src/gui/windows/gpu_performance_measuring.zig index abf6d1cf..707faec6 100644 --- a/src/gui/windows/gpu_performance_measuring.zig +++ b/src/gui/windows/gpu_performance_measuring.zig @@ -89,11 +89,11 @@ fn flawedRender() !void { inline for(0..queryObjects[curBuffer].len) |i| { var result: i64 = undefined; c.glGetQueryObjecti64v(queryObjects[curBuffer][i], c.GL_QUERY_RESULT, &result); - try draw.print("{s}: {} ns", .{names[i], result}, 0, y, 8, .left); + try draw.print("{s}: {} µs", .{names[i], @divTrunc(result, 1000)}, 0, y, 8, .left); sum += result; y += 8; } - try draw.print("Total: {} ns", .{sum}, 0, 0, 8, .left); + try draw.print("Total: {} µs", .{@divTrunc(sum, 1000)}, 0, 0, 8, .left); } pub fn render() Allocator.Error!void {