From 87d8d480cb7dce2b05eaeb5c569b991742f32bca Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Mon, 15 Dec 2025 17:43:56 +0100 Subject: [PATCH] fixing buid --- build.zig | 8 ++++++-- build.zig.zon | 4 ++-- src/vulkan/lib_vulkan.zig | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.zig b/build.zig index d37a38d..640cb30 100644 --- a/build.zig +++ b/build.zig @@ -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-vk-library-path={s}", .{b.getInstallPath(.lib, impl_lib.out_lib_filename)})); 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; 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 run = b.addSystemCommand(&[_][]const u8{"deqp-runner"}); diff --git a/build.zig.zon b/build.zig.zon index d0eb740..448b789 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -26,8 +26,8 @@ .hash = "zdt-0.8.1-xr0_vAxUDwCJRDh9pcAS_mdZBIsvcGTtN-K8JJSWY4I6", }, .cts_bin = .{ - .url = "git+https://github.com/Kbz-8/Vulkan-CTS-bin#606ee47675ac1ba7a260983f020d6460efe05d2c", - .hash = "N-V-__8AAHqjQhpVdUurt2jQc9gRHwT3_pugIvimGEu8iyrQ", + .url = "git+https://github.com/Kbz-8/Vulkan-CTS-bin#19ce2da05f8176348064a9fc6688847e5f76a46e", + .hash = "N-V-__8AAHDV0xtS93nAGaYd7YWxBLnvHDEplwIpC29izSGa", }, .cpuinfo = .{ .url = "git+https://github.com/Kbz-8/cpuinfo#4883954cfcec3f6c9ca9c4aaddfc26107e08726f", diff --git a/src/vulkan/lib_vulkan.zig b/src/vulkan/lib_vulkan.zig index ce3ac8f..8a92964 100644 --- a/src/vulkan/lib_vulkan.zig +++ b/src/vulkan/lib_vulkan.zig @@ -83,7 +83,7 @@ const icd_pfn_map = std.StaticStringMap(vk.PfnVoidFunction).initComptime(.{ const global_pfn_map = std.StaticStringMap(vk.PfnVoidFunction).initComptime(.{ functionMapEntryPoint("vkCreateInstance"), functionMapEntryPoint("vkEnumerateInstanceExtensionProperties"), - functionMapEntryPoint("vkEnumerateInstanceVersion"), + //functionMapEntryPoint("vkEnumerateInstanceVersion"), functionMapEntryPoint("vkGetInstanceProcAddr"), });