Pass swapchain to Colorbuffer constructor instead of a d3d9 surface

src/libGLESv2/Context.cpp

@@ -319,20 +319,14 @@ void Context::makeCurrent(egl::Display *display, egl::Surface *surface)
     // Wrap the existing Direct3D 9 resources into GL objects and assign them to the '0' names
     // D3D9_REPLACE
     renderer::SwapChain *swapchain = surface->getSwapChain();
-    IDirect3DSurface9 *defaultRenderTarget = swapchain->getRenderTarget();
     IDirect3DSurface9 *depthStencil = swapchain->getDepthStencil();
 
-    Colorbuffer *colorbufferZero = new Colorbuffer(defaultRenderTarget);
+    Colorbuffer *colorbufferZero = new Colorbuffer(swapchain);
     DepthStencilbuffer *depthStencilbufferZero = new DepthStencilbuffer(depthStencil);
     Framebuffer *framebufferZero = new DefaultFramebuffer(colorbufferZero, depthStencilbufferZero);
 
     setFramebufferZero(framebufferZero);
 
-    if (defaultRenderTarget)
-    {
-        defaultRenderTarget->Release();
-    }
-
     if (depthStencil)
     {
         depthStencil->Release();

src/libGLESv2/Renderbuffer.cpp

@@ -379,14 +379,13 @@ unsigned int RenderbufferStorage::issueCubeSerials()
     return firstSerial;
 }
 
-Colorbuffer::Colorbuffer(IDirect3DSurface9 *renderTarget) : mRenderTarget(renderTarget)
+Colorbuffer::Colorbuffer(renderer::SwapChain *swapChain)
 {
-    if (renderTarget)
+    mRenderTarget = swapChain->getRenderTarget();
+    if (mRenderTarget)
     {
-        renderTarget->AddRef();
-
         D3DSURFACE_DESC description;
-        renderTarget->GetDesc(&description);
+        mRenderTarget->GetDesc(&description);
 
         mWidth = description.Width;
         mHeight = description.Height;

src/libGLESv2/Renderbuffer.h

@@ -19,6 +19,8 @@
 #include "common/angleutils.h"
 #include "common/RefCountObject.h"
 
+#include "renderer/SwapChain.h"
+
 namespace gl
 {
 class Texture2D;
@@ -199,7 +201,7 @@ class Renderbuffer : public RefCountObject
 class Colorbuffer : public RenderbufferStorage
 {
   public:
-    explicit Colorbuffer(IDirect3DSurface9 *renderTarget);
+    explicit Colorbuffer(renderer::SwapChain *swapChain);
     Colorbuffer(GLsizei width, GLsizei height, GLenum format, GLsizei samples);
 
     virtual ~Colorbuffer();