commit 3c7fa226aeb81469b93142b54e339f13a46ab835
author Jamie Madill <jmadill@chromium.org> Thu Jun 05 13:08:51 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Tue Jun 10 15:19:42 2014 +0000
tree 0aabe7a588531ceaa19e5cac4444c4549cb903a9
parent 6f38f823362c24062bed35ff7fbf5c35dc7d7f84

Rename Renderbuffer to FramebufferAttachment.

Part of the refactoring effort to clean up our classes for FBO
attachments and Renderbuffers.

BUG=angle:660

Change-Id: Id23df904f56499568159611b66c8922b9dce6a3d
Reviewed-on: https://chromium-review.googlesource.com/201832
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libGLESv2/validationES3.cpp

diff --git a/src/libGLESv2/validationES3.cpp b/src/libGLESv2/validationES3.cpp
index 555c5e3..a45a5a3 100644
--- a/src/libGLESv2/validationES3.cpp
+++ b/src/libGLESv2/validationES3.cpp
@@ -316,7 +316,18 @@
     }
 
     gl::Framebuffer *framebuffer = context->getReadFramebuffer();
-    gl::Renderbuffer *source = framebuffer->getReadColorbuffer();
+
+    if (framebuffer->completeness() != GL_FRAMEBUFFER_COMPLETE)
+    {
+        return gl::error(GL_INVALID_FRAMEBUFFER_OPERATION, false);
+    }
+
+    if (context->getReadFramebufferHandle() != 0 && framebuffer->getSamples() != 0)
+    {
+        return gl::error(GL_INVALID_OPERATION, false);
+    }
+
+    gl::FramebufferAttachment *source = framebuffer->getReadColorbuffer();
     GLenum colorbufferInternalFormat = source->getInternalFormat();
 
     if (isSubImage)