Revert copyImage changes from r682 as they cause regressions on some webpages

git-svn-id: https://angleproject.googlecode.com/svn/trunk@684 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 82e7e9d0
#define MAJOR_VERSION 0
#define MINOR_VERSION 0
#define BUILD_VERSION 0
#define BUILD_REVISION 683
#define BUILD_REVISION 684
#define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x)
......
......@@ -1489,6 +1489,8 @@ void Texture2D::copyImage(GLint level, GLenum format, GLint x, GLint y, GLsizei
convertToRenderTarget();
}
updateTexture();
if (width != 0 && height != 0 && level < levelCount())
{
RECT sourceRect = transformPixelRect(x, y, width, height, source->getColorbuffer()->getHeight());
......@@ -2355,6 +2357,8 @@ void TextureCubeMap::copyImage(GLenum target, GLint level, GLenum format, GLint
convertToRenderTarget();
}
updateTexture();
ASSERT(width == height);
if (width > 0 && level < levelCount())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment