From 7c0afdf3906e83d46bcb6c6788069d5feefdf9a8 Mon Sep 17 00:00:00 2001 From: Stephen White Date: Tue, 15 Feb 2022 22:16:29 +0000 Subject: [PATCH] Re-enable compilation of GL backends in Chromium. Tint's GLSL backend has achieved test parity with the SPIRV-Cross path for dawn_end2end_tests on both Desktop and ES and we have switched exclusively to Tint for GLSL generation. Since the SPIRV-Cross dependency has been removed, there should no longer be any binary size concerns with the use of these backends in Chrome. This reverts commit 6ef39372f8b6d60d927a5e6ae4eb27389f24eced. Bug: dawn:580 Change-Id: I6bcd2ce90c86e77570b4323481870590c6bd1efa Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/80300 Reviewed-by: Austin Eng Commit-Queue: Stephen White --- scripts/dawn_features.gni | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/dawn_features.gni b/scripts/dawn_features.gni index 228c727766..234791cf0d 100644 --- a/scripts/dawn_features.gni +++ b/scripts/dawn_features.gni @@ -58,13 +58,13 @@ declare_args() { # Enables the compilation of Dawn's OpenGL backend # (best effort, non-conformant) - dawn_enable_desktop_gl = !build_with_chromium && (is_linux && !is_chromeos) + dawn_enable_desktop_gl = is_linux && !is_chromeos # Enables the compilation of Dawn's OpenGLES backend # (WebGPU/Compat subset) # Disables OpenGLES when compiling for UWP, since UWP only supports d3d - dawn_enable_opengles = !build_with_chromium && ((is_linux && !is_chromeos) || - (is_win && !dawn_is_winuwp)) + dawn_enable_opengles = + (is_linux && !is_chromeos) || (is_win && !dawn_is_winuwp) # Enables the compilation of Dawn's Vulkan backend # Disables vulkan when compiling for UWP, since UWP only supports d3d