Surface: query swapBehavior from the Impl

src/libANGLE/Surface.cpp

@@ -32,7 +32,7 @@ Surface::Surface(rx::SurfaceImpl *impl, EGLint surfaceType, const egl::Config *c
       // FIXME: Determine actual pixel aspect ratio
       mPixelAspectRatio(static_cast<EGLint>(1.0 * EGL_DISPLAY_SCALING)),
       mRenderBuffer(EGL_BACK_BUFFER),
-      mSwapBehavior(EGL_BUFFER_PRESERVED)
+      mSwapBehavior(impl->getSwapBehavior())
 {
     addRef();
 

src/libANGLE/Surface_unittest.cpp

@@ -29,6 +29,7 @@ class MockSurfaceImpl : public rx::SurfaceImpl
     MOCK_CONST_METHOD0(getWidth, EGLint());
     MOCK_CONST_METHOD0(getHeight, EGLint());
     MOCK_CONST_METHOD0(isPostSubBufferSupported, EGLint(void));
+    MOCK_CONST_METHOD0(getSwapBehavior, EGLint(void));
     MOCK_METHOD2(getAttachmentRenderTarget, gl::Error(const gl::FramebufferAttachment::Target &, rx::FramebufferAttachmentRenderTarget **));
 
     MOCK_METHOD0(destroy, void());

src/libANGLE/renderer/SurfaceImpl.h

@@ -41,6 +41,7 @@ class SurfaceImpl : public FramebufferAttachmentObjectImpl
     virtual EGLint getHeight() const = 0;
 
     virtual EGLint isPostSubBufferSupported() const = 0;
+    virtual EGLint getSwapBehavior() const = 0;
 };
 
 }

src/libANGLE/renderer/d3d/SurfaceD3D.cpp

@@ -295,6 +295,11 @@ EGLint SurfaceD3D::isPostSubBufferSupported() const
     return EGL_TRUE;
 }
 
+EGLint SurfaceD3D::getSwapBehavior() const
+{
+    return EGL_BUFFER_PRESERVED;
+}
+
 egl::Error SurfaceD3D::querySurfacePointerANGLE(EGLint attribute, void **value)
 {
     if (attribute == EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE)

src/libANGLE/renderer/d3d/SurfaceD3D.h

@@ -45,6 +45,7 @@ class SurfaceD3D : public SurfaceImpl
     EGLint getHeight() const override;
 
     EGLint isPostSubBufferSupported() const override;
+    EGLint getSwapBehavior() const override;
 
     // D3D implementations
     SwapChainD3D *getSwapChain() const;

src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h

@@ -34,6 +34,7 @@ class WindowSurfaceCGL : public SurfaceGL
     EGLint getHeight() const override;
 
     EGLint isPostSubBufferSupported() const override;
+    EGLint getSwapBehavior() const override;
 };
 
 }

src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm

@@ -87,4 +87,9 @@ EGLint WindowSurfaceCGL::isPostSubBufferSupported() const
     return EGL_FALSE;
 }
 
+EGLint WindowSurfaceCGL::getSwapBehavior() const
+{
+    return EGL_BUFFER_DESTROYED;
+}
+
 }

src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp

@@ -117,4 +117,9 @@ EGLint PbufferSurfaceGLX::isPostSubBufferSupported() const
     return EGL_FALSE;
 }
 
+EGLint PbufferSurfaceGLX::getSwapBehavior() const
+{
+    return EGL_BUFFER_PRESERVED;
+}
+
 }

src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h

@@ -38,6 +38,7 @@ class PbufferSurfaceGLX : public SurfaceGL
     EGLint getHeight() const override;
 
     EGLint isPostSubBufferSupported() const override;
+    EGLint getSwapBehavior() const override;
 
   private:
     unsigned mWidth;

src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp

@@ -192,6 +192,11 @@ EGLint WindowSurfaceGLX::isPostSubBufferSupported() const
     return EGL_FALSE;
 }
 
+EGLint WindowSurfaceGLX::getSwapBehavior() const
+{
+    return EGL_BUFFER_PRESERVED;
+}
+
 bool WindowSurfaceGLX::getWindowDimensions(Window window, unsigned int *width, unsigned int *height) const
 {
     Window root;

src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.h

@@ -39,6 +39,8 @@ class WindowSurfaceGLX : public SurfaceGL
     EGLint getHeight() const override;
 
     EGLint isPostSubBufferSupported() const override;
+    EGLint getSwapBehavior() const override;
+
   private:
     bool getWindowDimensions(Window window, unsigned int *width, unsigned int *height) const;
 

src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp

@@ -179,4 +179,9 @@ EGLint PbufferSurfaceWGL::isPostSubBufferSupported() const
     return EGL_FALSE;
 }
 
+EGLint PbufferSurfaceWGL::getSwapBehavior() const
+{
+    return EGL_BUFFER_PRESERVED;
+}
+
 }

src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.h

@@ -40,6 +40,7 @@ class PbufferSurfaceWGL : public SurfaceGL
     EGLint getHeight() const override;
 
     EGLint isPostSubBufferSupported() const override;
+    EGLint getSwapBehavior() const override;
 
   private:
     EGLint mWidth;

src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp

@@ -145,4 +145,9 @@ EGLint WindowSurfaceWGL::isPostSubBufferSupported() const
     return EGL_FALSE;
 }
 
+EGLint WindowSurfaceWGL::getSwapBehavior() const
+{
+    return EGL_BUFFER_PRESERVED;
+}
+
 }

src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h

@@ -38,6 +38,7 @@ class WindowSurfaceWGL : public SurfaceGL
     EGLint getHeight() const override;
 
     EGLint isPostSubBufferSupported() const override;
+    EGLint getSwapBehavior() const override;
 
   private:
     int mPixelFormat;