kbz_8/VulkanDriver
1
0
Fork 0
Code Issues Pull Requests actions.actions Packages Projects Releases Wiki Activity

fixing CI

Browse Source
This commit is contained in:
kbz_8
2025-11-07 12:31:58 +01:00
parent 8f22404802
commit e508d89de8
5 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/soft/lib.zig
View File

@@ -15,6 +15,6 @@ pub const DEVICE_ID = 0x600DCAFE;
pub const std_options = base.std_options; pub const std_options = base.std_options;
comptime { test {
_ = base; std.testing.refAllDeclsRecursive(@This());
} }

13
src/vulkan/Instance.zig
View File

@@ -1,4 +1,5 @@
const std = @import("std"); const std = @import("std");
const builtin = @import("builtin");
const vk = @import("vulkan"); const vk = @import("vulkan");
const VkError = @import("error_set.zig").VkError; const VkError = @import("error_set.zig").VkError;
const Dispatchable = @import("Dispatchable.zig").Dispatchable; const Dispatchable = @import("Dispatchable.zig").Dispatchable;
@@ -7,8 +8,10 @@ const PhysicalDevice = @import("PhysicalDevice.zig");
const root = @import("root"); const root = @import("root");
comptime { comptime {
if (!@hasDecl(root, "VULKAN_VERSION")) { if (!builtin.is_test) {
@compileError("Missing VULKAN_VERSION in module root"); if (!@hasDecl(root, "VULKAN_VERSION")) {
@compileError("Missing VULKAN_VERSION in module root");
}
} }
} }
@@ -50,7 +53,11 @@ pub fn enumerateExtensionProperties(layer_name: ?[]const u8, property_count: *u3
} }
pub fn enumerateVersion(version: *u32) VkError!void { pub fn enumerateVersion(version: *u32) VkError!void {
version.* = @bitCast(root.VULKAN_VERSION); if (!builtin.is_test) {
version.* = @bitCast(root.VULKAN_VERSION);
} else {
version.* = @bitCast(vk.makeApiVersion(0, 1, 0, 0));
}
} }
pub fn releasePhysicalDevices(self: *Self, allocator: std.mem.Allocator) VkError!void { pub fn releasePhysicalDevices(self: *Self, allocator: std.mem.Allocator) VkError!void {

4
src/vulkan/lib.zig
View File

@@ -40,7 +40,3 @@ pub inline fn getLogVerboseLevel() LogVerboseLevel {
comptime { comptime {
_ = lib_vulkan; _ = lib_vulkan;
} }
test {
std.testing.refAllDeclsRecursive(@This());
}

8
src/vulkan/lib_vulkan.zig
View File

@@ -2,6 +2,7 @@ const std = @import("std");
const vk = @import("vulkan"); const vk = @import("vulkan");
const root = @import("root"); const root = @import("root");
const lib = @import("lib.zig"); const lib = @import("lib.zig");
const builtin = @import("builtin");
const logger = @import("logger.zig"); const logger = @import("logger.zig");
const error_set = @import("error_set.zig"); const error_set = @import("error_set.zig");
@@ -124,8 +125,11 @@ pub export fn strollCreateInstance(p_infos: ?*const vk.InstanceCreateInfo, callb
const allocator = VulkanAllocator.init(callbacks, .instance).allocator(); const allocator = VulkanAllocator.init(callbacks, .instance).allocator();
// Will call impl instead of interface as root refs the impl module var instance: *lib.Instance = undefined;
const instance = root.Instance.create(allocator, infos) catch |err| return toVkResult(err); if (!builtin.is_test) {
// Will call impl instead of interface as root refs the impl module
instance = root.Instance.create(allocator, infos) catch |err| return toVkResult(err);
}
instance.requestPhysicalDevices(allocator) catch |err| return toVkResult(err); instance.requestPhysicalDevices(allocator) catch |err| return toVkResult(err);
p_instance.* = (Dispatchable(Instance).wrap(allocator, instance) catch |err| return toVkResult(err)).toVkHandle(vk.Instance); p_instance.* = (Dispatchable(Instance).wrap(allocator, instance) catch |err| return toVkResult(err)).toVkHandle(vk.Instance);

15
src/vulkan/logger.zig
View File

@@ -5,11 +5,10 @@ const root = @import("root");
const lib = @import("lib.zig"); const lib = @import("lib.zig");
comptime { comptime {
if (!@hasDecl(root, "DRIVER_NAME")) { if (!builtin.is_test) {
@compileError("Missing DRIVER_NAME in module root"); if (!@hasDecl(root, "DRIVER_NAME")) {
} @compileError("Missing DRIVER_NAME in module root");
if (!@hasDecl(root, "DRIVER_LOGS_ENV_NAME")) { }
@compileError("Missing DRIVER_LOGS_ENV_NAME in module root");
} }
} }
@@ -67,8 +66,10 @@ pub fn log(comptime level: std.log.Level, comptime scope: @Type(.enum_literal),
out_config.setColor(writer, .magenta) catch {}; out_config.setColor(writer, .magenta) catch {};
writer.print("[StrollDriver ", .{}) catch return; writer.print("[StrollDriver ", .{}) catch return;
out_config.setColor(writer, .cyan) catch {}; if (!builtin.is_test) {
writer.print(root.DRIVER_NAME, .{}) catch return; out_config.setColor(writer, .cyan) catch {};
writer.print(root.DRIVER_NAME, .{}) catch return;
}
out_config.setColor(writer, .yellow) catch {}; out_config.setColor(writer, .yellow) catch {};
writer.print(" {d:02}:{d:02}:{d:02}.{d:03}", .{ now.hour, now.minute, now.second, @divFloor(now.nanosecond, std.time.ns_per_ms) }) catch return; writer.print(" {d:02}:{d:02}:{d:02}.{d:03}", .{ now.hour, now.minute, now.second, @divFloor(now.nanosecond, std.time.ns_per_ms) }) catch return;
out_config.setColor(writer, .magenta) catch {}; out_config.setColor(writer, .magenta) catch {};