commit 18fdcbcf1d02d3b3b4b5c712f05058f2e8d629c6
author Jamie Madill <jmadill@chromium.org> Wed Aug 19 18:12:44 2015 +0000
committer Jamie Madill <jmadill@chromium.org> Wed Aug 19 18:23:33 2015 +0000
tree 776bbe7ff56416fbe6e91870ac564d6b0d9569b3
parent 1661fde6c4e528679e85a04557fbbeb5d24e5a7c

Revert "Make the default framebuffer owned by Surface"

Seems to be causing failures on the Mac GPU FYI bots.
SurfaceTest.DestructionDeletesImpl seems to crash.

BUG=angleproject:891
BUG=522557

This reverts commit 264ab56f2e70431e8310f9353952acd3b22b466f.

Change-Id: I80aeecb8e191de011d9afe6534d0285dcffa82a3
Reviewed-on: https://chromium-review.googlesource.com/294540
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index 3325a5c..0752970 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -94,10 +94,15 @@
 
     mState.initializeZeroTextures(mZeroTextures);
 
+    // Allocate default FBO
+    mFramebufferMap[0] = new Framebuffer(mCaps, mRenderer, 0);
+
     bindVertexArray(0);
     bindArrayBuffer(0);
     bindElementArrayBuffer(0);
 
+    bindReadFramebuffer(0);
+    bindDrawFramebuffer(0);
     bindRenderbuffer(0);
 
     bindGenericUniformBuffer(0);
@@ -131,13 +136,10 @@
 {
     mState.reset();
 
-    for (auto framebuffer : mFramebufferMap)
+    while (!mFramebufferMap.empty())
     {
-        // Default framebuffer are owned by their respective Surface
-        if (framebuffer.second->id() != 0)
-        {
-            SafeDelete(framebuffer.second);
-        }
+        // Delete the framebuffer in reverse order to destroy the framebuffer zero last.
+        deleteFramebuffer(mFramebufferMap.rbegin()->first);
     }
 
     while (!mFenceNVMap.empty())
@@ -202,43 +204,60 @@
     {
         releaseSurface();
     }
-    surface->setIsCurrent(true);
-    mCurrentSurface = surface;
 
-    // Update default framebuffer, the binding of the previous default
-    // framebuffer (or lack of) will have a nullptr.
+    ASSERT(mCurrentSurface == nullptr);
+    mCurrentSurface = surface;
+    surface->setIsCurrent(true);
+
+    // Update default framebuffer
+    Framebuffer *defaultFBO = mFramebufferMap[0];
+
+    GLenum drawBufferState = GL_BACK;
+    defaultFBO->setDrawBuffers(1, &drawBufferState);
+    defaultFBO->setReadBuffer(GL_BACK);
+
+    const FramebufferAttachment *backAttachment = defaultFBO->getAttachment(GL_BACK);
+
+    if (backAttachment && backAttachment->getSurface() == surface)
     {
-        Framebuffer *newDefault = surface->getDefaultFramebuffer();
-        if (mState.getReadFramebuffer() == nullptr)
-        {
-            mState.setReadFramebufferBinding(newDefault);
-        }
-        if (mState.getDrawFramebuffer() == nullptr)
-        {
-            mState.setDrawFramebufferBinding(newDefault);
-        }
-        mFramebufferMap[0] = newDefault;
+        // FBO already initialized to the surface.
+        return;
+    }
+
+    const egl::Config *config = surface->getConfig();
+
+    defaultFBO->setAttachment(GL_FRAMEBUFFER_DEFAULT, GL_BACK, ImageIndex::MakeInvalid(), surface);
+
+    if (config->depthSize > 0)
+    {
+        defaultFBO->setAttachment(GL_FRAMEBUFFER_DEFAULT, GL_DEPTH, ImageIndex::MakeInvalid(), surface);
+    }
+    else
+    {
+        defaultFBO->resetAttachment(GL_DEPTH);
+    }
+
+    if (config->stencilSize > 0)
+    {
+        defaultFBO->setAttachment(GL_FRAMEBUFFER_DEFAULT, GL_STENCIL, ImageIndex::MakeInvalid(), surface);
+    }
+    else
+    {
+        defaultFBO->resetAttachment(GL_STENCIL);
     }
 }
 
 void Context::releaseSurface()
 {
-    ASSERT(mCurrentSurface != nullptr);
-
-    // Remove the default framebuffer
+    Framebuffer *defaultFBO = mFramebufferMap[0];
+    if (defaultFBO)
     {
-        Framebuffer *currentDefault = mCurrentSurface->getDefaultFramebuffer();
-        if (mState.getReadFramebuffer() == currentDefault)
-        {
-            mState.setReadFramebufferBinding(nullptr);
-        }
-        if (mState.getDrawFramebuffer() == currentDefault)
-        {
-            mState.setDrawFramebufferBinding(nullptr);
-        }
-        mFramebufferMap.erase(0);
+        defaultFBO->resetAttachment(GL_BACK);
+        defaultFBO->resetAttachment(GL_DEPTH);
+        defaultFBO->resetAttachment(GL_STENCIL);
     }
 
+    ASSERT(mCurrentSurface != nullptr);
     mCurrentSurface->setIsCurrent(false);
     mCurrentSurface = nullptr;
 }
@@ -1383,19 +1402,10 @@
 
 EGLenum Context::getRenderBuffer() const
 {
-    auto framebufferIt = mFramebufferMap.find(0);
-    if (framebufferIt != mFramebufferMap.end())
-    {
-        const Framebuffer *framebuffer              = framebufferIt->second;
-        const FramebufferAttachment *backAttachment = framebuffer->getAttachment(GL_BACK);
-
-        ASSERT(backAttachment != nullptr);
-        return backAttachment->getSurface()->getRenderBuffer();
-    }
-    else
-    {
-        return EGL_NONE;
-    }
+    ASSERT(mFramebufferMap.count(0) > 0);
+    const Framebuffer *framebuffer = mFramebufferMap.find(0)->second;
+    const FramebufferAttachment *backAttachment = framebuffer->getAttachment(GL_BACK);
+    return backAttachment ? backAttachment->getSurface()->getRenderBuffer() : EGL_NONE;
 }
 
 const Caps &Context::getCaps() const