commit 6b51c1a08c314d4fc665e6034234059af207aaae
author Jamie Madill <jmadill@chromium.org> Mon Oct 06 16:31:21 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Tue Oct 07 14:01:43 2014 +0000
tree e21116feb819bceb5765f91276c3c225b2e1a686
parent c8d13843330acb2c6fa8434321f00da58e1f8edb

Use ImageIndex in copyToStorage.

Also change the image association methods in TexStorage to use
ImageIndex, for consistency and compatibility.

BUG=angle:729

Change-Id: I05afa803735c9b93ae7d623fee5e6899c9ccec28
Reviewed-on: https://chromium-review.googlesource.com/221722
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libGLESv2/renderer/d3d/TextureD3D.cpp

diff --git a/src/libGLESv2/renderer/d3d/TextureD3D.cpp b/src/libGLESv2/renderer/d3d/TextureD3D.cpp
index 4d0f4fb..8b458db 100644
--- a/src/libGLESv2/renderer/d3d/TextureD3D.cpp
+++ b/src/libGLESv2/renderer/d3d/TextureD3D.cpp
@@ -850,7 +850,7 @@
     if (isValidLevel(level))
     {
         ImageD3D *image = mImageArray[level];
-        gl::Error error = image->copyToStorage2D(mTexStorage, level, region.x, region.y, region.width, region.height);
+        gl::Error error = image->copyToStorage2D(mTexStorage, index, region);
         if (error.isError())
         {
             return error;
@@ -1319,7 +1319,7 @@
     if (isValidFaceLevel(faceIndex, level))
     {
         ImageD3D *image = mImageArray[faceIndex][level];
-        gl::Error error = image->copyToStorageCube(mTexStorage, faceIndex, level, region.x, region.y, region.width, region.height);
+        gl::Error error = image->copyToStorageCube(mTexStorage, index, region);
         if (error.isError())
         {
             return error;
@@ -1813,7 +1813,7 @@
     if (isValidLevel(level))
     {
         ImageD3D *image = mImageArray[level];
-        gl::Error error = image->copyToStorage3D(mTexStorage, level, region.x, region.y, region.z, region.width, region.height, region.depth);
+        gl::Error error = image->copyToStorage3D(mTexStorage, index, region);
         if (error.isError())
         {
             return error;
@@ -2322,7 +2322,7 @@
     if (isValidLevel(level) && layerTarget < getLayerCount(level))
     {
         ImageD3D *image = mImageArray[level][layerTarget];
-        gl::Error error = image->copyToStorage2DArray(mTexStorage, level, region.x, region.y, layerTarget, region.width, region.height);
+        gl::Error error = image->copyToStorage2DArray(mTexStorage, index, region);
         if (error.isError())
         {
             return error;