Eliminate D3D9 from Context.

src/libGLESv2/Context.cpp

@@ -33,15 +33,10 @@
 
 namespace gl
 {
-Context::Context(const gl::Context *shareContext, rx::Renderer *renderer, bool notifyResets, bool robustAccess)
+Context::Context(const gl::Context *shareContext, rx::Renderer *renderer, bool notifyResets, bool robustAccess) : mRenderer(renderer)
 {
     ASSERT(robustAccess == false);   // Unimplemented
 
-    ASSERT(dynamic_cast<rx::Renderer9*>(renderer) != NULL); // D3D9_REPLACE
-    mRenderer = static_cast<rx::Renderer9*>(renderer);
-
-    mDevice = NULL;
-
     mFenceHandleAllocator.setBaseHandle(0);
 
     setClearColor(0.0f, 0.0f, 0.0f, 0.0f);
@@ -169,7 +164,7 @@ Context::Context(const gl::Context *shareContext, rx::Renderer *renderer, bool n
     mSupportsEventQueries = false;
     mSupportsOcclusionQueries = false;
     mNumCompressedTextureFormats = 0;
-    mMaskedClearSavedState = NULL;
+
     markAllStateDirty();
 }
 
@@ -231,18 +226,11 @@ Context::~Context()
     mTexture2DZero.set(NULL);
     mTextureCubeMapZero.set(NULL);
 
-    if (mMaskedClearSavedState)
-    {
-        mMaskedClearSavedState->Release();
-    }
-
     mResourceManager->release();
 }
 
 void Context::makeCurrent(egl::Surface *surface)
 {
-    mDevice = mRenderer->getDevice(); // D3D9_REMOVE
-
     if (!mHasBeenCurrent)
     {
         mSupportsShaderModel3 = mRenderer->getShaderModel3Support();

src/libGLESv2/Context.h

@@ -15,7 +15,6 @@
 #include <GLES2/gl2ext.h>
 #define EGLAPI
 #include <EGL/egl.h>
-#include <d3d9.h>
 
 #include <string>
 #include <map>
@@ -442,8 +441,7 @@ class Context
     void initExtensionString();
     void initRendererString();
 
-    IDirect3DDevice9 *mDevice;
-    rx::Renderer9 *mRenderer;  // D3D9_REPLACE
+    rx::Renderer *const mRenderer;
 
     State mState;
 
@@ -492,7 +490,7 @@ class Context
     unsigned int mAppliedTextureSerialPS[MAX_TEXTURE_IMAGE_UNITS];
     unsigned int mAppliedTextureSerialVS[MAX_VERTEX_TEXTURE_IMAGE_UNITS_VTF];
     unsigned int mAppliedProgramBinarySerial;
-    rx::RenderTarget::Desc mRenderTargetDesc; // D3D9_REPLACE
+    rx::RenderTarget::Desc mRenderTargetDesc;
     bool mDxUniformsDirty;
     BindingPointer<ProgramBinary> mCurrentProgramBinary;
     Framebuffer *mBoundDrawFramebuffer;
@@ -525,8 +523,6 @@ class Context
     bool mSupportsTextureFilterAnisotropy;
     int mNumCompressedTextureFormats;
 
-    IDirect3DStateBlock9 *mMaskedClearSavedState;
-
     ResourceManager *mResourceManager;
 };
 }

src/libGLESv2/Fence.cpp

@@ -13,9 +13,11 @@
 namespace gl
 {
 
-Fence::Fence(rx::Renderer9 *renderer)
+Fence::Fence(rx::Renderer *renderer)
 {
-    mRenderer = renderer;
+    ASSERT(dynamic_cast<rx::Renderer9*>(renderer) != NULL); // D3D9_REPLACE
+    mRenderer = static_cast<rx::Renderer9*>(renderer);
+
     mQuery = NULL;
     mCondition = GL_NONE;
     mStatus = GL_FALSE;

src/libGLESv2/Fence.h

@@ -22,7 +22,7 @@ namespace gl
 class Fence
 {
   public:
-    explicit Fence(rx::Renderer9 *renderer);
+    explicit Fence(rx::Renderer *renderer);
     virtual ~Fence();
 
     GLboolean isFence();

src/libGLESv2/Query.cpp

@@ -13,9 +13,11 @@
 namespace gl
 {
 
-Query::Query(rx::Renderer9 *renderer, GLuint id, GLenum type) : RefCountObject(id)
+Query::Query(rx::Renderer *renderer, GLuint id, GLenum type) : RefCountObject(id)
 { 
-    mRenderer = renderer;
+    ASSERT(dynamic_cast<rx::Renderer9*>(renderer) != NULL); // D3D9_REPLACE
+    mRenderer = static_cast<rx::Renderer9*>(renderer);
+
     mQuery = NULL;
     mStatus = GL_FALSE;
     mResult = GL_FALSE;

src/libGLESv2/Query.h

@@ -23,7 +23,7 @@ namespace gl
 class Query : public RefCountObject
 {
   public:
-    Query(rx::Renderer9 *renderer, GLuint id, GLenum type);
+    Query(rx::Renderer *renderer, GLuint id, GLenum type);
     virtual ~Query();
 
     void begin();