From d5a520e2616b1db82d81e16f7ed4fdb9bb7d6b0f Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Thu, 16 Apr 2026 23:37:57 +0200 Subject: [PATCH] ci slip --- src/vulkan/Instance.zig | 14 ++++++++++++-- src/vulkan/logger/logger.zig | 6 +----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/vulkan/Instance.zig b/src/vulkan/Instance.zig index 8f1245e..c267355 100644 --- a/src/vulkan/Instance.zig +++ b/src/vulkan/Instance.zig @@ -3,7 +3,7 @@ const builtin = @import("builtin"); const vk = @import("vulkan"); const config = @import("config"); -const logger = @import("lib.zig").logger; +const ThreadSafeLoggerManager = @import("logger/ThreadSafeManager.zig"); const VkError = @import("error_set.zig").VkError; const Dispatchable = @import("Dispatchable.zig").Dispatchable; @@ -31,6 +31,7 @@ const DeviceAllocator = struct { physical_devices: std.ArrayList(*Dispatchable(PhysicalDevice)), threaded: std.Io.Threaded, allocator: if (config.debug_allocator) std.heap.DebugAllocator(.{}) else DeviceAllocator, +logger: ThreadSafeLoggerManager, dispatch_table: *const DispatchTable, vtable: *const VTable, @@ -46,11 +47,20 @@ pub const DispatchTable = struct { pub fn init(allocator: std.mem.Allocator, infos: *const vk.InstanceCreateInfo) VkError!Self { _ = allocator; _ = infos; - return .{ + + var self: Self = .{ .physical_devices = .empty, + .threaded = undefined, + .allocator = if (config.debug_allocator) .init else .{}, + .logger = undefined, .dispatch_table = undefined, .vtable = undefined, }; + + self.threaded = .init(self.allocator.allocator(), .{}); + self.logger = .init(self.threaded.io(), self.allocator.allocator()); + + return self; } /// Dummy for docs creation and stuff diff --git a/src/vulkan/logger/logger.zig b/src/vulkan/logger/logger.zig index 7cace2c..859c8ac 100644 --- a/src/vulkan/logger/logger.zig +++ b/src/vulkan/logger/logger.zig @@ -1,4 +1,4 @@ -//! A driver-global logger that stack in memory all same-indent `debug` logs +//! A instance-level logger that stack in memory all same-indent `debug` logs //! and only displays them in reverse order if a non-debug log is requested const std = @import("std"); @@ -71,10 +71,6 @@ pub fn log(comptime level: std.log.Level, comptime scope: @EnumLiteral(), compti .warn, .err => stderr_file, }; - var timezone = zdt.Timezone.tzLocal(std.heap.page_allocator) catch zdt.Timezone.UTC; - defer timezone.deinit(); - const now = zdt.Datetime.now(.{ .tz = &timezone }) catch zdt.Datetime{}; - var fmt_buffer = std.mem.zeroes([4096]u8); var fmt_writer = std.Io.Writer.fixed(&fmt_buffer); fmt_writer.print(format ++ "\n", args) catch {};