Refactor of EGL SwapBuffers validation

src/libANGLE/validationEGL.cpp

@@ -7,6 +7,7 @@
 // validationEGL.cpp: Validation functions for generic EGL entry point parameters
 
 #include "libANGLE/validationEGL.h"
+#include "libGLESv2/global_state.h"
 
 #include "common/utilities.h"
 #include "libANGLE/Config.h"
@@ -2471,6 +2472,24 @@ Error ValidateGetSyncValuesCHROMIUM(const Display *display,
     return NoError();
 }
 
+Error ValidateSwapBuffers(Thread *thread, const Display *display, const Surface *eglSurface)
+{
+    ANGLE_TRY(ValidateSurface(display, eglSurface));
+
+    if (display->isDeviceLost())
+    {
+        return EglContextLost();
+    }
+
+    if (eglSurface == EGL_NO_SURFACE || !thread->getContext() ||
+        thread->getCurrentDrawSurface() != eglSurface)
+    {
+        return EglBadSurface();
+    }
+
+    return NoError();
+}
+
 Error ValidateSwapBuffersWithDamageKHR(const Display *display,
                                        const Surface *surface,
                                        EGLint *rects,

src/libANGLE/validationEGL.h

@@ -130,6 +130,8 @@ Error ValidateGetSyncValuesCHROMIUM(const Display *display,
                                     const EGLuint64KHR *msc,
                                     const EGLuint64KHR *sbc);
 
+Error ValidateSwapBuffers(Thread *thread, const Display *display, const Surface *surface);
+
 Error ValidateSwapBuffersWithDamageKHR(const Display *display,
                                        const Surface *surface,
                                        EGLint *rects,

src/libGLESv2/entry_points_egl.cpp

@@ -657,42 +657,11 @@ EGLBoolean EGLAPIENTRY SwapBuffers(EGLDisplay dpy, EGLSurface surface)
     Display *display    = static_cast<Display *>(dpy);
     Surface *eglSurface = (Surface *)surface;
 
-    Error error = ValidateSurface(display, eglSurface);
-    if (error.isError())
-    {
-        thread->setError(error, GetDebug(), "eglSwapBuffers",
-                         GetSurfaceIfValid(display, eglSurface));
-        return EGL_FALSE;
-    }
-
-    if (display->isDeviceLost())
-    {
-        thread->setError(EglContextLost(), GetDebug(), "eglSwapBuffers",
-                         GetSurfaceIfValid(display, eglSurface));
-        return EGL_FALSE;
-    }
+    ANGLE_EGL_TRY_RETURN(thread, ValidateSwapBuffers(thread, display, eglSurface), "eglSwapBuffers",
+                         GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
 
-    if (surface == EGL_NO_SURFACE)
-    {
-        thread->setError(EglBadSurface(), GetDebug(), "eglSwapBuffers",
-                         GetSurfaceIfValid(display, eglSurface));
-        return EGL_FALSE;
-    }
-
-    if (!thread->getContext() || thread->getCurrentDrawSurface() != eglSurface)
-    {
-        thread->setError(EglBadSurface(), GetDebug(), "eglSwapBuffers",
-                         GetSurfaceIfValid(display, eglSurface));
-        return EGL_FALSE;
-    }
-
-    error = eglSurface->swap(thread->getContext());
-    if (error.isError())
-    {
-        thread->setError(error, GetDebug(), "eglSwapBuffers",
-                         GetSurfaceIfValid(display, eglSurface));
-        return EGL_FALSE;
-    }
+    ANGLE_EGL_TRY_RETURN(thread, eglSurface->swap(thread->getContext()), "eglSwapBuffers",
+                         GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
 
     thread->setSuccess();
     return EGL_TRUE;