zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

webgpu: build Mach dawn-native C shims into a library

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2021-11-15 21:32:55 -07:00 • committed by Stephen Gutekanst
parent 418d72a766
commit 9387981c22
1 changed files with 53 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

94
webgpu/build_dawn.zig
View file

@ -23,6 +23,9 @@ pub const Options = struct {
}; };
pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void { pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void {
const lib_mach_dawn_native = buildLibMachDawnNative(b, step);
step.linkLibrary(lib_mach_dawn_native);
const lib = buildLibDawn(b, step, options); const lib = buildLibDawn(b, step, options);
step.linkLibrary(lib); step.linkLibrary(lib);
} }
@ -35,15 +38,6 @@ fn buildLibDawn(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *
lib.linkLibCpp(); lib.linkLibCpp();
const target = (std.zig.system.NativeTargetInfo.detect(b.allocator, step.target) catch unreachable).target; const target = (std.zig.system.NativeTargetInfo.detect(b.allocator, step.target) catch unreachable).target;
lib.addCSourceFile("src/dawn/dawn_native_c.cpp", &.{
include("out/Debug/gen/src/include"),
include("out/Debug/gen/src"),
include("src/include"),
include("src"),
include("examples"),
});
addCommonSources(b, lib, options, target); addCommonSources(b, lib, options, target);
addDawnPlatformSources(b, lib, options); addDawnPlatformSources(b, lib, options);
addDawnNativeSources(b, lib, options, target); addDawnNativeSources(b, lib, options, target);
@ -53,6 +47,24 @@ fn buildLibDawn(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *
return lib; return lib;
} }
fn buildLibMachDawnNative(b: *Builder, step: *std.build.LibExeObjStep) *std.build.LibExeObjStep {
var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable;
const lib = b.addStaticLibrary("dawn-native-mach", main_abs);
lib.setBuildMode(step.build_mode);
lib.setTarget(step.target);
lib.linkLibCpp();
glfw.link(b, lib, .{ .system_sdk = .{ .set_sysroot = false } });
lib.addCSourceFile("src/dawn/dawn_native_c.cpp", &.{
include("libs/mach-glfw/upstream/glfw/include"),
include("libs/dawn/out/Debug/gen/src/include"),
include("libs/dawn/out/Debug/gen/src"),
include("libs/dawn/src/include"),
include("libs/dawn/src"),
});
return lib;
}
// Adds common sources; derived from src/common/BUILD.gn // Adds common sources; derived from src/common/BUILD.gn
fn addCommonSources(b: *Builder, step: *std.build.LibExeObjStep, options: Options, target: std.Target) void { fn addCommonSources(b: *Builder, step: *std.build.LibExeObjStep, options: Options, target: std.Target) void {
_ = options; _ = options;
@ -68,12 +80,12 @@ fn addCommonSources(b: *Builder, step: *std.build.LibExeObjStep, options: Option
"src/common/SystemUtils.cpp", "src/common/SystemUtils.cpp",
}) |path| { }) |path| {
var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), "libs/dawn", path }) catch unreachable; var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), "libs/dawn", path }) catch unreachable;
step.addCSourceFile(abs_path, &.{include("src")}); step.addCSourceFile(abs_path, &.{include("libs/dawn/src")});
} }
if (target.os.tag == .macos) { if (target.os.tag == .macos) {
var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), "libs/dawn/src/common/SystemUtils_mac.mm" }) catch unreachable; var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), "libs/dawn/src/common/SystemUtils_mac.mm" }) catch unreachable;
step.addCSourceFile(abs_path, &.{include("src")}); step.addCSourceFile(abs_path, &.{include("libs/dawn/src")});
} }
} }
@ -87,11 +99,11 @@ fn addDawnPlatformSources(b: *Builder, step: *std.build.LibExeObjStep, options:
}) |path| { }) |path| {
var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), "libs/dawn", path }) catch unreachable; var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), "libs/dawn", path }) catch unreachable;
step.addCSourceFile(abs_path, &.{ step.addCSourceFile(abs_path, &.{
include("src"), include("libs/dawn/src"),
include("src/include"), include("libs/dawn/src/include"),
// TODO: should we commit generated dawn/webgpu.h somewhere to avoid people needing depot_tools (ninja, gn, gclient, etc.) // TODO: should we commit generated dawn/webgpu.h somewhere to avoid people needing depot_tools (ninja, gn, gclient, etc.)
include("out/Debug/gen/src/include"), include("libs/dawn/out/Debug/gen/src/include"),
}); });
} }
} }
@ -102,10 +114,10 @@ fn addDawnNativeSources(b: *Builder, step: *std.build.LibExeObjStep, options: Op
const flags = &.{ const flags = &.{
"-DDAWN_ENABLE_BACKEND_METAL", "-DDAWN_ENABLE_BACKEND_METAL",
//"-DDAWN_ENABLE_BACKEND_NULL", //"-DDAWN_ENABLE_BACKEND_NULL",
include("src"), include("libs/dawn/src"),
include("src/include"), include("libs/dawn/src/include"),
include("third_party/vulkan-deps/spirv-tools/src/include"), include("libs/dawn/third_party/vulkan-deps/spirv-tools/src/include"),
include("third_party/abseil-cpp"), include("libs/dawn/third_party/abseil-cpp"),
"-DTINT_BUILD_SPV_READER=1", "-DTINT_BUILD_SPV_READER=1",
"-DTINT_BUILD_SPV_WRITER=1", "-DTINT_BUILD_SPV_WRITER=1",
@ -113,12 +125,12 @@ fn addDawnNativeSources(b: *Builder, step: *std.build.LibExeObjStep, options: Op
"-DTINT_BUILD_WGSL_WRITER=1", "-DTINT_BUILD_WGSL_WRITER=1",
"-DTINT_BUILD_MSL_WRITER=1", "-DTINT_BUILD_MSL_WRITER=1",
"-DTINT_BUILD_HLSL_WRITER=1", "-DTINT_BUILD_HLSL_WRITER=1",
include("third_party/tint"), include("libs/dawn/third_party/tint"),
include("third_party/tint/include"), include("libs/dawn/third_party/tint/include"),
// TODO: should we commit generated dawn/webgpu.h somewhere to avoid people needing depot_tools (ninja, gn, gclient, etc.) // TODO: should we commit generated dawn/webgpu.h somewhere to avoid people needing depot_tools (ninja, gn, gclient, etc.)
include("out/Debug/gen/src/include"), include("libs/dawn/out/Debug/gen/src/include"),
include("out/Debug/gen/src"), include("libs/dawn/out/Debug/gen/src"),
}; };
// #if defined(DAWN_ENABLE_BACKEND_D3D12) // #if defined(DAWN_ENABLE_BACKEND_D3D12)
@ -535,14 +547,14 @@ fn addThirdPartyTintSources(b: *Builder, step: *std.build.LibExeObjStep, options
"-DTINT_BUILD_HLSL_WRITER=1", "-DTINT_BUILD_HLSL_WRITER=1",
// Required for TINT_BUILD_SPV_READER=1 and TINT_BUILD_SPV_WRITER=1 // Required for TINT_BUILD_SPV_READER=1 and TINT_BUILD_SPV_WRITER=1
include("third_party/vulkan-deps"), include("libs/dawn/third_party/vulkan-deps"),
include("third_party/vulkan-deps/spirv-tools/src"), include("libs/dawn/third_party/vulkan-deps/spirv-tools/src"),
include("third_party/vulkan-deps/spirv-tools/src/include"), include("libs/dawn/third_party/vulkan-deps/spirv-tools/src/include"),
include("third_party/vulkan-deps/spirv-headers/src/include"), include("libs/dawn/third_party/vulkan-deps/spirv-headers/src/include"),
include("out/Debug/gen/third_party/vulkan-deps/spirv-tools/src"), include("libs/dawn/out/Debug/gen/third_party/vulkan-deps/spirv-tools/src"),
include("out/Debug/gen/third_party/vulkan-deps/spirv-tools/src/include"), include("libs/dawn/out/Debug/gen/third_party/vulkan-deps/spirv-tools/src/include"),
include("third_party/tint"), include("libs/dawn/third_party/tint"),
include("third_party/tint/include"), include("libs/dawn/third_party/tint/include"),
}; };
// libtint_core_all_src // libtint_core_all_src
@ -814,11 +826,11 @@ fn addThirdPartyVulkanDepsSPIRVTools(b: *Builder, step: *std.build.LibExeObjStep
_ = options; _ = options;
_ = target; _ = target;
const flags = &.{ const flags = &.{
include("third_party/vulkan-deps/spirv-tools/src"), include("libs/dawn/third_party/vulkan-deps/spirv-tools/src"),
include("third_party/vulkan-deps/spirv-tools/src/include"), include("libs/dawn/third_party/vulkan-deps/spirv-tools/src/include"),
include("third_party/vulkan-deps/spirv-headers/src/include"), include("libs/dawn/third_party/vulkan-deps/spirv-headers/src/include"),
include("out/Debug/gen/third_party/vulkan-deps/spirv-tools/src"), include("libs/dawn/out/Debug/gen/third_party/vulkan-deps/spirv-tools/src"),
include("out/Debug/gen/third_party/vulkan-deps/spirv-tools/src/include"), include("libs/dawn/out/Debug/gen/third_party/vulkan-deps/spirv-tools/src/include"),
}; };
// spvtools // spvtools
@ -1029,7 +1041,7 @@ fn addThirdPartyVulkanDepsSPIRVTools(b: *Builder, step: *std.build.LibExeObjStep
fn AddThirdPartyAbseilCppSources(b: *Builder, step: *std.build.LibExeObjStep, options: Options, target: std.Target) void { fn AddThirdPartyAbseilCppSources(b: *Builder, step: *std.build.LibExeObjStep, options: Options, target: std.Target) void {
_ = options; _ = options;
_ = target; _ = target;
const flags = &.{include("third_party/abseil-cpp")}; const flags = &.{include("libs/dawn/third_party/abseil-cpp")};
// absl // absl
for ([_][]const u8{ for ([_][]const u8{
@ -1210,10 +1222,10 @@ fn addDawnUtilsSources(b: *Builder, step: *std.build.LibExeObjStep, options: Opt
const flags = &.{ const flags = &.{
"-DDAWN_ENABLE_BACKEND_METAL", "-DDAWN_ENABLE_BACKEND_METAL",
//"-DDAWN_ENABLE_BACKEND_NULL", //"-DDAWN_ENABLE_BACKEND_NULL",
include("mach/glfw/upstream/glfw/include"), include("libs/mach-glfw/upstream/glfw/include"),
include("src"), include("libs/dawn/src"),
include("src/include"), include("libs/dawn/src/include"),
include("out/Debug/gen/src/include"), include("libs/dawn/out/Debug/gen/src/include"),
}; };
for ([_][]const u8{ for ([_][]const u8{
@ -1260,7 +1272,7 @@ fn addDawnUtilsSources(b: *Builder, step: *std.build.LibExeObjStep, options: Opt
} }
fn include(comptime rel: []const u8) []const u8 { fn include(comptime rel: []const u8) []const u8 {
return "-I" ++ thisDir() ++ "/libs/dawn/" ++ rel; return "-I" ++ thisDir() ++ "/" ++ rel;
} }
fn thisDir() []const u8 { fn thisDir() []const u8 {