commit ef7b016a92a2b3c8d6acb15baae3977cd0ef6b3c
author Geoff Lang <geofflang@chromium.org> Thu Sep 04 13:29:23 2014 -0400
committer Geoff Lang <geofflang@chromium.org> Fri Oct 10 14:19:26 2014 +0000
tree 9d9e05feb0fa3f1bb192106d7b8d0c7ce600f9e0
parent 4119ed3da1d8ce73235a7e05e5aa3c4477ea8d5e

Refactor Texture::copy*Image methods to use gl::Error objects.

BUG=angle:520

Change-Id: I8b6bf5d50ee0d1f796eff52919ee65823fdee6cb
Reviewed-on: https://chromium-review.googlesource.com/216647
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/renderer/Image.cpp

diff --git a/src/libGLESv2/renderer/Image.cpp b/src/libGLESv2/renderer/Image.cpp
index dce409e..d4d6085 100644
--- a/src/libGLESv2/renderer/Image.cpp
+++ b/src/libGLESv2/renderer/Image.cpp
@@ -27,18 +27,14 @@
     mDirty = false;
 }
 
-void Image::copy(GLint xoffset, GLint yoffset, GLint zoffset, const gl::Rectangle &area, gl::Framebuffer *source)
+gl::Error Image::copy(GLint xoffset, GLint yoffset, GLint zoffset, const gl::Rectangle &area, gl::Framebuffer *source)
 {
     gl::FramebufferAttachment *colorbuffer = source->getReadColorbuffer();
-
-    if (!colorbuffer)
-    {
-        return gl::error(GL_OUT_OF_MEMORY);
-    }
+    ASSERT(colorbuffer);
 
     RenderTarget *renderTarget = GetAttachmentRenderTarget(colorbuffer);
     ASSERT(renderTarget);
-    copy(xoffset, yoffset, zoffset, area, renderTarget);
+    return copy(xoffset, yoffset, zoffset, area, renderTarget);
 }
 
 }