commit 433bfd3844337b171ed01b0dbacb4ee9b47093fb
author Jamie Madill <jmadill@chromium.org> Mon Oct 20 12:07:36 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Oct 20 17:00:56 2014 +0000
tree eafafaf86e2ece059c22426dc4f218645d8e01db
parent e020bed5a79c211c15db2584cf1c0ca154a123e4

Merge the copyToStorage methods.

BUG=angle:741

Change-Id: I67380748ee875cc2dea61eb82a9b0d600144dc85
Reviewed-on: https://chromium-review.googlesource.com/222267
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@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 f03cbc6..b4fd5a7 100644
--- a/src/libGLESv2/renderer/d3d/TextureD3D.cpp
+++ b/src/libGLESv2/renderer/d3d/TextureD3D.cpp
@@ -1023,7 +1023,7 @@
     if (isValidLevel(level))
     {
         ImageD3D *image = mImageArray[level];
-        gl::Error error = image->copyToStorage2D(mTexStorage, index, region);
+        gl::Error error = image->copyToStorage(mTexStorage, index, region);
         if (error.isError())
         {
             return error;
@@ -1583,7 +1583,7 @@
     if (isValidFaceLevel(faceIndex, level))
     {
         ImageD3D *image = mImageArray[faceIndex][level];
-        gl::Error error = image->copyToStorageCube(mTexStorage, index, region);
+        gl::Error error = image->copyToStorage(mTexStorage, index, region);
         if (error.isError())
         {
             return error;
@@ -2153,7 +2153,7 @@
     if (isValidLevel(level))
     {
         ImageD3D *image = mImageArray[level];
-        gl::Error error = image->copyToStorage3D(mTexStorage, index, region);
+        gl::Error error = image->copyToStorage(mTexStorage, index, region);
         if (error.isError())
         {
             return error;
@@ -2732,7 +2732,7 @@
     if (isValidLevel(level) && layerTarget < getLayerCount(level))
     {
         ImageD3D *image = mImageArray[level][layerTarget];
-        gl::Error error = image->copyToStorage2DArray(mTexStorage, index, region);
+        gl::Error error = image->copyToStorage(mTexStorage, index, region);
         if (error.isError())
         {
             return error;