commit 6ab01b9ac55a290afaaac704ca0fcb0dd2cf1386
author Corentin Wallez <cwallez@chromium.org> Mon Aug 03 10:16:36 2015 -0700
committer Corentin Wallez <cwallez@chromium.org> Tue Aug 04 21:38:05 2015 +0000
tree a6a0fe4ab3203f62879e1f43a8ecf6fff7603c06
parent c384d2a3cd9d8ec92723685b3fcca11cc800c6aa

FramebufferGL: Add a member to know if we are the default FBO

On CGL, the default framebuffer will have a name different than 0 and
without this change it wouldn't get special-cased as on the other
platforms. It is assumed that the default framebuffer will get
initialized directly by the driver or other parts of the code.

BUG=angleproject:891

Change-Id: Ifbe4ada58f27ad9ddb5b43697c234cb17e7504f0
Reviewed-on: https://chromium-review.googlesource.com/290147
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

src/libANGLE/renderer/gl/FramebufferGL.cpp

diff --git a/src/libANGLE/renderer/gl/FramebufferGL.cpp b/src/libANGLE/renderer/gl/FramebufferGL.cpp
index 37ebe78..61f55eb 100644
--- a/src/libANGLE/renderer/gl/FramebufferGL.cpp
+++ b/src/libANGLE/renderer/gl/FramebufferGL.cpp
@@ -26,9 +26,10 @@
     : FramebufferImpl(data),
       mFunctions(functions),
       mStateManager(stateManager),
-      mFramebufferID(0)
+      mFramebufferID(0),
+      mIsDefault(isDefault)
 {
-    if (!isDefault)
+    if (!mIsDefault)
     {
         mFunctions->genFramebuffers(1, &mFramebufferID);
     }
@@ -92,7 +93,7 @@
 
 void FramebufferGL::onUpdateColorAttachment(size_t index)
 {
-    if (mFramebufferID != 0)
+    if (!mIsDefault)
     {
         mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
         BindFramebufferAttachment(mFunctions,
@@ -103,7 +104,7 @@
 
 void FramebufferGL::onUpdateDepthAttachment()
 {
-    if (mFramebufferID != 0)
+    if (!mIsDefault)
     {
         mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
         BindFramebufferAttachment(mFunctions,
@@ -114,7 +115,7 @@
 
 void FramebufferGL::onUpdateStencilAttachment()
 {
-    if (mFramebufferID != 0)
+    if (!mIsDefault)
     {
         mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
         BindFramebufferAttachment(mFunctions,
@@ -125,7 +126,7 @@
 
 void FramebufferGL::onUpdateDepthStencilAttachment()
 {
-    if (mFramebufferID != 0)
+    if (!mIsDefault)
     {
         mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
         BindFramebufferAttachment(mFunctions,
@@ -136,7 +137,7 @@
 
 void FramebufferGL::setDrawBuffers(size_t count, const GLenum *buffers)
 {
-    if (mFramebufferID != 0)
+    if (!mIsDefault)
     {
         mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
         mFunctions->drawBuffers(count, buffers);
@@ -145,7 +146,7 @@
 
 void FramebufferGL::setReadBuffer(GLenum buffer)
 {
-    if (mFramebufferID != 0)
+    if (!mIsDefault)
     {
         mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
         mFunctions->readBuffer(buffer);