encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make dawn_use_x11 = use_x11 when building inside Chromium 

The variable use_x11 in Chromium takes into account more thinks like
whether we are building in LaCrOS mode and more. If we don't do this,
compilation of Chromium fails when Dawn tries to include X11/Xlib.h

Bug: chromium:976495
Change-Id: I8b4e865f50f60235466c8ba72683927124aa094e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/30220
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez 2020-10-15 14:30:23 +00:00 committed by Commit Bot service account
parent 5931c0ac3b
commit a7278454b2
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/dawn_features.gni
View File

@ -16,6 +16,14 @@ import("//build_overrides/build.gni")
if (build_with_chromium) {
import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/ui.gni")
dawn_use_x11 = use_x11
} else {
declare_args() {
# Whether Dawn should enable X11 support.
dawn_use_x11 = is_linux && !is_chromeos
}
}
declare_args() {
@ -66,9 +74,6 @@ declare_args() {
dawn_enable_error_injection =
is_debug || (build_with_chromium && use_fuzzing_engine)
# Whether Dawn should enable X11 support.
dawn_use_x11 = is_linux && !is_chromeos
# Enable support WGSL for shaders.
# Turned off for Skia, because Tint is currently not part of its DEPS.
dawn_enable_wgsl = !defined(is_skia_standalone)