Refactoring EGL validation

src/libANGLE/validationEGL.cpp

@@ -610,9 +610,8 @@ Error ValidateLabeledObject(Thread *thread,
     return NoError();
 }
 
-}  // namespace
-
-Error ValidateDisplay(const Display *display)
+// This is a common sub-check of Display status that's shared by multiple functions
+Error ValidateDisplayPointer(const Display *display)
 {
     if (display == EGL_NO_DISPLAY)
     {
@@ -624,6 +623,15 @@ Error ValidateDisplay(const Display *display)
         return EglBadDisplay() << "display is not a valid display.";
     }
 
+    return NoError();
+}
+
+}  // namespace
+
+Error ValidateDisplay(const Display *display)
+{
+    ANGLE_TRY(ValidateDisplayPointer(display));
+
     if (!display->isInitialized())
     {
         return EglNotInitialized() << "display is not initialized.";
@@ -780,6 +788,16 @@ LabeledObject *GetLabeledObjectIfValid(Thread *thread,
     return labeledObject;
 }
 
+Error ValidateInitialize(const Display *display)
+{
+    return ValidateDisplayPointer(display);
+}
+
+Error ValidateTerminate(const Display *display)
+{
+    return ValidateDisplayPointer(display);
+}
+
 Error ValidateCreateContext(Display *display,
                             Config *configuration,
                             gl::Context *shareContext,
@@ -2472,6 +2490,34 @@ Error ValidateGetSyncValuesCHROMIUM(const Display *display,
     return NoError();
 }
 
+Error ValidateDestroySurface(const Display *display,
+                             const Surface *surface,
+                             const EGLSurface eglSurface)
+{
+    ANGLE_TRY(ValidateSurface(display, surface));
+
+    if (eglSurface == EGL_NO_SURFACE)
+    {
+        return EglBadSurface();
+    }
+
+    return NoError();
+}
+
+Error ValidateDestroyContext(const Display *display,
+                             const gl::Context *glCtx,
+                             const EGLContext eglCtx)
+{
+    ANGLE_TRY(ValidateContext(display, glCtx));
+
+    if (eglCtx == EGL_NO_CONTEXT)
+    {
+        return EglBadContext();
+    }
+
+    return NoError();
+}
+
 Error ValidateSwapBuffers(Thread *thread, const Display *display, const Surface *eglSurface)
 {
     ANGLE_TRY(ValidateSurface(display, eglSurface));
@@ -2490,6 +2536,18 @@ Error ValidateSwapBuffers(Thread *thread, const Display *display, const Surface
     return NoError();
 }
 
+Error ValidateWaitNative(const Display *display, const EGLint engine)
+{
+    ANGLE_TRY(ValidateDisplay(display));
+
+    if (engine != EGL_CORE_NATIVE_ENGINE)
+    {
+        return EglBadParameter() << "the 'engine' parameter has an unrecognized value";
+    }
+
+    return NoError();
+}
+
 Error ValidateSwapBuffersWithDamageKHR(const Display *display,
                                        const Surface *surface,
                                        EGLint *rects,

src/libANGLE/validationEGL.h

@@ -56,6 +56,10 @@ LabeledObject *GetLabeledObjectIfValid(Thread *thread,
                                        EGLObjectKHR object);
 
 // Entry point validation
+Error ValidateInitialize(const Display *display);
+
+Error ValidateTerminate(const Display *display);
+
 Error ValidateCreateContext(Display *display,
                             Config *configuration,
                             gl::Context *shareContext,
@@ -130,8 +134,18 @@ Error ValidateGetSyncValuesCHROMIUM(const Display *display,
                                     const EGLuint64KHR *msc,
                                     const EGLuint64KHR *sbc);
 
+Error ValidateDestroySurface(const Display *display,
+                             const Surface *surface,
+                             const EGLSurface eglSurface);
+
+Error ValidateDestroyContext(const Display *display,
+                             const gl::Context *glCtx,
+                             const EGLContext eglCtx);
+
 Error ValidateSwapBuffers(Thread *thread, const Display *display, const Surface *surface);
 
+Error ValidateWaitNative(const Display *display, const EGLint engine);
+
 Error ValidateSwapBuffersWithDamageKHR(const Display *display,
                                        const Surface *surface,
                                        EGLint *rects,