Pass the Renderer to the Context at construction time

src/libEGL/Display.cpp

@@ -383,7 +383,7 @@ EGLContext Display::createContext(EGLConfig configHandle, const gl::Context *sha
             return NULL;
     }
 
-    gl::Context *context = glCreateContext(shareContext, notifyResets, robustAccess);
+    gl::Context *context = glCreateContext(shareContext, mRenderer, notifyResets, robustAccess);
     mContextSet.insert(context);
 
     return context;

src/libGLESv2/Context.cpp

@@ -36,10 +36,13 @@
 
 namespace gl
 {
-Context::Context(const gl::Context *shareContext, bool notifyResets, bool robustAccess)
+Context::Context(const gl::Context *shareContext, rx::Renderer *renderer, bool notifyResets, bool robustAccess)
 {
     ASSERT(robustAccess == false);   // Unimplemented
 
+    ASSERT(dynamic_cast<rx::Renderer9*>(renderer) != NULL); // D3D9_REPLACE
+    mRenderer = static_cast<rx::Renderer9*>(renderer);
+
     mDisplay = NULL;
     mDevice = NULL;
 
@@ -4373,9 +4376,9 @@ void VertexDeclarationCache::markStateDirty()
 
 extern "C"
 {
-gl::Context *glCreateContext(const gl::Context *shareContext, bool notifyResets, bool robustAccess)
+gl::Context *glCreateContext(const gl::Context *shareContext, rx::Renderer *renderer, bool notifyResets, bool robustAccess)
 {
-    return new gl::Context(shareContext, notifyResets, robustAccess);
+    return new gl::Context(shareContext, renderer, notifyResets, robustAccess);
 }
 
 void glDestroyContext(gl::Context *context)

src/libGLESv2/Context.h

@@ -278,7 +278,7 @@ class VertexDeclarationCache
 class Context
 {
   public:
-    Context(const gl::Context *shareContext, bool notifyResets, bool robustAccess);
+    Context(const gl::Context *shareContext, rx::Renderer *renderer, bool notifyResets, bool robustAccess);
 
     ~Context();
 

src/libGLESv2/main.h

@@ -48,7 +48,7 @@ const T &error(GLenum errorCode, const T &returnValue)
 extern "C"
 {
 // Exported functions for use by EGL
-gl::Context *glCreateContext(const gl::Context *shareContext, bool notifyResets, bool robustAccess);
+gl::Context *glCreateContext(const gl::Context *shareContext, rx::Renderer *renderer, bool notifyResets, bool robustAccess);
 void glDestroyContext(gl::Context *context);
 void glMakeCurrent(gl::Context *context, egl::Display *display, egl::Surface *surface);
 gl::Context *glGetCurrentContext();