Eliminate D3D9 from Context.
TRAC #22016
Signed-off-by: Daniel Koch
Signed-off-by: Geoff Lang
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1494 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index 7ba1036..19fd8c5 100644
--- a/src/libGLESv2/Context.cpp
+++ b/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 @@
mSupportsEventQueries = false;
mSupportsOcclusionQueries = false;
mNumCompressedTextureFormats = 0;
- mMaskedClearSavedState = NULL;
+
markAllStateDirty();
}
@@ -231,18 +226,11 @@
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();