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 MAJOR_VERSION 0
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 683 #define BUILD_REVISION 684
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
...@@ -1488,6 +1488,8 @@ void Texture2D::copyImage(GLint level, GLenum format, GLint x, GLint y, GLsizei ...@@ -1488,6 +1488,8 @@ void Texture2D::copyImage(GLint level, GLenum format, GLint x, GLint y, GLsizei
{ {
convertToRenderTarget(); convertToRenderTarget();
} }
updateTexture();
if (width != 0 && height != 0 && level < levelCount()) if (width != 0 && height != 0 && level < levelCount())
{ {
...@@ -2354,6 +2356,8 @@ void TextureCubeMap::copyImage(GLenum target, GLint level, GLenum format, GLint ...@@ -2354,6 +2356,8 @@ void TextureCubeMap::copyImage(GLenum target, GLint level, GLenum format, GLint
{ {
convertToRenderTarget(); convertToRenderTarget();
} }
updateTexture();
ASSERT(width == height); ASSERT(width == height);
......
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