Removes extraneous D3D9-ims in TextureStorage code.

src/libGLESv2/Texture.cpp

@@ -20,7 +20,7 @@
 #include "libGLESv2/mathutil.h"
 #include "libGLESv2/utilities.h"
 #include "libGLESv2/renderer/Blit.h"
-#include "libGLESv2/renderer/SwapChain9.h"
+#include "libGLESv2/renderer/SwapChain.h"
 #include "libGLESv2/Framebuffer.h"
 
 namespace gl
@@ -449,8 +449,7 @@ void Texture2D::bindTexImage(egl::Surface *surface)
     mImageArray[0]->redefine(mRenderer, internalformat, surface->getWidth(), surface->getHeight(), true);
 
     delete mTexStorage;
-    rx::SwapChain9 *swapchain = static_cast<rx::SwapChain9*>(surface->getSwapChain());  // D3D9_REPLACE
-    mTexStorage = new rx::TextureStorageInterface2D(mRenderer, swapchain);
+    mTexStorage = new rx::TextureStorageInterface2D(mRenderer, surface->getSwapChain());
 
     mDirtyImages = true;
     mSurface = surface;

src/libGLESv2/renderer/IndexDataManager.h

@@ -26,6 +26,7 @@ namespace
 
 namespace rx
 {
+class Renderer9;
 
 struct TranslatedIndexData
 {

src/libGLESv2/renderer/TextureStorage.cpp

@@ -10,11 +10,9 @@
 
 #include "libGLESv2/main.h"
 #include "libGLESv2/renderer/TextureStorage.h"
-#include "libGLESv2/renderer/TextureStorage9.h"
-#include "libGLESv2/renderer/SwapChain9.h"
+#include "libGLESv2/renderer/SwapChain.h"
 #include "libGLESv2/renderer/Blit.h"
-#include "libGLESv2/renderer/RenderTarget9.h"
-#include "libGLESv2/renderer/renderer9_utils.h"
+#include "libGLESv2/renderer/RenderTarget.h"
 
 #include "common/debug.h"
 
@@ -65,7 +63,7 @@ int TextureStorageInterface::levelCount()
     return mInstance->levelCount();
 }
 
-TextureStorageInterface2D::TextureStorageInterface2D(Renderer *renderer, SwapChain9 *swapchain) 
+TextureStorageInterface2D::TextureStorageInterface2D(Renderer *renderer, SwapChain *swapchain) 
     : mRenderTargetSerial(gl::RenderbufferStorage::issueSerial())
 {
     mInstance = renderer->createTextureStorage2D(swapchain);

src/libGLESv2/renderer/TextureStorage.h

@@ -19,10 +19,8 @@
 
 namespace rx
 {
-class Renderer9;
-class SwapChain9;
+class SwapChain;
 class RenderTarget;
-class RenderTarget9;
 class Blit;
 
 class TextureStorage
@@ -77,7 +75,7 @@ class TextureStorageInterface
 class TextureStorageInterface2D : public TextureStorageInterface
 {
   public:
-    TextureStorageInterface2D(Renderer *renderer, SwapChain9 *swapchain);
+    TextureStorageInterface2D(Renderer *renderer, SwapChain *swapchain);
     TextureStorageInterface2D(Renderer *renderer, int levels, GLenum internalformat, GLenum usage, bool forceRenderable, GLsizei width, GLsizei height);
     virtual ~TextureStorageInterface2D();