diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-09 15:33:33 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-12 15:25:04 +0000 |
| commit | ef0a09b990f6d65b7b8b52b6f0ac098c805c9692 (patch) | |
| tree | e7f176d09a3e2cb63af08efe16250fbf0f21401b | |
| parent | 1e19109f2cd38c866b8b18e854a4cfbf6727cabb (diff) | |
| download | qtwebengine-chromium-ef0a09b990f6d65b7b8b52b6f0ac098c805c9692.tar.gz | |
Fix ozone builds of ANGLE
Don't disable everything because use_x11 is not set.
Change-Id: I0377ee41439a5c4174601536c347e34cc3191e3e
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -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 9567ab5a94a..c3e518f73d0 100644 --- a/chromium/third_party/angle/gni/angle.gni +++ b/chromium/third_party/angle/gni/angle.gni @@ -35,6 +35,7 @@ if (build_with_chromium) { } else { declare_args() { ozone_platform_gbm = false + ozone_platform_x11 = false } } @@ -80,7 +81,7 @@ declare_args() { angle_enable_d3d9 = is_win && !angle_is_winuwp angle_enable_d3d11 = is_win angle_enable_gl = - (ozone_platform_gbm || !is_linux || (use_x11 && !is_chromeos)) && + (ozone_platform_gbm || ozone_platform_x11 || !is_linux || (use_x11 && !is_chromeos)) && !is_fuchsia && !angle_is_winuwp # ANGLE Vulkan backend on Android requires API level 26, i.e. Oreo, due to @@ -88,7 +89,7 @@ declare_args() { # Otherwise, API level 24 would have been enough. angle_enable_vulkan = angle_has_build && - ((is_win && !angle_is_winuwp) || (is_linux && use_x11 && !is_chromeos) || + ((is_win && !angle_is_winuwp) || (is_linux && (use_x11 || ozone_platform_x11) && !is_chromeos) || (is_android && ndk_api_level_at_least_26) || is_fuchsia) angle_enable_null = true angle_enable_essl = true |