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

webgpu: cleanup dawn linkage

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

31
webgpu/build_dawn.zig
View file

@ -2,29 +2,6 @@ const std = @import("std");
const Builder = std.build.Builder; const Builder = std.build.Builder;
const glfw = @import("libs/mach-glfw/build.zig"); const glfw = @import("libs/mach-glfw/build.zig");
pub fn build(b: *Builder) void {
const mode = b.standardReleaseOptions();
const target = b.standardTargetOptions(.{});
var main_tests = b.addTest("src/dummy.zig");
main_tests.setBuildMode(mode);
main_tests.setTarget(target);
link(b, main_tests, .{});
const example = b.addExecutable("hello_triangle", "examples/hello_triangle.zig");
example.setBuildMode(mode);
example.setTarget(target);
link(b, example, .{});
glfw.link(b, example, .{ .system_sdk = .{ .set_sysroot = false } });
example.addPackagePath("glfw", "libs/mach-glfw/src/main.zig");
example.addIncludeDir("out/Debug/gen/src/include");
example.addIncludeDir("out/Debug/gen/src");
example.addIncludeDir("examples");
example.addIncludeDir("mach/glfw/upstream/glfw/include");
example.addIncludeDir("src/include");
example.install();
}
pub const LinuxWindowManager = enum { pub const LinuxWindowManager = enum {
X11, X11,
Wayland, Wayland,
@ -46,15 +23,16 @@ 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 = buildLibrary(b, step, options); const lib = buildLibDawn(b, step, options);
step.linkLibrary(lib); step.linkLibrary(lib);
} }
fn buildLibrary(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep { fn buildLibDawn(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; var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable;
const lib = b.addStaticLibrary("dawn", main_abs); const lib = b.addStaticLibrary("dawn", main_abs);
lib.setBuildMode(step.build_mode); lib.setBuildMode(step.build_mode);
lib.setTarget(step.target); lib.setTarget(step.target);
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;
@ -66,8 +44,6 @@ fn buildLibrary(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *
include("examples"), include("examples"),
}); });
lib.linkLibCpp(); // TODO: is it actually needed if we build with Zig?
glfw.link(b, lib, .{ .system_sdk = .{ .set_sysroot = false } });
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);
@ -1230,6 +1206,7 @@ fn addDawnWireSources(b: *Builder, step: *std.build.LibExeObjStep, options: Opti
fn addDawnUtilsSources(b: *Builder, step: *std.build.LibExeObjStep, options: Options, target: std.Target) void { fn addDawnUtilsSources(b: *Builder, step: *std.build.LibExeObjStep, options: Options, target: std.Target) void {
_ = options; _ = options;
_ = target; _ = target;
glfw.link(b, step, .{ .system_sdk = .{ .set_sysroot = false } });
const flags = &.{ const flags = &.{
"-DDAWN_ENABLE_BACKEND_METAL", "-DDAWN_ENABLE_BACKEND_METAL",
//"-DDAWN_ENABLE_BACKEND_NULL", //"-DDAWN_ENABLE_BACKEND_NULL",