commit 78a59dbf7abe99bf7a7506903b884b3c1f4f6b34
author Austin Eng <enga@chromium.org> Fri Sep 01 18:43:29 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Sep 01 18:43:29 2023 +0000
tree 180cdf2bdd384a2e3da58d7de49ccc746c6b757f
parent 7981507e005036b20d2df0d6a76329c26d69ec0e

Cleanup includes of glfw

- they are unnecessary
- they are blocking enabling GLES on Android

Bug: 1453445
Change-Id: I1da4e631be41c55afab1d9c88291b363969e19d7
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/149221
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Stephen White <senorblanco@chromium.org>
Reviewed-by: Gregg Tavares <gman@chromium.org>
Commit-Queue: Stephen White <senorblanco@chromium.org>
Auto-Submit: Austin Eng <enga@chromium.org>

src/dawn/tests/BUILD.gn

diff --git a/src/dawn/tests/BUILD.gn b/src/dawn/tests/BUILD.gn
index b2a5c3a..696e32f 100644
--- a/src/dawn/tests/BUILD.gn
+++ b/src/dawn/tests/BUILD.gn
@@ -445,8 +445,7 @@
 
   public_deps = [ ":gmock_and_gtest" ]
 
-  if (dawn_supports_glfw_for_windowing || dawn_enable_opengl) {
-    assert(dawn_supports_glfw_for_windowing)
+  if (dawn_supports_glfw_for_windowing) {
     public_deps += [ "${dawn_root}/src/dawn/glfw" ]
   }
 

src/dawn/tests/DawnTest.cpp

diff --git a/src/dawn/tests/DawnTest.cpp b/src/dawn/tests/DawnTest.cpp
index a196649..b05677a 100644
--- a/src/dawn/tests/DawnTest.cpp
+++ b/src/dawn/tests/DawnTest.cpp
@@ -46,7 +46,6 @@
 #include "dawn/wire/WireServer.h"
 
 #if defined(DAWN_ENABLE_BACKEND_OPENGL)
-#include "GLFW/glfw3.h"
 #include "dawn/native/OpenGLBackend.h"
 #endif  // DAWN_ENABLE_BACKEND_OPENGL
 

src/dawn/tests/end2end/PhysicalDeviceDiscoveryTests.cpp

diff --git a/src/dawn/tests/end2end/PhysicalDeviceDiscoveryTests.cpp b/src/dawn/tests/end2end/PhysicalDeviceDiscoveryTests.cpp
index 25271ea..2100118 100644
--- a/src/dawn/tests/end2end/PhysicalDeviceDiscoveryTests.cpp
+++ b/src/dawn/tests/end2end/PhysicalDeviceDiscoveryTests.cpp
@@ -36,10 +36,9 @@
 #include "dawn/native/MetalBackend.h"
 #endif  // defined(DAWN_ENABLE_BACKEND_METAL)
 
-#if defined(DAWN_ENABLE_BACKEND_DESKTOP_GL) || defined(DAWN_ENABLE_BACKEND_OPENGLES)
-#include "GLFW/glfw3.h"
+#if defined(DAWN_ENABLE_BACKEND_OPENGL)
 #include "dawn/native/OpenGLBackend.h"
-#endif  // defined(DAWN_ENABLE_BACKEND_DESKTOP_GL) || defined(DAWN_ENABLE_BACKEND_OPENGLES)
+#endif  // defined(DAWN_ENABLE_BACKEND_OPENGL)
 
 #include <gtest/gtest.h>