surfaceD3D::swapRect(): always call checkForOutOfDateSwapChain() even if

src/libANGLE/renderer/d3d/SurfaceD3D.cpp

@@ -255,21 +255,19 @@ egl::Error SurfaceD3D::swapRect(EGLint x, EGLint y, EGLint width, EGLint height)
         height = mHeight - y;
     }
 
-    if (width == 0 || height == 0)
+    if (width != 0 && height != 0)
     {
-        return egl::Error(EGL_SUCCESS);
-    }
+        EGLint status = mSwapChain->swapRect(x, y, width, height);
 
-    EGLint status = mSwapChain->swapRect(x, y, width, height);
-
-    if (status == EGL_CONTEXT_LOST)
-    {
-        mRenderer->notifyDeviceLost();
-        return egl::Error(status);
-    }
-    else if (status != EGL_SUCCESS)
-    {
-        return egl::Error(status);
+        if (status == EGL_CONTEXT_LOST)
+        {
+            mRenderer->notifyDeviceLost();
+            return egl::Error(status);
+        }
+        else if (status != EGL_SUCCESS)
+        {
+            return egl::Error(status);
+        }
     }
 
     checkForOutOfDateSwapChain();

src/tests/standalone_tests/EGLSurfaceTest.cpp

@@ -7,7 +7,7 @@
 //   Tests pertaining to egl::Surface.
 //
 
-#include <gtest/gtest.h>
+#include <ANGLETest.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <GLES2/gl2.h>
@@ -223,4 +223,45 @@ TEST_F(EGLSurfaceTest, MakeCurrentTwice)
     glClear(GL_COLOR_BUFFER_BIT);
 }
 
+// Test that the D3D window surface is correctly resized after calling swapBuffers
+TEST_F(EGLSurfaceTest, ResizeD3DWindow)
+{
+    const char *extensionsString = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
+    if (strstr(extensionsString, "EGL_ANGLE_platform_angle_d3d") == nullptr)
+    {
+        std::cout << "D3D Platform not supported in ANGLE";
+        return;
+    }
+
+    initializeSurface(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
+
+    eglSwapBuffers(mDisplay, mWindowSurface);
+    ASSERT_EGL_SUCCESS();
+
+    EGLint height;
+    eglQuerySurface(mDisplay, mWindowSurface, EGL_HEIGHT, &height);
+    ASSERT_EGL_SUCCESS();
+    ASSERT_EQ(64, height);  // initial size
+
+    // set window's height to 0
+    mOSWindow->resize(64, 0);
+
+    eglSwapBuffers(mDisplay, mWindowSurface);
+    ASSERT_EGL_SUCCESS();
+
+    eglQuerySurface(mDisplay, mWindowSurface, EGL_HEIGHT, &height);
+    ASSERT_EGL_SUCCESS();
+    ASSERT_EQ(0, height);
+
+    // restore window's height
+    mOSWindow->resize(64, 64);
+
+    eglSwapBuffers(mDisplay, mWindowSurface);
+    ASSERT_EGL_SUCCESS();
+
+    eglQuerySurface(mDisplay, mWindowSurface, EGL_HEIGHT, &height);
+    ASSERT_EGL_SUCCESS();
+    ASSERT_EQ(64, height);
+}
+
 }