Make egl::Surface independent of the Renderer implementation.

src/libEGL/Surface.cpp

@@ -28,7 +28,7 @@ namespace egl
 Surface::Surface(Display *display, const Config *config, HWND window, EGLint postSubBufferSupported) 
     : mDisplay(display), mConfig(config), mWindow(window), mPostSubBufferSupported(postSubBufferSupported)
 {
-    mRenderer = mDisplay->getRenderer9();
+    mRenderer = mDisplay->getRenderer();
     mSwapChain = NULL;
     mShareHandle = NULL;
     mTexture = NULL;
@@ -97,7 +97,7 @@ bool Surface::initialize()
 
 void Surface::release()
 {
-    glDestroySwapChain(mSwapChain);
+    delete mSwapChain;
     mSwapChain = NULL;
 
     if (mTexture)
@@ -135,8 +135,9 @@ bool Surface::resetSwapChain()
         height = mHeight;
     }
 
-    mSwapChain = glCreateSwapChain(mRenderer, mWindow, mShareHandle,
-                                   mConfig->mRenderTargetFormat, mConfig->mDepthStencilFormat);
+    mSwapChain = mRenderer->createSwapChain(mWindow, mShareHandle,
+                                            mConfig->mRenderTargetFormat,
+                                            mConfig->mDepthStencilFormat);
     if (!mSwapChain)
     {
         return error(EGL_BAD_ALLOC, false);
@@ -144,7 +145,7 @@ bool Surface::resetSwapChain()
 
     if (!resetSwapChain(width, height))
     {
-        glDestroySwapChain(mSwapChain);
+        delete mSwapChain;
         mSwapChain = NULL;
         return false;
     }

src/libEGL/Surface.h

@@ -22,7 +22,7 @@ class Texture2D;
 }
 namespace rx
 {
-class Renderer9;
+class Renderer;
 class SwapChain;
 }
 
@@ -68,7 +68,7 @@ private:
     DISALLOW_COPY_AND_ASSIGN(Surface);
 
     Display *const mDisplay;
-    rx::Renderer9 *mRenderer;   // D3D9_REPLACE
+    rx::Renderer *mRenderer;
 
     HANDLE mShareHandle;
     rx::SwapChain *mSwapChain;

src/libGLESv2/Context.cpp

@@ -1924,7 +1924,7 @@ void Context::applyState(GLenum drawMode)
     GLint alwaysFront = !isTriangleMode(drawMode);
     programBinary->setUniform1iv(pointsOrLines, 1, &alwaysFront);
 
-    const gl::Renderbuffer *depthbuffer = framebufferObject->getDepthbuffer();
+    const gl::Renderbuffer *depthbuffer = framebufferObject->getDepthbuffer();
     unsigned int depthSize = depthbuffer ? depthbuffer->getDepthSize() : 0;
 
     mRenderer->setRasterizerState(mState.rasterizer, depthSize);
@@ -4076,16 +4076,4 @@ gl::Context *glGetCurrentContext()
     return gl::getContext();
 }
 
-rx::SwapChain *glCreateSwapChain(rx::Renderer9 *renderer, HWND window, HANDLE shareHandle,
-                                       GLenum backBufferFormat, GLenum depthBufferFormat)
-{
-    return new rx::SwapChain(renderer, window, shareHandle, backBufferFormat, depthBufferFormat);
-}
-
-void glDestroySwapChain(rx::SwapChain *swapChain)
-{
-    delete swapChain;
-}
-
-
 }

src/libGLESv2/libGLESv2.def

@@ -181,6 +181,4 @@ EXPORTS
     glGetProcAddress                @148 NONAME
     glBindTexImage                  @158 NONAME
     glCreateRenderer                @177 NONAME
-    glDestroyRenderer               @178 NONAME
-    glCreateSwapChain               @179 NONAME
+    glDestroyRenderer               @178 NONAME
\ No newline at end of file
-    glDestroySwapChain              @180 NONAME

src/libGLESv2/main.h

