commit 6a1e6b97f24d09c2f07f8008a66ae5cd15982192
author Geoff Lang <geofflang@chromium.org> Thu Nov 06 10:42:45 2014 -0500
committer Geoff Lang <geofflang@chromium.org> Wed Nov 19 17:39:39 2014 +0000
tree d420789333e36bc056c38bbe8eaf3ca38a5ce0fc
parent 44f4d74c0f07fa2329dd651364c9f4616b19acfa

Create a DefaultAttachment type and an implementation for it.

This allows for dynamically sized default attachments instead of calling
Context::makeCurrent each time the surface changes size.

BUG=angle:824

Change-Id: Ic39c0d7dc4269db53a34c01c4d915cb1a3cfbd08
Reviewed-on: https://chromium-review.googlesource.com/228180
Tested-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/validationES.cpp

diff --git a/src/libGLESv2/validationES.cpp b/src/libGLESv2/validationES.cpp
index 382653f..f857ee9 100644
--- a/src/libGLESv2/validationES.cpp
+++ b/src/libGLESv2/validationES.cpp
@@ -573,8 +573,11 @@
 
             if (fromAngleExtension)
             {
-                const GLenum readColorbufferType = readFramebuffer->getReadColorbufferType();
-                if (readColorbufferType != GL_TEXTURE_2D && readColorbufferType != GL_RENDERBUFFER)
+                FramebufferAttachment *readColorAttachment = readFramebuffer->getReadColorbuffer();
+                if (!readColorAttachment ||
+                    (!(readColorAttachment->type() == GL_TEXTURE && readColorAttachment->getTextureImageIndex()->type == GL_TEXTURE_2D) &&
+                    readColorAttachment->type() != GL_RENDERBUFFER &&
+                    readColorAttachment->type() != GL_FRAMEBUFFER_DEFAULT))
                 {
                     context->recordError(Error(GL_INVALID_OPERATION));
                     return false;
@@ -587,7 +590,9 @@
                         FramebufferAttachment *attachment = drawFramebuffer->getColorbuffer(colorAttachment);
                         ASSERT(attachment);
 
-                        if (attachment->type() != GL_TEXTURE_2D && attachment->type() != GL_RENDERBUFFER)
+                        if (!(attachment->type() == GL_TEXTURE && attachment->getTextureImageIndex()->type == GL_TEXTURE_2D) &&
+                            attachment->type() != GL_RENDERBUFFER &&
+                            attachment->type() != GL_FRAMEBUFFER_DEFAULT)
                         {
                             context->recordError(Error(GL_INVALID_OPERATION));
                             return false;