Skip to content

Commit 87d8d48

Browse files
committed
fixing buid
1 parent 95c3df9 commit 87d8d48

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

build.zig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ fn addCTS(b: *std.Build, target: std.Build.ResolvedTarget, impl: *const Implemen
203203
run.addArg(b.fmt("--deqp-archive-dir={s}", .{try cts.path("").getPath3(b, null).toString(b.allocator)}));
204204
run.addArg(b.fmt("--deqp-vk-library-path={s}", .{b.getInstallPath(.lib, impl_lib.out_lib_filename)}));
205205
run.addArg("--deqp-log-filename=vk-cts-logs.qpa");
206-
run.addArg("--deqp-no-program-fail=enable"); // Option added by my fork, doubt it will be merge oneday
207206

208207
var requires_explicit_tests = false;
209208
if (b.args) |args| {
@@ -246,7 +245,12 @@ fn addMultithreadedCTS(b: *std.Build, target: std.Build.ResolvedTarget, impl: *c
246245
},
247246
}));
248247

249-
const mustpass_path = try cts.path("mustpass/master/vk-default.txt").getPath3(b, null).toString(b.allocator);
248+
const mustpass_path = try cts.path(
249+
b.fmt("mustpass/{}.{}.2/vk-default.txt", .{
250+
impl.vulkan_version.major,
251+
impl.vulkan_version.minor,
252+
}),
253+
).getPath3(b, null).toString(b.allocator);
250254
const cts_exe_path = try cts_exe_name.getPath3(b, null).toString(b.allocator);
251255

252256
const run = b.addSystemCommand(&[_][]const u8{"deqp-runner"});

build.zig.zon

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
.hash = "zdt-0.8.1-xr0_vAxUDwCJRDh9pcAS_mdZBIsvcGTtN-K8JJSWY4I6",
2727
},
2828
.cts_bin = .{
29-
.url = "git+https://github.com/Kbz-8/Vulkan-CTS-bin#606ee47675ac1ba7a260983f020d6460efe05d2c",
30-
.hash = "N-V-__8AAHqjQhpVdUurt2jQc9gRHwT3_pugIvimGEu8iyrQ",
29+
.url = "git+https://github.com/Kbz-8/Vulkan-CTS-bin#19ce2da05f8176348064a9fc6688847e5f76a46e",
30+
.hash = "N-V-__8AAHDV0xtS93nAGaYd7YWxBLnvHDEplwIpC29izSGa",
3131
},
3232
.cpuinfo = .{
3333
.url = "git+https://github.com/Kbz-8/cpuinfo#4883954cfcec3f6c9ca9c4aaddfc26107e08726f",

src/vulkan/lib_vulkan.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const icd_pfn_map = std.StaticStringMap(vk.PfnVoidFunction).initComptime(.{
8383
const global_pfn_map = std.StaticStringMap(vk.PfnVoidFunction).initComptime(.{
8484
functionMapEntryPoint("vkCreateInstance"),
8585
functionMapEntryPoint("vkEnumerateInstanceExtensionProperties"),
86-
functionMapEntryPoint("vkEnumerateInstanceVersion"),
86+
//functionMapEntryPoint("vkEnumerateInstanceVersion"),
8787
functionMapEntryPoint("vkGetInstanceProcAddr"),
8888
});
8989

0 commit comments

Comments
 (0)