Fix framebuffer zero used after being destroyed in Context destructor.

BUG=angleproject:950 Change-Id: I06e9e6ccf92ee8ca0b1de98cc48ef68a85107214 Reviewed-on: https://chromium-review.googlesource.com/260573Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Gregoire Payen de La Garanderie <Gregory.Payen@imgtec.com>

Fix framebuffer zero used after being destroyed in Context destructor.
ed54e5db · Gregoire Payen de La Garanderie · Jamie Madill · e79904c3 · ed54e5db
Commit ed54e5db authored Mar 17, 2015 by Gregoire Payen de La Garanderie Committed by Jamie Madill Mar 19, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

Context.cpp src/libANGLE/Context.cpp +4 -3

No files found.
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -133,7 +133,8 @@ Context::~Context()

    while (!mFramebufferMap.empty())
    {
-        deleteFramebuffer(mFramebufferMap.begin()->first);
+        // Delete the framebuffer in reverse order to destroy the framebuffer zero last.
+        deleteFramebuffer(mFramebufferMap.rbegin()->first);
    }

    while (!mFenceNVMap.empty())
@@ -1346,12 +1347,12 @@ void Context::detachFramebuffer(GLuint framebuffer)
    // If a framebuffer that is currently bound to the target FRAMEBUFFER is deleted, it is as though
    // BindFramebuffer had been executed with the target of FRAMEBUFFER and framebuffer of zero.

-    if (mState.removeReadFramebufferBinding(framebuffer))
+    if (mState.removeReadFramebufferBinding(framebuffer) && framebuffer != 0)
    {
        bindReadFramebuffer(0);
    }

-    if (mState.removeDrawFramebufferBinding(framebuffer))
+    if (mState.removeDrawFramebufferBinding(framebuffer) && framebuffer != 0)
    {
        bindDrawFramebuffer(0);
    }