commit 76b258f88ebb47cf1022ae6b4392f220a56383d4
author Nicolas Capens <nicolascapens@chromium.org> Thu Apr 03 10:59:42 2014 -0400
committer Nicolas Capens <nicolascapens@chromium.org> Wed Apr 16 17:38:09 2014 +0000
tree 9ec164847233038ae6aa13bf7bb1453e2635415f
parent 948f5571fca51fd31662bebbc262b02d11939676

Rename getBaseTexture to getResource, and refactor swizzleRequired.

BUG=angle:596

Change-Id: I72d8796172c5db57ddeb86bbc6c08cbb2ec125f1
Reviewed-on: https://chromium-review.googlesource.com/193230
Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/renderer/d3d11/Renderer11.cpp

diff --git a/src/libGLESv2/renderer/d3d11/Renderer11.cpp b/src/libGLESv2/renderer/d3d11/Renderer11.cpp
index a57956d..3c75c2a 100644
--- a/src/libGLESv2/renderer/d3d11/Renderer11.cpp
+++ b/src/libGLESv2/renderer/d3d11/Renderer11.cpp
@@ -2576,7 +2576,7 @@
         TextureStorage11_2D *source11 = TextureStorage11_2D::makeTextureStorage11_2D(source->getStorageInstance());
         TextureStorage11_2D *dest11 = TextureStorage11_2D::makeTextureStorage11_2D(dest->getStorageInstance());
 
-        mDeviceContext->CopyResource(dest11->getBaseTexture(), source11->getBaseTexture());
+        mDeviceContext->CopyResource(dest11->getResource(), source11->getResource());
 
         dest11->invalidateSwizzleCache();
 
@@ -2593,7 +2593,7 @@
         TextureStorage11_Cube *source11 = TextureStorage11_Cube::makeTextureStorage11_Cube(source->getStorageInstance());
         TextureStorage11_Cube *dest11 = TextureStorage11_Cube::makeTextureStorage11_Cube(dest->getStorageInstance());
 
-        mDeviceContext->CopyResource(dest11->getBaseTexture(), source11->getBaseTexture());
+        mDeviceContext->CopyResource(dest11->getResource(), source11->getResource());
 
         dest11->invalidateSwizzleCache();
 
@@ -2610,7 +2610,7 @@
         TextureStorage11_3D *source11 = TextureStorage11_3D::makeTextureStorage11_3D(source->getStorageInstance());
         TextureStorage11_3D *dest11 = TextureStorage11_3D::makeTextureStorage11_3D(dest->getStorageInstance());
 
-        mDeviceContext->CopyResource(dest11->getBaseTexture(), source11->getBaseTexture());
+        mDeviceContext->CopyResource(dest11->getResource(), source11->getResource());
 
         dest11->invalidateSwizzleCache();
 
@@ -2627,7 +2627,7 @@
         TextureStorage11_2DArray *source11 = TextureStorage11_2DArray::makeTextureStorage11_2DArray(source->getStorageInstance());
         TextureStorage11_2DArray *dest11 = TextureStorage11_2DArray::makeTextureStorage11_2DArray(dest->getStorageInstance());
 
-        mDeviceContext->CopyResource(dest11->getBaseTexture(), source11->getBaseTexture());
+        mDeviceContext->CopyResource(dest11->getResource(), source11->getResource());
 
         dest11->invalidateSwizzleCache();