GL: Skip redundant calls to eglMakeCurrent().

The EGL spec requires that eglMakeCurrent() cause a flush, even when the
call is a no-op. By avoiding redundant calls, we avoid the flush.

This is good for a 16X speedup on desk_chalkboard:

Graphite/Dawn/GLES, before:
curr/maxrss	loops	min	median	mean	max	stddev		config	bench
 195/199 MB	1	147ms	164ms	165ms	200ms	6%		grdawn_gles	desk_chalkboard.skp_1

Graphite/Dawn/GLES, after:
curr/maxrss	loops	min	median	mean	max	stddev		config	bench
 204/205 MB	1	8.73ms	9.59ms	9.66ms	12.3ms	4%		grdawn_gles	desk_chalkboard.skp_1

Ganesh/GLES:
curr/maxrss	loops	min	median	mean	max	stddev		config	bench
  86/139 MB	1	9.39ms	11.2ms	11.2ms	15.2ms	8%		gles	desk_chalkboard.skp_1

Change-Id: I12cab41f028be4b94e36d951c0fbce4f6dfe5eca
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/272854
Commit-Queue: Stephen White <senorblanco@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/dawn/native/opengl/ContextEGL.cpp

diff --git a/src/dawn/native/opengl/ContextEGL.cpp b/src/dawn/native/opengl/ContextEGL.cpp
index da8d797..dba5645 100644
--- a/src/dawn/native/opengl/ContextEGL.cpp
+++ b/src/dawn/native/opengl/ContextEGL.cpp
@@ -61,13 +61,17 @@
 thread_local ContextEGL* gCurrentContextInScope = nullptr;
 
 void MakeContextCurrent(DisplayEGL* display, const ContextEGL::ContextState& state) {
-    EGLBoolean success = display->egl.MakeCurrent(display->GetDisplay(), state.drawSurface,
+    if (display->egl.GetCurrentContext() != state.context ||
+        display->egl.GetCurrentSurface(EGL_DRAW) != state.drawSurface ||
+        display->egl.GetCurrentSurface(EGL_READ) != state.readSurface) {
+        EGLBoolean success = display->egl.MakeCurrent(display->GetDisplay(), state.drawSurface,
 
-                                                  state.readSurface, state.context);
+                                                      state.readSurface, state.context);
 
-    IgnoreErrors(
+        IgnoreErrors(
 
-        CheckEGL(display->egl, static_cast<EGLBoolean>(success == EGL_TRUE), "eglMakeCurrent"));
+            CheckEGL(display->egl, static_cast<EGLBoolean>(success == EGL_TRUE), "eglMakeCurrent"));
+    }
 }
 
 }  // namespace

src/dawn/tests/end2end/DrawIndexedIndirectTests.cpp

diff --git a/src/dawn/tests/end2end/DrawIndexedIndirectTests.cpp b/src/dawn/tests/end2end/DrawIndexedIndirectTests.cpp
index 1658d26..2d1d24a 100644
--- a/src/dawn/tests/end2end/DrawIndexedIndirectTests.cpp
+++ b/src/dawn/tests/end2end/DrawIndexedIndirectTests.cpp
@@ -631,6 +631,9 @@
     // TODO(crbug.com/dawn/789): Test is failing under SwANGLE on Windows.
     DAWN_SUPPRESS_TEST_IF(IsANGLE() && IsWindows());
 
+    // TODO(crbug.com/dawn/2295): diagnose this failure on Pixel 4 OpenGLES
+    DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsAndroid() && IsQualcomm());
+
     // It doesn't make sense to test invalid inputs when validation is disabled.
     DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("skip_validation"));