From 912bab4b5794c70609e0d12056a25ec13644da74 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 25 Jun 2023 19:52:44 -0700 Subject: [PATCH] gpu-dawn: fix macOS builds Signed-off-by: Stephen Gutekanst --- libs/gpu-dawn/sdk.zig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/gpu-dawn/sdk.zig b/libs/gpu-dawn/sdk.zig index e195e922..81d797f9 100644 --- a/libs/gpu-dawn/sdk.zig +++ b/libs/gpu-dawn/sdk.zig @@ -734,6 +734,11 @@ pub fn Sdk(comptime deps: anytype) type { }; deps.system_sdk.include(b, lib, .{}); + // MacOS: this must be defined for system-sdk-13.3 and older. + // Critically, this MUST NOT be included as a -D__kernel_ptr_semantics flag. If it is, + // then this macro will not be defined even if `defineCMacro` was also called! + lib.defineCMacro("__kernel_ptr_semantics", ""); + var flags = std.ArrayList([]const u8).init(b.allocator); try appendDawnEnableBackendTypeFlags(&flags, options); try flags.appendSlice(&.{ @@ -755,9 +760,6 @@ pub fn Sdk(comptime deps: anytype) type { "-DTINT_BUILD_HLSL_WRITER=1", "-DTINT_BUILD_GLSL_WRITER=1", - // MacOS: this must be defined for system-sdk-13.3 and older. - "-D__kernel_ptr_semantics", - include("libs/dawn/"), include("libs/dawn/include/tint"), include("libs/dawn/third_party/vulkan-deps/vulkan-tools/src/"),