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
diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index 283c0b8..c739736 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -10,6 +10,7 @@
#include "common/debug.h"
#include "libGLESv2/utilities.h"
#include "libGLESv2/renderer/Renderer9.h"
+#include "libGLESv2/renderer/TextureStorage.h"
#include "libEGL/Config.h"
#include "libEGL/Display.h"
@@ -553,8 +554,12 @@
if (texture)
{
- d3dTexture = texture->getD3DTexture();
- // If we get NULL back from getTexture here, something went wrong
+ gl::TextureStorage *texStorage = texture->getNativeTexture();
+ if (texStorage)
+ {
+ d3dTexture = texStorage->getBaseTexture();
+ }
+ // If we get NULL back from getBaseTexture here, something went wrong
// in the texture class and we're unexpectedly missing the d3d texture
ASSERT(d3dTexture != NULL);
}