Skip to content

Commit 7eb4e79

Browse files
Stephen GutekanstStephen Gutekanst
authored andcommitted
update to Zig 2024.05
Signed-off-by: Stephen Gutekanst <[email protected]>
1 parent 1fb972d commit 7eb4e79

File tree

3 files changed

+27
-14
lines changed

3 files changed

+27
-14
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# Cheers!
1010
# -andrewrk
1111

12-
zig-cache/
12+
.zig-cache/
1313
zig-out/
1414
/release/
1515
/debug/
@@ -20,3 +20,4 @@ zig-out/
2020
**/*.png
2121
!assets/*.png
2222
vulkan-zig/
23+
Vulkan-Docs/

build.zig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
const std = @import("std");
22

33
pub fn build(b: *std.Build) void {
4-
_ = b.addModule("vulkan-zig-generated", .{ .root_source_file = .{ .path = "vk.zig" } });
4+
_ = b.addModule("vulkan-zig-generated", .{
5+
.root_source_file = b.path("vk.zig"),
6+
});
57
}

update.sh

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,35 @@
22
set -euo pipefail
33

44
rm -rf vulkan-zig/
5+
rm -rf Vulkan-Docs/
6+
7+
# `git clone --depth 1` but at a specific revision
8+
mkdir Vulkan-Docs/
9+
pushd Vulkan-Docs
10+
git init
11+
git remote add origin https://github.com/KhronosGroup/Vulkan-Docs
12+
git fetch --depth 1 origin ed4ba0242beb89a1795d6084709fa9e713559c94
13+
git checkout FETCH_HEAD
14+
popd
15+
16+
# Update vk.xml
17+
mv Vulkan-Docs/xml/vk.xml .
518

619
# `git clone --depth 1` but at a specific revision
720
mkdir vulkan-zig/
821
pushd vulkan-zig
922
git init
10-
git remote add origin https://github.com/Snektron/vulkan-zig
11-
git fetch --depth 1 origin ac4103a733c479b599aae8d42c08cabd7d5cf48a
23+
git remote add origin https://github.com/slimsag/vulkan-zig
24+
git fetch --depth 1 origin cfaf58a4de0d876d37d6dd9a05a5060e4f9b7cd9
1225
git checkout FETCH_HEAD
1326
popd
1427

15-
# Generate vulkan bindings
16-
zig run vulkan-zig/generator/main.zig -- vk.xml vk.zig
17-
18-
echo "
19-
// -------------------------------------------
28+
# Generate Vulkan Zig bindings
29+
pushd vulkan-zig/
30+
zig build
31+
popd
2032

21-
pub const ANativeWindow = opaque{};
22-
pub const CAMetalLayer = opaque{};
23-
pub const AHardwareBuffer = opaque{};
24-
" >> vk.zig
33+
./vulkan-zig/zig-out/bin/vulkan-zig-generator vk.xml vk.zig
2534

26-
zig fmt vk.zig
35+
rm -rf vulkan-zig/
36+
rm -rf Vulkan-Docs/

0 commit comments

Comments
 (0)