commit e5dcce75bb08208387723a4e0494ca19073e05a7
author shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:44:33 2013 +0000
committer shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:44:33 2013 +0000
tree b2dad05f2a02c44f9c0e96add7ab001394e90dc3
parent 414e82afa5dd9ee9eb9b7de0ac2e2191cc8dcadf

Updated Image::copy to have a zoffset parameter.

TRAC #22705

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Geoff Lang

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

src/libGLESv2/Texture.cpp

diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index d5811f2..050ef23 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -499,7 +499,7 @@
 
     if (!mImageArray[level]->isRenderableFormat())
     {
-        mImageArray[level]->copy(0, 0, x, y, width, height, source);
+        mImageArray[level]->copy(0, 0, 0, x, y, width, height, source);
         mDirtyImages = true;
     }
     else
@@ -533,7 +533,7 @@
 
     if (!mImageArray[level]->isRenderableFormat() || (!mTexStorage && !isSamplerComplete()))
     {
-        mImageArray[level]->copy(xoffset, yoffset, x, y, width, height, source);
+        mImageArray[level]->copy(xoffset, yoffset, 0, x, y, width, height, source);
         mDirtyImages = true;
     }
     else
@@ -1286,7 +1286,7 @@
 
     if (!mImageArray[faceindex][level]->isRenderableFormat())
     {
-        mImageArray[faceindex][level]->copy(0, 0, x, y, width, height, source);
+        mImageArray[faceindex][level]->copy(0, 0, 0, x, y, width, height, source);
         mDirtyImages = true;
     }
     else
@@ -1326,7 +1326,7 @@
 
     if (!mImageArray[faceindex][level]->isRenderableFormat() || (!mTexStorage && !isSamplerComplete()))
     {
-        mImageArray[faceindex][level]->copy(0, 0, x, y, width, height, source);
+        mImageArray[faceindex][level]->copy(0, 0, 0, x, y, width, height, source);
         mDirtyImages = true;
     }
     else