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

gpu-dawn: fix dependency loop preventing Linux builds

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-02-13 02:53:01 +00:00
parent d8a8923007
commit 8019986037
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gpu-dawn/build.zig
View file

@ -135,6 +135,10 @@ fn linkFromSource(b: *Builder, step: *std.build.LibExeObjStep, options: Options)
step.linkLibrary(lib_abseil_cpp); step.linkLibrary(lib_abseil_cpp);
const lib_dawn_native = buildLibDawnNative(b, step, options); const lib_dawn_native = buildLibDawnNative(b, step, options);
step.linkLibrary(lib_dawn_native); step.linkLibrary(lib_dawn_native);
if (options.desktop_gl.?) {
const lib_spirv_cross = buildLibSPIRVCross(b, step, options);
step.linkLibrary(lib_spirv_cross);
}
const lib_dawn_wire = buildLibDawnWire(b, step, options); const lib_dawn_wire = buildLibDawnWire(b, step, options);
step.linkLibrary(lib_dawn_wire); step.linkLibrary(lib_dawn_wire);
@ -163,6 +167,9 @@ fn linkFromSource(b: *Builder, step: *std.build.LibExeObjStep, options: Options)
_ = buildLibDawnPlatform(b, lib_dawn, options); _ = buildLibDawnPlatform(b, lib_dawn, options);
_ = buildLibAbseilCpp(b, lib_dawn, options); _ = buildLibAbseilCpp(b, lib_dawn, options);
_ = buildLibDawnNative(b, lib_dawn, options); _ = buildLibDawnNative(b, lib_dawn, options);
if (options.desktop_gl.?) {
_ = buildLibSPIRVCross(b, lib_dawn, options);
}
_ = buildLibDawnWire(b, lib_dawn, options); _ = buildLibDawnWire(b, lib_dawn, options);
_ = buildLibDawnUtils(b, lib_dawn, options); _ = buildLibDawnUtils(b, lib_dawn, options);
_ = buildLibSPIRVTools(b, lib_dawn, options); _ = buildLibSPIRVTools(b, lib_dawn, options);
@ -483,9 +490,6 @@ fn buildLibDawnNative(b: *Builder, step: *std.build.LibExeObjStep, options: Opti
if (options.desktop_gl.?) { if (options.desktop_gl.?) {
// OpenGL requires spriv-cross until Dawn moves OpenGL shader generation to Tint. // OpenGL requires spriv-cross until Dawn moves OpenGL shader generation to Tint.
flags.append(include("libs/dawn/third_party/vulkan-deps/spirv-cross/src")) catch unreachable; flags.append(include("libs/dawn/third_party/vulkan-deps/spirv-cross/src")) catch unreachable;
const lib_spirv_cross = buildLibSPIRVCross(b, step, options);
step.linkLibrary(lib_spirv_cross);
} }
flags.appendSlice(&.{ flags.appendSlice(&.{
include("libs/dawn"), include("libs/dawn"),