Implemented semantics for eglDestroySurface when surface is current on thread.

src/common/version.h

 #define MAJOR_VERSION 0
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 629
+#define BUILD_REVISION 632
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/libEGL/Display.cpp

@@ -589,8 +589,15 @@ EGLContext Display::createContext(EGLConfig configHandle, const gl::Context *sha
 
 void Display::destroySurface(egl::Surface *surface)
 {
-    delete surface;
-    mSurfaceSet.erase(surface);
+    if (surface == egl::getCurrentDrawSurface() || surface == egl::getCurrentReadSurface())
+    {
+        surface->setPendingDestroy();
+    }
+    else
+    {
+        delete surface;
+        mSurfaceSet.erase(surface);
+    }
 }
 
 void Display::destroyContext(gl::Context *context)
@@ -624,7 +631,7 @@ bool Display::isValidContext(gl::Context *context)
 
 bool Display::isValidSurface(egl::Surface *surface)
 {
-    return mSurfaceSet.find(surface) != mSurfaceSet.end();
+    return mSurfaceSet.find(surface) != mSurfaceSet.end() && !surface->isPendingDestroy();
 }
 
 bool Display::hasExistingWindowSurface(HWND window)

src/libEGL/Surface.cpp

@@ -38,6 +38,8 @@ Surface::Surface(Display *display, const Config *config, HWND window)
     mSwapInterval = -1;
     setSwapInterval(1);
 
+    mIsPendingDestroy = false;
+
     subclassWindow();
     resetSwapChain();
 }
@@ -61,6 +63,8 @@ Surface::Surface(Display *display, const Config *config, EGLint width, EGLint he
     mSwapInterval = -1;
     setSwapInterval(1);
 
+    mIsPendingDestroy = false;
+
     resetSwapChain(width, height);
 }
 
@@ -412,4 +416,13 @@ D3DFORMAT Surface::getFormat() const
 {
     return mConfig->mRenderTargetFormat;
 }
+
+void Surface::setPendingDestroy() {
+    mIsPendingDestroy = true;
+}
+
+bool Surface::isPendingDestroy() const {
+    return mIsPendingDestroy;
+}
+
 }

src/libEGL/Surface.h

@@ -60,6 +60,9 @@ class Surface
     virtual void setBoundTexture(gl::Texture2D *texture);
     virtual gl::Texture2D *getBoundTexture() const;
 
+    void setPendingDestroy();
+    bool isPendingDestroy() const;
+
 private:
     DISALLOW_COPY_AND_ASSIGN(Surface);
 
@@ -70,6 +73,7 @@ private:
     IDirect3DTexture9* mOffscreenTexture;
 
     HANDLE mShareHandle;
+    bool mIsPendingDestroy;
 
     void subclassWindow();
     void unsubclassWindow();