Ensure a CGL context is current for WindowSurfaceCGL.

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

@@ -24,6 +24,17 @@ namespace rx
 
 class WorkerContext;
 
+struct EnsureCGLContextIsCurrent : angle::NonCopyable
+{
+  public:
+    EnsureCGLContextIsCurrent(CGLContextObj context);
+    ~EnsureCGLContextIsCurrent();
+
+  private:
+    CGLContextObj mOldContext;
+    bool mResetContext;
+};
+
 class DisplayCGL : public DisplayGL
 {
   public:

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

@@ -110,6 +110,23 @@ static void SetGPUByRegistryID(CGLContextObj contextObj,
 
 }  // anonymous namespace
 
+EnsureCGLContextIsCurrent::EnsureCGLContextIsCurrent(CGLContextObj context)
+    : mOldContext(CGLGetCurrentContext()), mResetContext(mOldContext != context)
+{
+    if (mResetContext)
+    {
+        CGLSetCurrentContext(context);
+    }
+}
+
+EnsureCGLContextIsCurrent::~EnsureCGLContextIsCurrent()
+{
+    if (mResetContext)
+    {
+        CGLSetCurrentContext(mOldContext);
+    }
+}
+
 class FunctionsGLCGL : public FunctionsGL
 {
   public:

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

@@ -164,11 +164,13 @@ WindowSurfaceCGL::WindowSurfaceCGL(const egl::SurfaceState &state,
 
 WindowSurfaceCGL::~WindowSurfaceCGL()
 {
+    EnsureCGLContextIsCurrent ensureContextCurrent(mContext);
+
     pthread_mutex_destroy(&mSwapState.mutex);
 
     if (mDSRenderbuffer != 0)
     {
-        mFunctions->deleteRenderbuffers(1, &mDSRenderbuffer);
+        mStateManager->deleteRenderbuffer(mDSRenderbuffer);
         mDSRenderbuffer = 0;
     }
 
@@ -183,7 +185,7 @@ WindowSurfaceCGL::~WindowSurfaceCGL()
     {
         if (mSwapState.textures[i].texture != 0)
         {
-            mFunctions->deleteTextures(1, &mSwapState.textures[i].texture);
+            mStateManager->deleteTexture(mSwapState.textures[i].texture);
             mSwapState.textures[i].texture = 0;
         }
     }
@@ -191,6 +193,8 @@ WindowSurfaceCGL::~WindowSurfaceCGL()
 
 egl::Error WindowSurfaceCGL::initialize(const egl::Display *display)
 {
+    EnsureCGLContextIsCurrent ensureContextCurrent(mContext);
+
     unsigned width  = getWidth();
     unsigned height = getHeight();