Bug fix for WaitClient, WaitGL and WaitNative

src/libANGLE/validationEGL.cpp

@@ -4368,6 +4368,13 @@ bool ValidateSwapBuffersWithDamageKHR(const ValidationContext *val,
 
 bool ValidateWaitNative(const ValidationContext *val, const EGLint engine)
 {
+    if (val->eglThread->getDisplay() == nullptr)
+    {
+        // EGL spec says this about eglWaitNative -
+        //    eglWaitNative is ignored if there is no current EGL rendering context.
+        return true;
+    }
+
     ANGLE_VALIDATION_TRY(ValidateDisplay(val, val->eglThread->getDisplay()));
 
     if (engine != EGL_CORE_NATIVE_ENGINE)
@@ -5760,6 +5767,13 @@ bool ValidateQueryString(const ValidationContext *val, const Display *dpyPacked,
 
 bool ValidateWaitGL(const ValidationContext *val)
 {
+    if (val->eglThread->getDisplay() == nullptr)
+    {
+        // EGL spec says this about eglWaitGL -
+        //    eglWaitGL is ignored if there is no current EGL rendering context for OpenGL ES.
+        return true;
+    }
+
     ANGLE_VALIDATION_TRY(ValidateDisplay(val, val->eglThread->getDisplay()));
     return true;
 }
@@ -5776,6 +5790,15 @@ bool ValidateReleaseThread(const ValidationContext *val)
 
 bool ValidateWaitClient(const ValidationContext *val)
 {
+    if (val->eglThread->getDisplay() == nullptr)
+    {
+        // EGL spec says this about eglWaitClient -
+        //    If there is no current context for the current rendering API,
+        //    the function has no effect but still returns EGL_TRUE.
+        return true;
+    }
+
+    ANGLE_VALIDATION_TRY(ValidateDisplay(val, val->eglThread->getDisplay()));
     return true;
 }
 

src/libGLESv2/egl_stubs.cpp

@@ -692,7 +692,15 @@ EGLBoolean Terminate(Thread *thread, Display *display)
 
 EGLBoolean WaitClient(Thread *thread)
 {
-    Display *display     = thread->getDisplay();
+    Display *display = thread->getDisplay();
+    if (display == nullptr)
+    {
+        // EGL spec says this about eglWaitClient -
+        //    If there is no current context for the current rendering API,
+        //    the function has no effect but still returns EGL_TRUE.
+        return EGL_TRUE;
+    }
+
     gl::Context *context = thread->getContext();
 
     ANGLE_EGL_TRY_RETURN(thread, display->prepareForCall(), "eglWaitClient",
@@ -707,6 +715,12 @@ EGLBoolean WaitClient(Thread *thread)
 EGLBoolean WaitGL(Thread *thread)
 {
     Display *display = thread->getDisplay();
+    if (display == nullptr)
+    {
+        // EGL spec says this about eglWaitGL -
+        //    eglWaitGL is ignored if there is no current EGL rendering context for OpenGL ES.
+        return EGL_TRUE;
+    }
 
     ANGLE_EGL_TRY_RETURN(thread, display->prepareForCall(), "eglWaitGL", GetDisplayIfValid(display),
                          EGL_FALSE);
@@ -723,6 +737,13 @@ EGLBoolean WaitGL(Thread *thread)
 EGLBoolean WaitNative(Thread *thread, EGLint engine)
 {
     Display *display = thread->getDisplay();
+    if (display == nullptr)
+    {
+        // EGL spec says this about eglWaitNative -
+        //    eglWaitNative is ignored if there is no current EGL rendering context.
+        return EGL_TRUE;
+    }
+
     ANGLE_EGL_TRY_RETURN(thread, display->prepareForCall(), "eglWaitNative",
                          GetDisplayIfValid(display), EGL_FALSE);
     ANGLE_EGL_TRY_RETURN(thread, display->waitNative(thread->getContext(), engine), "eglWaitNative",

src/tests/egl_tests/EGLSyncTest.cpp

@@ -235,6 +235,42 @@ TEST_P(EGLSyncTest, BasicOperations)
     EXPECT_EGL_TRUE(eglDestroySyncKHR(display, sync));
 }
 
+// Test eglWaitClient api
+TEST_P(EGLSyncTest, WaitClient)
+{
+    // Clear to red color
+    glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
+
+    glClear(GL_COLOR_BUFFER_BIT);
+    EXPECT_EGL_TRUE(eglWaitClient());
+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::red);
+
+    EGLDisplay display = getEGLWindow()->getDisplay();
+    EGLContext context = getEGLWindow()->getContext();
+    EGLSurface surface = getEGLWindow()->getSurface();
+    eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    EXPECT_EGL_TRUE(eglWaitClient());
+    eglMakeCurrent(display, surface, surface, context);
+}
+
+// Test eglWaitGL api
+TEST_P(EGLSyncTest, WaitGL)
+{
+    // Clear to red color
+    glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
+
+    glClear(GL_COLOR_BUFFER_BIT);
+    EXPECT_EGL_TRUE(eglWaitGL());
+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::red);
+
+    EGLDisplay display = getEGLWindow()->getDisplay();
+    EGLContext context = getEGLWindow()->getContext();
+    EGLSurface surface = getEGLWindow()->getSurface();
+    eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    EXPECT_EGL_TRUE(eglWaitGL());
+    eglMakeCurrent(display, surface, surface, context);
+}
+
 // Test eglWaitNative api
 TEST_P(EGLSyncTest, WaitNative)
 {
@@ -244,6 +280,13 @@ TEST_P(EGLSyncTest, WaitNative)
     glClear(GL_COLOR_BUFFER_BIT);
     EXPECT_EGL_TRUE(eglWaitNative(EGL_CORE_NATIVE_ENGINE));
     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::red);
+
+    EGLDisplay display = getEGLWindow()->getDisplay();
+    EGLContext context = getEGLWindow()->getContext();
+    EGLSurface surface = getEGLWindow()->getSurface();
+    eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    EXPECT_EGL_TRUE(eglWaitNative(EGL_CORE_NATIVE_ENGINE));
+    eglMakeCurrent(display, surface, surface, context);
 }
 
 // Verify eglDupNativeFence for EGL_ANDROID_native_fence_sync