diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-09 15:33:33 +0100 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2020-04-08 07:58:26 +0000 |
| commit | c81ff02d7fc7695a62d6543e34b73a75071f7d78 (patch) | |
| tree | 49a1e5396eb3cf132ba2ba0438ebe12e63ad2065 | |
| parent | 6c9c6c8b186edf5fbbd814a76491f9dfb5857cb3 (diff) | |
| download | qtwebengine-chromium-5.15.0-beta4.tar.gz | |
Fix ozone builds of ANGLEv5.15.0-beta4
Don't disable everything because use_x11 is not set.
Change-Id: I0377ee41439a5c4174601536c347e34cc3191e3e
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
(cherry picked from commit ef0a09b990f6d65b7b8b52b6f0ac098c805c9692)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/third_party/angle/gni/angle.gni | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/third_party/angle/gni/angle.gni b/chromium/third_party/angle/gni/angle.gni index 5b557684b7f..5d781a4b110 100644 --- a/chromium/third_party/angle/gni/angle.gni +++ b/chromium/third_party/angle/gni/angle.gni @@ -41,6 +41,7 @@ if (build_with_chromium) { } else { declare_args() { ozone_platform_gbm = false + ozone_platform_x11 = false } } @@ -86,7 +87,7 @@ declare_args() { angle_enable_d3d9 = is_win && !angle_is_winuwp angle_enable_d3d11 = is_win angle_enable_gl = - (ozone_platform_gbm || !is_linux || (angle_use_x11 && !is_chromeos)) && + (ozone_platform_gbm || ozone_platform_x11 || !is_linux || (angle_use_x11 && !is_chromeos)) && !is_fuchsia && !angle_is_winuwp && !is_ggp # ANGLE Vulkan backend on Android requires API level 26, i.e. Oreo, due to @@ -94,7 +95,7 @@ declare_args() { # Otherwise, API level 24 would have been enough. angle_enable_vulkan = angle_has_build && ((is_win && !angle_is_winuwp) || - (is_linux && angle_use_x11 && !is_chromeos) || + (is_linux && (angle_use_x11 || ozone_platform_x11) && !is_chromeos) || (is_android && ndk_api_level_at_least_26) || is_fuchsia || is_ggp || is_mac) angle_enable_null = true |