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

webgpu: build dawn-native into a library

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2021-11-16 07:06:42 -07:00 • committed by Stephen Gutekanst
parent eb1936a98d
commit 698d4f6bc4
1 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

62
webgpu/build_dawn.zig
View file

@ -37,6 +37,9 @@ pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void
const lib_abseil_cpp = buildLibAbseilCpp(b, step); const lib_abseil_cpp = buildLibAbseilCpp(b, step);
step.linkLibrary(lib_abseil_cpp); step.linkLibrary(lib_abseil_cpp);
const lib_dawn_native = buildLibDawnNative(b, step, options);
step.linkLibrary(lib_dawn_native);
const lib = buildLibDawn(b, step, options); const lib = buildLibDawn(b, step, options);
step.linkLibrary(lib); step.linkLibrary(lib);
} }
@ -49,7 +52,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;
addDawnNativeSources(b, lib, options, target);
addDawnWireSources(b, lib, options, target); addDawnWireSources(b, lib, options, target);
addDawnUtilsSources(b, lib, options, target); addDawnUtilsSources(b, lib, options, target);
addThirdPartyTintSources(b, lib, options, target); addThirdPartyTintSources(b, lib, options, target);
@ -125,15 +127,22 @@ fn buildLibDawnPlatform(b: *Builder, step: *std.build.LibExeObjStep) *std.build.
include("libs/dawn/src"), include("libs/dawn/src"),
include("libs/dawn/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.)
include("libs/dawn/out/Debug/gen/src/include"), include("libs/dawn/out/Debug/gen/src/include"),
}); });
} }
return lib; return lib;
} }
// Adds dawn native sources; derived from src/dawn_native/BUILD.gn // Builds dawn native sources; derived from src/dawn_native/BUILD.gn
fn addDawnNativeSources(b: *Builder, step: *std.build.LibExeObjStep, options: Options, target: std.Target) void { fn buildLibDawnNative(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *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", main_abs);
lib.setBuildMode(step.build_mode);
lib.setTarget(step.target);
lib.linkLibCpp();
const target = (std.zig.system.NativeTargetInfo.detect(b.allocator, step.target) catch unreachable).target;
const flags = &.{ const flags = &.{
"-DDAWN_ENABLE_BACKEND_METAL", "-DDAWN_ENABLE_BACKEND_METAL",
//"-DDAWN_ENABLE_BACKEND_NULL", //"-DDAWN_ENABLE_BACKEND_NULL",
@ -151,7 +160,6 @@ fn addDawnNativeSources(b: *Builder, step: *std.build.LibExeObjStep, options: Op
include("libs/dawn/third_party/tint"), include("libs/dawn/third_party/tint"),
include("libs/dawn/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.)
include("libs/dawn/out/Debug/gen/src/include"), include("libs/dawn/out/Debug/gen/src/include"),
include("libs/dawn/out/Debug/gen/src"), include("libs/dawn/out/Debug/gen/src"),
}; };
@ -169,7 +177,7 @@ fn addDawnNativeSources(b: *Builder, step: *std.build.LibExeObjStep, options: Op
"out/Debug/gen/src/dawn/webgpu_cpp.cpp", "out/Debug/gen/src/dawn/webgpu_cpp.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, flags); lib.addCSourceFile(abs_path, flags);
} }
for ([_][]const u8{ for ([_][]const u8{
@ -244,7 +252,7 @@ fn addDawnNativeSources(b: *Builder, step: *std.build.LibExeObjStep, options: Op
"src/dawn_native/VertexFormat.cpp", "src/dawn_native/VertexFormat.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, flags); lib.addCSourceFile(abs_path, flags);
} }
// dawn_native_utils_gen // dawn_native_utils_gen
@ -257,7 +265,7 @@ fn addDawnNativeSources(b: *Builder, step: *std.build.LibExeObjStep, options: Op
"out/Debug/gen/src/dawn_native/ObjectType_autogen.cpp", "out/Debug/gen/src/dawn_native/ObjectType_autogen.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, flags); lib.addCSourceFile(abs_path, flags);
} }
// TODO: could allow enable_vulkan_validation_layers here. See src/dawn_native/BUILD.gn // TODO: could allow enable_vulkan_validation_layers here. See src/dawn_native/BUILD.gn
@ -270,7 +278,7 @@ fn addDawnNativeSources(b: *Builder, step: *std.build.LibExeObjStep, options: Op
switch (target.os.tag) { switch (target.os.tag) {
.windows => { .windows => {
if (options.windows_uwp_app) { if (options.windows_uwp_app) {
if (step.build_mode == .Debug) { if (lib.build_mode == .Debug) {
// DXGIGetDebugInterface1 is defined in dxgi.lib // DXGIGetDebugInterface1 is defined in dxgi.lib
// But this API is tagged as a development-only capability // But this API is tagged as a development-only capability
// which implies that linking to this function will cause // which implies that linking to this function will cause
@ -278,9 +286,9 @@ fn addDawnNativeSources(b: *Builder, step: *std.build.LibExeObjStep, options: Op
// So we only link to it in debug build when compiling for UWP. // So we only link to it in debug build when compiling for UWP.
// In win32 we load dxgi.dll using LoadLibrary // In win32 we load dxgi.dll using LoadLibrary
// so no need for static linking. // so no need for static linking.
step.linkSystemLibrary("dxgi.lib"); lib.linkSystemLibrary("dxgi.lib");
} }
step.linkSystemLibrary("user32.lib"); lib.linkSystemLibrary("user32.lib");
} }
// TODO: // TODO:
@ -330,13 +338,12 @@ fn addDawnNativeSources(b: *Builder, step: *std.build.LibExeObjStep, options: Op
}, },
.macos => { .macos => {
if (options.metal) { if (options.metal) {
step.linkFramework("Metal"); lib.linkFramework("Metal");
step.linkFramework("CoreGraphics"); lib.linkFramework("CoreGraphics");
step.linkFramework("Foundation"); lib.linkFramework("Foundation");
// step.linkFramework("Cocoa"); lib.linkFramework("IOKit");
step.linkFramework("IOKit"); lib.linkFramework("IOSurface");
step.linkFramework("IOSurface"); lib.linkFramework("QuartzCore");
step.linkFramework("QuartzCore");
for ([_][]const u8{ for ([_][]const u8{
"src/dawn_native/metal/MetalBackend.mm", "src/dawn_native/metal/MetalBackend.mm",
@ -361,18 +368,18 @@ fn addDawnNativeSources(b: *Builder, step: *std.build.LibExeObjStep, options: Op
"src/dawn_native/metal/UtilsMetal.mm", "src/dawn_native/metal/UtilsMetal.mm",
}) |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, flags); lib.addCSourceFile(abs_path, flags);
} }
} }
}, },
else => { else => {
if (options.linux_window_manager == .X11) { if (options.linux_window_manager == .X11) {
step.linkSystemLibrary("X11"); lib.linkSystemLibrary("X11");
for ([_][]const u8{ for ([_][]const u8{
"src/dawn_native/XlibXcbFunctions.cpp", "src/dawn_native/XlibXcbFunctions.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, flags); lib.addCSourceFile(abs_path, flags);
} }
} }
}, },
@ -382,7 +389,7 @@ fn addDawnNativeSources(b: *Builder, step: *std.build.LibExeObjStep, options: Op
"src/dawn_native/null/DeviceNull.cpp", "src/dawn_native/null/DeviceNull.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, flags); lib.addCSourceFile(abs_path, flags);
} }
// TODO: no vulkan on macos // TODO: no vulkan on macos
@ -534,7 +541,7 @@ fn addDawnNativeSources(b: *Builder, step: *std.build.LibExeObjStep, options: Op
"src/dawn_native/null/NullBackend.cpp", "src/dawn_native/null/NullBackend.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, flags); lib.addCSourceFile(abs_path, flags);
} }
// if (dawn_enable_d3d12) { // if (dawn_enable_d3d12) {
@ -556,6 +563,7 @@ fn addDawnNativeSources(b: *Builder, step: *std.build.LibExeObjStep, options: Op
// } // }
// } // }
// } // }
return lib;
} }
// Adds third party tint sources; derived from third_party/tint/src/BUILD.gn // Adds third party tint sources; derived from third_party/tint/src/BUILD.gn
@ -1203,7 +1211,13 @@ fn buildLibAbseilCpp(b: *Builder, step: *std.build.LibExeObjStep) *std.build.Lib
fn addDawnWireSources(b: *Builder, step: *std.build.LibExeObjStep, options: Options, target: std.Target) void { fn addDawnWireSources(b: *Builder, step: *std.build.LibExeObjStep, options: Options, target: std.Target) void {
_ = options; _ = options;
_ = target; _ = target;
const flags = &.{}; const flags = &.{
include("libs/dawn/src"),
include("libs/dawn/src/include"),
include("libs/dawn/out/Debug/gen/src/include"),
include("libs/dawn/out/Debug/gen/src"),
};
// dawn_wire_gen // dawn_wire_gen
for ([_][]const u8{ for ([_][]const u8{