Moves creation of RenderTargets to the renderer.

src/libGLESv2/Renderbuffer.cpp

@@ -14,10 +14,6 @@
 #include "libGLESv2/Texture.h"
 #include "libGLESv2/utilities.h"
 
-#include "libGLESv2/renderer/RenderTarget9.h" // D3D9_REPLACE
-#include "libGLESv2/renderer/SwapChain9.h" // D3D9_REPLACE
-#include "libGLESv2/renderer/renderer9_utils.h" // D3D9_REPLACE
-
 namespace gl
 {
 unsigned int RenderbufferStorage::mCurrentSerial = 1;
@@ -369,8 +365,8 @@ unsigned int RenderbufferStorage::issueCubeSerials()
 
 Colorbuffer::Colorbuffer(rx::Renderer *renderer, rx::SwapChain *swapChain)
 {
-    rx::SwapChain9 *swapChain9 = static_cast<rx::SwapChain9*>(swapChain);
-    mRenderTarget = new rx::RenderTarget9(renderer, swapChain9->getRenderTarget());
+    mRenderTarget = renderer->createRenderTarget(swapChain, false); 
+
     if (mRenderTarget)
     {
         mWidth = mRenderTarget->getWidth();
@@ -383,8 +379,7 @@ Colorbuffer::Colorbuffer(rx::Renderer *renderer, rx::SwapChain *swapChain)
 
 Colorbuffer::Colorbuffer(rx::Renderer *renderer, int width, int height, GLenum format, GLsizei samples) : mRenderTarget(NULL)
 {
-
-    mRenderTarget = new rx::RenderTarget9(renderer, width, height, format, samples);
+    mRenderTarget = renderer->createRenderTarget(width, height, format, samples, false);
 
     if (mRenderTarget)
     {
@@ -416,8 +411,7 @@ rx::RenderTarget *Colorbuffer::getRenderTarget()
 
 DepthStencilbuffer::DepthStencilbuffer(rx::Renderer *renderer, rx::SwapChain *swapChain)
 {
-    rx::SwapChain9 *swapChain9 = static_cast<rx::SwapChain9*>(swapChain);
-    mDepthStencil = new rx::RenderTarget9(renderer, swapChain9->getDepthStencil());
+    mDepthStencil = renderer->createRenderTarget(swapChain, true);
     if (mDepthStencil)
     {
         mWidth = mDepthStencil->getWidth();
@@ -431,7 +425,7 @@ DepthStencilbuffer::DepthStencilbuffer(rx::Renderer *renderer, rx::SwapChain *sw
 DepthStencilbuffer::DepthStencilbuffer(rx::Renderer *renderer, int width, int height, GLsizei samples)
 {
 
-    mDepthStencil = new rx::RenderTarget9(renderer, width, height, GL_DEPTH24_STENCIL8_OES, samples);
+    mDepthStencil = renderer->createRenderTarget(width, height, GL_DEPTH24_STENCIL8_OES, samples, true);
 
     mWidth = mDepthStencil->getWidth();
     mHeight = mDepthStencil->getHeight();

src/libGLESv2/renderer/Renderer.h

@@ -151,6 +151,9 @@ class Renderer
     virtual void readPixels(gl::Framebuffer *framebuffer, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
                             GLsizei outputPitch, bool packReverseRowOrder, GLint packAlignment, void* pixels) = 0;
 
+    virtual RenderTarget *createRenderTarget(SwapChain *swapChain, bool depth) = 0;
+    virtual RenderTarget *createRenderTarget(int width, int height, GLenum format, GLsizei samples, bool depth) = 0;
+
   protected:
     egl::Display *mDisplay;
 

src/libGLESv2/renderer/Renderer11.cpp

@@ -722,6 +722,20 @@ bool Renderer11::copyImage(gl::Framebuffer *framebuffer, const RECT &sourceRect,
     return false;
 }
 
+RenderTarget *Renderer11::createRenderTarget(SwapChain *swapChain, bool depth)
+{
+    // TODO
+    UNIMPLEMENTED();
+    return NULL;
+}
+
+RenderTarget *Renderer11::createRenderTarget(int width, int height, GLenum format, GLsizei samples, bool depth)
+{
+    // TODO
+    UNIMPLEMENTED();
+    return NULL;
+}
+
 bool Renderer11::blitRect(gl::Framebuffer *readTarget, gl::Rectangle *readRect, gl::Framebuffer *drawTarget, gl::Rectangle *drawRect,
                           bool blitRenderTarget, bool blitDepthStencil)
 {

src/libGLESv2/renderer/Renderer11.h

@@ -121,6 +121,9 @@ class Renderer11 : public Renderer
     virtual void readPixels(gl::Framebuffer *framebuffer, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
                             GLsizei outputPitch, bool packReverseRowOrder, GLint packAlignment, void* pixels);
 
+    virtual RenderTarget *createRenderTarget(SwapChain *swapChain, bool depth);
+    virtual RenderTarget *createRenderTarget(int width, int height, GLenum format, GLsizei samples, bool depth);
+
     // D3D11-renderer specific methods
     ID3D11Device *getDevice() { return mDevice; }
     ID3D11DeviceContext *getDeviceContext() { return mDeviceContext; };

src/libGLESv2/renderer/Renderer9.cpp

@@ -2135,6 +2135,30 @@ void Renderer9::readPixels(gl::Framebuffer *framebuffer, GLint x, GLint y, GLsiz
     systemSurface->Release();
 }
 
+RenderTarget *Renderer9::createRenderTarget(SwapChain *swapChain, bool depth)
+{
+    SwapChain9 *swapChain9 = SwapChain9::makeSwapChain9(swapChain);
+    IDirect3DSurface9 *surface = NULL;
+    if (depth)
+    {
+        surface = swapChain9->getDepthStencil();
+    }
+    else
+    {
+        surface = swapChain9->getRenderTarget();
+    }
+
+    RenderTarget9 *renderTarget = new RenderTarget9(this, surface);
+
+    return renderTarget;
+}
+
+RenderTarget *Renderer9::createRenderTarget(int width, int height, GLenum format, GLsizei samples, bool depth)
+{
+    RenderTarget9 *renderTarget = new RenderTarget9(this, width, height, format, samples);
+    return renderTarget;
+}
+
 bool Renderer9::boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest)
 {
     return mBlit->boxFilter(source, dest);

src/libGLESv2/renderer/Renderer9.h

@@ -189,6 +189,9 @@ class Renderer9 : public Renderer
     virtual void readPixels(gl::Framebuffer *framebuffer, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
                             GLsizei outputPitch, bool packReverseRowOrder, GLint packAlignment, void* pixels);
 
+    virtual RenderTarget *createRenderTarget(SwapChain *swapChain, bool depth);
+    virtual RenderTarget *createRenderTarget(int width, int height, GLenum format, GLsizei samples, bool depth);
+
     bool boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest);
 
     D3DPOOL getTexturePool(DWORD usage) const;