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

fixing buid

Browse Source
This commit is contained in:
kbz_8
2025-12-15 17:43:56 +01:00
parent 95c3df90c6
commit 87d8d480cb
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.zig
View File

@@ -203,7 +203,6 @@ fn addCTS(b: *std.Build, target: std.Build.ResolvedTarget, impl: *const Implemen
run.addArg(b.fmt("--deqp-archive-dir={s}", .{try cts.path("").getPath3(b, null).toString(b.allocator)})); run.addArg(b.fmt("--deqp-archive-dir={s}", .{try cts.path("").getPath3(b, null).toString(b.allocator)}));
run.addArg(b.fmt("--deqp-vk-library-path={s}", .{b.getInstallPath(.lib, impl_lib.out_lib_filename)})); run.addArg(b.fmt("--deqp-vk-library-path={s}", .{b.getInstallPath(.lib, impl_lib.out_lib_filename)}));
run.addArg("--deqp-log-filename=vk-cts-logs.qpa"); run.addArg("--deqp-log-filename=vk-cts-logs.qpa");
run.addArg("--deqp-no-program-fail=enable"); // Option added by my fork, doubt it will be merge oneday
var requires_explicit_tests = false; var requires_explicit_tests = false;
if (b.args) |args| { if (b.args) |args| {
@@ -246,7 +245,12 @@ fn addMultithreadedCTS(b: *std.Build, target: std.Build.ResolvedTarget, impl: *c
}, },
})); }));
const mustpass_path = try cts.path("mustpass/master/vk-default.txt").getPath3(b, null).toString(b.allocator); const mustpass_path = try cts.path(
b.fmt("mustpass/{}.{}.2/vk-default.txt", .{
impl.vulkan_version.major,
impl.vulkan_version.minor,
}),
).getPath3(b, null).toString(b.allocator);
const cts_exe_path = try cts_exe_name.getPath3(b, null).toString(b.allocator); const cts_exe_path = try cts_exe_name.getPath3(b, null).toString(b.allocator);
const run = b.addSystemCommand(&[_][]const u8{"deqp-runner"}); const run = b.addSystemCommand(&[_][]const u8{"deqp-runner"});

4
build.zig.zon
View File

@@ -26,8 +26,8 @@
.hash = "zdt-0.8.1-xr0_vAxUDwCJRDh9pcAS_mdZBIsvcGTtN-K8JJSWY4I6", .hash = "zdt-0.8.1-xr0_vAxUDwCJRDh9pcAS_mdZBIsvcGTtN-K8JJSWY4I6",
}, },
.cts_bin = .{ .cts_bin = .{
.url = "git+https://github.com/Kbz-8/Vulkan-CTS-bin#606ee47675ac1ba7a260983f020d6460efe05d2c", .url = "git+https://github.com/Kbz-8/Vulkan-CTS-bin#19ce2da05f8176348064a9fc6688847e5f76a46e",
.hash = "N-V-__8AAHqjQhpVdUurt2jQc9gRHwT3_pugIvimGEu8iyrQ", .hash = "N-V-__8AAHDV0xtS93nAGaYd7YWxBLnvHDEplwIpC29izSGa",
}, },
.cpuinfo = .{ .cpuinfo = .{
.url = "git+https://github.com/Kbz-8/cpuinfo#4883954cfcec3f6c9ca9c4aaddfc26107e08726f", .url = "git+https://github.com/Kbz-8/cpuinfo#4883954cfcec3f6c9ca9c4aaddfc26107e08726f",

2
src/vulkan/lib_vulkan.zig
View File

@@ -83,7 +83,7 @@ const icd_pfn_map = std.StaticStringMap(vk.PfnVoidFunction).initComptime(.{
const global_pfn_map = std.StaticStringMap(vk.PfnVoidFunction).initComptime(.{ const global_pfn_map = std.StaticStringMap(vk.PfnVoidFunction).initComptime(.{
functionMapEntryPoint("vkCreateInstance"), functionMapEntryPoint("vkCreateInstance"),
functionMapEntryPoint("vkEnumerateInstanceExtensionProperties"), functionMapEntryPoint("vkEnumerateInstanceExtensionProperties"),
functionMapEntryPoint("vkEnumerateInstanceVersion"), //functionMapEntryPoint("vkEnumerateInstanceVersion"),
functionMapEntryPoint("vkGetInstanceProcAddr"), functionMapEntryPoint("vkGetInstanceProcAddr"),
}); });