From 5af828a8de82d66006dc785be915f08887ad834a Mon Sep 17 00:00:00 2001 From: IntegratedQuantum Date: Mon, 14 Sep 2026 19:04:02 +0200 Subject: [PATCH 1/4] Update cubyz-deps to a version created by the CI workflow --- build.zig.zon | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/build.zig.zon b/build.zig.zon index 90e68ec5a7..5b0bea2089 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -9,37 +9,37 @@ .lazy = true, }, .cubyz_deps_headers = .{ - .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/17/cubyz_deps_headers.tar.gz", + .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.0/cubyz_deps_headers.tar.gz", .hash = "N-V-__8AAMq6gAB96bzJsMrlYdZKbZ1Qc_Ine5E08vH9Zx0w", }, .cubyz_deps_aarch64_macos = .{ - .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/17/cubyz_deps_aarch64-macos-none.tar.gz", - .hash = "N-V-__8AALKj1AXwkr2SLawu5qZ4RPAsJubW-AAXs7UG-G8A", + .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.0/cubyz_deps_aarch64-macos-none.tar.gz", + .hash = "N-V-__8AAGpk1gVxaE_SKvS1-ucx5iimwca_Y7_MKOvGcgg2", .lazy = true, }, .cubyz_deps_aarch64_linux = .{ - .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/17/cubyz_deps_aarch64-linux-musl.tar.gz", - .hash = "N-V-__8AAGraCQMrbnuuZOfcwon3nuXQctCmUrO29zh-7vmd", + .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.0/cubyz_deps_aarch64-linux-musl.tar.gz", + .hash = "N-V-__8AANLiCgO3WoQ65m8-WjAvW3XDWRg9Wj53chhwx533", .lazy = true, }, .cubyz_deps_aarch64_windows = .{ - .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/17/cubyz_deps_aarch64-windows-gnu.tar.gz", - .hash = "N-V-__8AAJ55LAO5fpHky9VeU1aZfg20uFxUCBp1GpMS7Ck_", + .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.0/cubyz_deps_aarch64-windows-gnu.tar.gz", + .hash = "N-V-__8AAEaMLQP7wqKIwLVklwGxFXyot2RnleU4zPq5scC3", .lazy = true, }, .cubyz_deps_x86_64_macos = .{ - .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/17/cubyz_deps_x86_64-macos-none.tar.gz", - .hash = "N-V-__8AANj7xgXmZ00RDncJTWhYEBz81jr4aGbZGaOf0TNW", + .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.0/cubyz_deps_x86_64-macos-none.tar.gz", + .hash = "N-V-__8AANi1yAU0BJFHKhVTK8cbO6Xa_n57aB0tmWEmvn2K", .lazy = true, }, .cubyz_deps_x86_64_linux = .{ - .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/17/cubyz_deps_x86_64-linux-musl.tar.gz", - .hash = "N-V-__8AACbJDAN2FUnjncVZbrRCVIqJU0jOmXeOYp91Dye3", + .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.0/cubyz_deps_x86_64-linux-musl.tar.gz", + .hash = "N-V-__8AAG7PDQN6GNawX9vIFjX24wXk2RGdkpbOfSi_m-sa", .lazy = true, }, .cubyz_deps_x86_64_windows = .{ - .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/17/cubyz_deps_x86_64-windows-gnu.tar.gz", - .hash = "N-V-__8AAJL3TQPVI95OraBXiDeB61x59EZPWkCvISKUsIxd", + .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.0/cubyz_deps_x86_64-windows-gnu.tar.gz", + .hash = "N-V-__8AAAQITwPk9L3VlDbDw9-hkuLEuztzRjU26lAa8HLG", .lazy = true, }, .cubyz_large_assets = .{ From 3f2aa73d16af34ab9f0136816a482976a36765e6 Mon Sep 17 00:00:00 2001 From: IntegratedQuantum Date: Mon, 14 Sep 2026 19:04:39 +0200 Subject: [PATCH 2/4] Add macos to the CI workflow --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37a531181b..354456b47d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: test: strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-latest, macos-latest] runs-on: ${{ matrix.os }} name: Build & Test (${{ matrix.os }}) defaults: From 469f65326dedbbd1e7d8a0a04eb4daa30adc8178 Mon Sep 17 00:00:00 2001 From: IntegratedQuantum Date: Mon, 14 Sep 2026 19:14:10 +0200 Subject: [PATCH 3/4] Switch for macos --- src/graphics/vulkan.zig | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/graphics/vulkan.zig b/src/graphics/vulkan.zig index c39d7de260..dccf027851 100644 --- a/src/graphics/vulkan.zig +++ b/src/graphics/vulkan.zig @@ -1094,11 +1094,20 @@ pub const gpu_allocator = struct { var handle: c.VmaAllocator = undefined; fn init() void { - const vkFunctions: c.VmaVulkanFunctions = .{ - .glad_vkGetInstanceProcAddr = c.glad_vkGetInstanceProcAddr, - .glad_vkGetDeviceProcAddr = c.glad_vkGetDeviceProcAddr, - .glad_vkCreateImage = c.glad_vkCreateImage, - }; + var vkFunctions: c.VmaVulkanFunctions = undefined; + if (builtin.os.tag == .macos) { + vkFunctions = .{ + .vkGetInstanceProcAddr = c.vkGetInstanceProcAddr, + .vkGetDeviceProcAddr = c.vkGetDeviceProcAddr, + .vkCreateImage = c.vkCreateImage, + }; + } else { + vkFunctions = .{ + .glad_vkGetInstanceProcAddr = c.glad_vkGetInstanceProcAddr, + .glad_vkGetDeviceProcAddr = c.glad_vkGetDeviceProcAddr, + .glad_vkCreateImage = c.glad_vkCreateImage, + }; + } const allocatorCreateInfo: c.VmaAllocatorCreateInfo = .{ .flags = 0, .physicalDevice = physicalDevice, From 0092490bec7c8eaaf1b44887428f38eb3b9738be Mon Sep 17 00:00:00 2001 From: IntegratedQuantum Date: Mon, 14 Sep 2026 21:49:28 +0200 Subject: [PATCH 4/4] Update version --- build.zig.zon | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/build.zig.zon b/build.zig.zon index 5b0bea2089..a58d3def40 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -9,37 +9,37 @@ .lazy = true, }, .cubyz_deps_headers = .{ - .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.0/cubyz_deps_headers.tar.gz", + .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.1/cubyz_deps_headers.tar.gz", .hash = "N-V-__8AAMq6gAB96bzJsMrlYdZKbZ1Qc_Ine5E08vH9Zx0w", }, .cubyz_deps_aarch64_macos = .{ - .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.0/cubyz_deps_aarch64-macos-none.tar.gz", - .hash = "N-V-__8AAGpk1gVxaE_SKvS1-ucx5iimwca_Y7_MKOvGcgg2", + .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.1/cubyz_deps_aarch64-macos-none.tar.gz", + .hash = "N-V-__8AAPoO2AUTSsWY39DpUUOMuOTz29W6XSNzELl7Vjmz", .lazy = true, }, .cubyz_deps_aarch64_linux = .{ - .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.0/cubyz_deps_aarch64-linux-musl.tar.gz", - .hash = "N-V-__8AANLiCgO3WoQ65m8-WjAvW3XDWRg9Wj53chhwx533", + .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.1/cubyz_deps_aarch64-linux-musl.tar.gz", + .hash = "N-V-__8AANLiCgMFgb2Tow64HtlREZYK-8eSKYaKRIF6LATV", .lazy = true, }, .cubyz_deps_aarch64_windows = .{ - .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.0/cubyz_deps_aarch64-windows-gnu.tar.gz", - .hash = "N-V-__8AAEaMLQP7wqKIwLVklwGxFXyot2RnleU4zPq5scC3", + .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.1/cubyz_deps_aarch64-windows-gnu.tar.gz", + .hash = "N-V-__8AAEaMLQM6bYRRRCh3ttkE5SHXKOZSg9m1EBFqxV_a", .lazy = true, }, .cubyz_deps_x86_64_macos = .{ - .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.0/cubyz_deps_x86_64-macos-none.tar.gz", - .hash = "N-V-__8AANi1yAU0BJFHKhVTK8cbO6Xa_n57aB0tmWEmvn2K", + .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.1/cubyz_deps_x86_64-macos-none.tar.gz", + .hash = "N-V-__8AABRhygXRMv8Q-329-xa-1LHL4XUJ2l-7Mk8BF9_C", .lazy = true, }, .cubyz_deps_x86_64_linux = .{ - .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.0/cubyz_deps_x86_64-linux-musl.tar.gz", - .hash = "N-V-__8AAG7PDQN6GNawX9vIFjX24wXk2RGdkpbOfSi_m-sa", + .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.1/cubyz_deps_x86_64-linux-musl.tar.gz", + .hash = "N-V-__8AAG7PDQMRK4tF5cU4zhc_l0nHZKw4bY9BlTUb2XdY", .lazy = true, }, .cubyz_deps_x86_64_windows = .{ - .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.0/cubyz_deps_x86_64-windows-gnu.tar.gz", - .hash = "N-V-__8AAAQITwPk9L3VlDbDw9-hkuLEuztzRjU26lAa8HLG", + .url = "https://github.com/PixelGuys/Cubyz-Libs/releases/download/0.4.1/cubyz_deps_x86_64-windows-gnu.tar.gz", + .hash = "N-V-__8AAAQITwOl3vv4Jajt51fR6dX12hUeizHb_bK9yOWE", .lazy = true, }, .cubyz_large_assets = .{