Emulate eglSwapBuffersWithDamageKHR when needed

src/libANGLE/renderer/gl/egl/DisplayEGL.cpp

@@ -100,7 +100,6 @@ void DisplayEGL::generateExtensions(egl::DisplayExtensions *outExtensions) const
         mEGL->hasExtension("EGL_EXT_create_context_robustness");
 
     outExtensions->postSubBuffer = false;  // Since SurfaceEGL::postSubBuffer is not implemented
-    outExtensions->swapBuffersWithDamage = mEGL->hasExtension("EGL_KHR_swap_buffers_with_damage");
     outExtensions->presentationTime      = mEGL->hasExtension("EGL_ANDROID_presentation_time");
 
     // Contexts are virtualized so textures can be shared globally
@@ -109,6 +108,10 @@ void DisplayEGL::generateExtensions(egl::DisplayExtensions *outExtensions) const
     // Surfaceless contexts are emulated even if there is no native support.
     outExtensions->surfacelessContext = true;
 
+    // We will fallback to regular swap if swapBuffersWithDamage isn't
+    // supported, so indicate support here to keep validation happy.
+    outExtensions->swapBuffersWithDamage = true;
+
     DisplayGL::generateExtensions(outExtensions);
 }
 

src/libANGLE/renderer/gl/egl/SurfaceEGL.cpp

@@ -14,7 +14,11 @@ namespace rx
 {
 
 SurfaceEGL::SurfaceEGL(const egl::SurfaceState &state, const FunctionsEGL *egl, EGLConfig config)
-    : SurfaceGL(state), mEGL(egl), mConfig(config), mSurface(EGL_NO_SURFACE)
+    : SurfaceGL(state),
+      mEGL(egl),
+      mConfig(config),
+      mSurface(EGL_NO_SURFACE),
+      mHasSwapBuffersWithDamage(mEGL->hasExtension("EGL_KHR_swap_buffers_with_damage"))
 {
 }
 
@@ -45,7 +49,15 @@ egl::Error SurfaceEGL::swap(const gl::Context *context)
 
 egl::Error SurfaceEGL::swapWithDamage(const gl::Context *context, EGLint *rects, EGLint n_rects)
 {
-    EGLBoolean success = mEGL->swapBuffersWithDamageKHR(mSurface, rects, n_rects);
+    EGLBoolean success;
+    if (mHasSwapBuffersWithDamage)
+    {
+        success = mEGL->swapBuffersWithDamageKHR(mSurface, rects, n_rects);
+    }
+    else
+    {
+        success = mEGL->swapBuffers(mSurface);
+    }
     if (success == EGL_FALSE)
     {
         return egl::Error(mEGL->getError(), "eglSwapBuffersWithDamageKHR failed");

src/libANGLE/renderer/gl/egl/SurfaceEGL.h

@@ -49,6 +49,9 @@ class SurfaceEGL : public SurfaceGL
     const FunctionsEGL *mEGL;
     EGLConfig mConfig;
     EGLSurface mSurface;
+
+  private:
+    bool mHasSwapBuffersWithDamage;
 };
 
 }  // namespace rx