commit 9d4346f0b65ace31bf3e0df8c1f6598e2f32a803
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Oct 31 19:52:04 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Oct 31 19:52:04 2012 +0000
tree c7dded1880890775612a90ee65a630ff0e2e7ff0
parent 0f195ada91c78e852f46f4e148f874aafd4a20d6

Eliminates getD3DTexture, instead returning the texture storage object.

TRAC #21910

Signed-off-by: Daniel Koch

Author:    Shannon Woods

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

src/libGLESv2/Texture.cpp

diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index e0712af..555590b 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -438,18 +438,17 @@
     return true;
 }
 
-// D3D9_REPLACE
-IDirect3DBaseTexture9 *Texture::getD3DTexture()
+TextureStorage *Texture::getNativeTexture()
 {
     // ensure the underlying texture is created
-    if (getStorage(false) == NULL)
+
+    TextureStorage *storage = getStorage(false);
+    if (storage)
     {
-        return NULL;
+        updateTexture();
     }
 
-    updateTexture();
-
-    return getBaseTexture();
+    return storage;
 }
 
 bool Texture::hasDirtyParameters() const