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

webgpu: build tint into a library

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2021-11-16 07:40:34 -07:00 • committed by Stephen Gutekanst
parent edb95b23c5
commit 0cf9f06177
1 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

51
webgpu/build_dawn.zig
View file

@ -48,20 +48,8 @@ pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void
const lib_spirv_tools = buildLibSPIRVTools(b, step); const lib_spirv_tools = buildLibSPIRVTools(b, step);
step.linkLibrary(lib_spirv_tools); step.linkLibrary(lib_spirv_tools);
const lib = buildLibDawn(b, step); const lib_tint = buildLibTint(b, step);
step.linkLibrary(lib); step.linkLibrary(lib_tint);
}
fn buildLibDawn(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", 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;
addThirdPartyTintSources(b, lib, target);
return lib;
} }
fn buildLibMachDawnNative(b: *Builder, step: *std.build.LibExeObjStep) *std.build.LibExeObjStep { fn buildLibMachDawnNative(b: *Builder, step: *std.build.LibExeObjStep) *std.build.LibExeObjStep {
@ -572,9 +560,14 @@ fn buildLibDawnNative(b: *Builder, step: *std.build.LibExeObjStep, options: Opti
return lib; return lib;
} }
// Adds third party tint sources; derived from third_party/tint/src/BUILD.gn // Builds third party tint sources; derived from third_party/tint/src/BUILD.gn
// TODO(webgpu): lib fn buildLibTint(b: *Builder, step: *std.build.LibExeObjStep) *std.build.LibExeObjStep {
fn addThirdPartyTintSources(b: *Builder, step: *std.build.LibExeObjStep, target: std.Target) void { var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable;
const lib = b.addStaticLibrary("tint", main_abs);
lib.setBuildMode(step.build_mode);
lib.setTarget(step.target);
lib.linkLibCpp();
const flags = &.{ const flags = &.{
"-DTINT_BUILD_SPV_READER=1", "-DTINT_BUILD_SPV_READER=1",
"-DTINT_BUILD_SPV_WRITER=1", "-DTINT_BUILD_SPV_WRITER=1",
@ -734,13 +727,14 @@ fn addThirdPartyTintSources(b: *Builder, step: *std.build.LibExeObjStep, target:
"third_party/tint/src/writer/writer.cc", "third_party/tint/src/writer/writer.cc",
}) |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);
} }
const target = (std.zig.system.NativeTargetInfo.detect(b.allocator, step.target) catch unreachable).target;
switch (target.os.tag) { switch (target.os.tag) {
.windows => step.addCSourceFile(thisDir() ++ "/libs/dawn/third_party/tint/src/diagnostic/printer_windows.cc", flags), .windows => lib.addCSourceFile(thisDir() ++ "/libs/dawn/third_party/tint/src/diagnostic/printer_windows.cc", flags),
.linux => step.addCSourceFile(thisDir() ++ "/libs/dawn/third_party/tint/src/diagnostic/printer_linux.cc", flags), .linux => lib.addCSourceFile(thisDir() ++ "/libs/dawn/third_party/tint/src/diagnostic/printer_linux.cc", flags),
else => step.addCSourceFile(thisDir() ++ "/libs/dawn/third_party/tint/src/diagnostic/printer_other.cc", flags), else => lib.addCSourceFile(thisDir() ++ "/libs/dawn/third_party/tint/src/diagnostic/printer_other.cc", flags),
} }
// libtint_sem_src // libtint_sem_src
@ -787,7 +781,7 @@ fn addThirdPartyTintSources(b: *Builder, step: *std.build.LibExeObjStep, target:
"third_party/tint/src/sem/void_type.cc", "third_party/tint/src/sem/void_type.cc",
}) |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);
} }
// libtint_spv_reader_src // libtint_spv_reader_src
@ -803,7 +797,7 @@ fn addThirdPartyTintSources(b: *Builder, step: *std.build.LibExeObjStep, target:
"third_party/tint/src/reader/spirv/usage.cc", "third_party/tint/src/reader/spirv/usage.cc",
}) |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);
} }
// libtint_spv_writer_src // libtint_spv_writer_src
@ -816,7 +810,7 @@ fn addThirdPartyTintSources(b: *Builder, step: *std.build.LibExeObjStep, target:
"third_party/tint/src/writer/spirv/operand.cc", "third_party/tint/src/writer/spirv/operand.cc",
}) |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);
} }
// libtint_wgsl_reader_src // libtint_wgsl_reader_src
@ -827,7 +821,7 @@ fn addThirdPartyTintSources(b: *Builder, step: *std.build.LibExeObjStep, target:
"third_party/tint/src/reader/wgsl/token.cc", "third_party/tint/src/reader/wgsl/token.cc",
}) |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);
} }
// libtint_wgsl_writer_src // libtint_wgsl_writer_src
@ -836,7 +830,7 @@ fn addThirdPartyTintSources(b: *Builder, step: *std.build.LibExeObjStep, target:
"third_party/tint/src/writer/wgsl/generator_impl.cc", "third_party/tint/src/writer/wgsl/generator_impl.cc",
}) |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);
} }
// libtint_msl_writer_src // libtint_msl_writer_src
@ -845,7 +839,7 @@ fn addThirdPartyTintSources(b: *Builder, step: *std.build.LibExeObjStep, target:
"third_party/tint/src/writer/msl/generator_impl.cc", "third_party/tint/src/writer/msl/generator_impl.cc",
}) |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);
} }
// libtint_hlsl_writer_src // libtint_hlsl_writer_src
@ -854,8 +848,9 @@ fn addThirdPartyTintSources(b: *Builder, step: *std.build.LibExeObjStep, target:
"third_party/tint/src/writer/hlsl/generator_impl.cc", "third_party/tint/src/writer/hlsl/generator_impl.cc",
}) |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);
} }
return lib;
} }
// Builds third_party/vulkan-deps/spirv-tools sources; derived from third_party/vulkan-deps/spirv-tools/src/BUILD.gn // Builds third_party/vulkan-deps/spirv-tools sources; derived from third_party/vulkan-deps/spirv-tools/src/BUILD.gn