commit 00e3f0c7cdda2b28a7aa888cf73146908b8a0848
author shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:31:02 2013 +0000
committer shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:31:02 2013 +0000
tree 76aa0319afe4ac686103b4d1684691a140841cef
parent f4fe7105a58525321d5a03b084db08e8349bafd3

Refactor Renderer11::getRenderTargetResource to accept a gl::Renderbuffer instead of a gl::Framebuffer.

TRAC #22656

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2078 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/renderer/Image11.cpp

diff --git a/src/libGLESv2/renderer/Image11.cpp b/src/libGLESv2/renderer/Image11.cpp
index 861eb20..8c78c7d 100644
--- a/src/libGLESv2/renderer/Image11.cpp
+++ b/src/libGLESv2/renderer/Image11.cpp
@@ -278,13 +278,15 @@
 
 void Image11::copy(GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height, gl::Framebuffer *source)
 {
-    if (source->getReadColorbuffer() && source->getReadColorbuffer()->getActualFormat() == (GLuint)mActualFormat)
+    gl::Renderbuffer *colorbuffer = source->getReadColorbuffer();
+
+    if (colorbuffer && colorbuffer->getActualFormat() == (GLuint)mActualFormat)
     {
         // No conversion needed-- use copyback fastpath
         ID3D11Texture2D *colorBufferTexture = NULL;
         unsigned int subresourceIndex = 0;
 
-        if (mRenderer->getRenderTargetResource(source, &subresourceIndex, &colorBufferTexture))
+        if (mRenderer->getRenderTargetResource(colorbuffer, &subresourceIndex, &colorBufferTexture))
         {
             D3D11_TEXTURE2D_DESC textureDesc;
             colorBufferTexture->GetDesc(&textureDesc);