@@ -54,9 +54,6 @@ void glMakeCurrent(gl::Context *context, egl::Display *display, egl::Surface *su
 gl::Context *glGetCurrentContext();
 rx::Renderer *glCreateRenderer(egl::Display *display, HDC hDc, bool softwareDevice);
 void glDestroyRenderer(rx::Renderer *renderer);
-rx::SwapChain *glCreateSwapChain(rx::Renderer9 *renderer, HWND window, HANDLE shareHandle,
-                                       GLenum backBufferFormat, GLenum depthBufferFormat);  // D3D9_REPLACE
-void glDestroySwapChain(rx::SwapChain *swapChain);
 
 __eglMustCastToProperFunctionPointerType __stdcall glGetProcAddress(const char *procname);
 bool __stdcall glBindTexImage(egl::Surface *surface);

src/libGLESv2/renderer/Renderer.h

@@ -68,6 +68,8 @@ class Renderer
 
     virtual void sync(bool block) = 0;
 
+    virtual SwapChain *createSwapChain(HWND window, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat) = 0;
+
     virtual void setSamplerState(gl::SamplerType type, int index, const gl::SamplerState &sampler) = 0;
     virtual void setTexture(gl::SamplerType type, int index, gl::Texture *texture) = 0;
 

src/libGLESv2/renderer/Renderer11.cpp

@@ -31,6 +31,8 @@ Renderer11::Renderer11(egl::Display *display, HDC hDc) : Renderer(display), mDc(
     mD3d11Module = NULL;
     mDxgiModule = NULL;
 
+    mDeviceLost = false;
+
     mDevice = NULL;
     mDeviceContext = NULL;
     mDxgiAdapter = NULL;
@@ -224,6 +226,16 @@ void Renderer11::sync(bool block)
     UNIMPLEMENTED();
 }
 
+SwapChain *Renderer11::createSwapChain(HWND window, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat)
+{
+    // TODO
+    UNIMPLEMENTED();
+
+    //return new rx::SwapChain(this, window, shareHandle, backBufferFormat, depthBufferFormat);
+
+    return NULL;
+}
+
 void Renderer11::setSamplerState(gl::SamplerType type, int index, const gl::SamplerState &samplerState)
 {
     // TODO
@@ -298,7 +310,7 @@ bool Renderer11::testDeviceLost(bool notify)
     bool isLost = false;
 
     // TODO
-    UNIMPLEMENTED();
+    //UNIMPLEMENTED();
 
     if (isLost)
     {
@@ -484,7 +496,7 @@ bool Renderer11::getInstancingSupport() const
 bool Renderer11::getShareHandleSupport() const
 {
     // TODO
-    UNIMPLEMENTED();
+    //UNIMPLEMENTED();
 
     // PIX doesn't seem to support using share handles, so disable them.
     return false && !gl::perfActive();

src/libGLESv2/renderer/Renderer11.h

@@ -42,6 +42,8 @@ class Renderer11 : public Renderer
 
     virtual void sync(bool block);
 
+    virtual SwapChain *createSwapChain(HWND window, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat);
+
     virtual void setSamplerState(gl::SamplerType type, int index, const gl::SamplerState &sampler);
     virtual void setTexture(gl::SamplerType type, int index, gl::Texture *texture);
 

src/libGLESv2/renderer/Renderer9.cpp

@@ -502,6 +502,11 @@ void Renderer9::sync(bool block)
     }
 }
 
+SwapChain *Renderer9::createSwapChain(HWND window, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat)
+{
+    return new rx::SwapChain(this, window, shareHandle, backBufferFormat, depthBufferFormat);
+}
+
 // D3D9_REPLACE
 IDirect3DQuery9* Renderer9::allocateEventQuery()
 {

src/libGLESv2/renderer/Renderer9.h

@@ -44,6 +44,9 @@ class Renderer9 : public Renderer
     virtual void endScene();
 
     virtual void sync(bool block);
+
+    virtual SwapChain *createSwapChain(HWND window, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat);
+
     IDirect3DQuery9* allocateEventQuery();
     void freeEventQuery(IDirect3DQuery9* query);