Skip to content

A
angle
Commit 406cc109 by daniel@transgaming.com
Options

No need to update texture before overwriting it with CopyImage.

Issue=163 TRAC #17019 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@682 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 3203c108
Showing with 1 addition and 5 deletions
src/common/version.h
#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 681 #define BUILD_REVISION 682
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
src/libGLESv2/Texture.cpp
...@@ -1489,8 +1489,6 @@ void Texture2D::copyImage(GLint level, GLenum format, GLint x, GLint y, GLsizei ...@@ -1489,8 +1489,6 @@ 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())
{ {
RECT sourceRect = transformPixelRect(x, y, width, height, source->getColorbuffer()->getHeight()); RECT sourceRect = transformPixelRect(x, y, width, height, source->getColorbuffer()->getHeight());
...@@ -2357,8 +2355,6 @@ void TextureCubeMap::copyImage(GLenum target, GLint level, GLenum format, GLint ...@@ -2357,8 +2355,6 @@ void TextureCubeMap::copyImage(GLenum target, GLint level, GLenum format, GLint
convertToRenderTarget(); convertToRenderTarget();
} }
updateTexture();
ASSERT(width == height); ASSERT(width == height);
if (width > 0 && level < levelCount()) 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