Removed the setRenderTarget and setDepthStencil methods from the Renderers.

TRAC #22124 Signed-off-by: Nicolas Capens Signed-off-by: Daniel Koch git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1463 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent e06bda99
...@@ -148,9 +148,6 @@ class Renderer ...@@ -148,9 +148,6 @@ class Renderer
virtual void readPixels(gl::Framebuffer *framebuffer, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, 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; GLsizei outputPitch, bool packReverseRowOrder, GLint packAlignment, void* pixels) = 0;
virtual bool setRenderTarget(gl::Renderbuffer *renderbuffer) = 0;
virtual bool setDepthStencil(gl::Renderbuffer *renderbuffer) = 0;
protected: protected:
egl::Display *mDisplay; egl::Display *mDisplay;
......
...@@ -714,20 +714,6 @@ bool Renderer11::copyImage(gl::Framebuffer *framebuffer, const RECT &sourceRect, ...@@ -714,20 +714,6 @@ bool Renderer11::copyImage(gl::Framebuffer *framebuffer, const RECT &sourceRect,
return false; return false;
} }
bool Renderer11::setRenderTarget(gl::Renderbuffer *renderbuffer)
{
// TODO
UNIMPLEMENTED();
return false;
}
bool Renderer11::setDepthStencil(gl::Renderbuffer *renderbuffer)
{
// TODO
UNIMPLEMENTED();
return false;
}
bool Renderer11::blitRect(gl::Framebuffer *readTarget, gl::Rectangle *readRect, gl::Framebuffer *drawTarget, gl::Rectangle *drawRect, bool Renderer11::blitRect(gl::Framebuffer *readTarget, gl::Rectangle *readRect, gl::Framebuffer *drawTarget, gl::Rectangle *drawRect,
bool blitRenderTarget, bool blitDepthStencil) bool blitRenderTarget, bool blitDepthStencil)
{ {
......
...@@ -119,9 +119,6 @@ class Renderer11 : public Renderer ...@@ -119,9 +119,6 @@ class Renderer11 : public Renderer
virtual void readPixels(gl::Framebuffer *framebuffer, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, 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); GLsizei outputPitch, bool packReverseRowOrder, GLint packAlignment, void* pixels);
virtual bool setRenderTarget(gl::Renderbuffer *renderbuffer);
virtual bool setDepthStencil(gl::Renderbuffer *renderbuffer);
// D3D11-renderer specific methods // D3D11-renderer specific methods
ID3D11Device *getDevice() { return mDevice; } ID3D11Device *getDevice() { return mDevice; }
ID3D11DeviceContext *getDeviceContext() { return mDeviceContext; }; ID3D11DeviceContext *getDeviceContext() { return mDeviceContext; };
......
...@@ -2070,64 +2070,6 @@ void Renderer9::readPixels(gl::Framebuffer *framebuffer, GLint x, GLint y, GLsiz ...@@ -2070,64 +2070,6 @@ void Renderer9::readPixels(gl::Framebuffer *framebuffer, GLint x, GLint y, GLsiz
systemSurface->Release(); systemSurface->Release();
} }
bool Renderer9::setRenderTarget(gl::Renderbuffer *renderbuffer)
{
IDirect3DSurface9 *renderTargetSurface = NULL;
if (renderbuffer)
{
RenderTarget *renderTarget = renderbuffer->getRenderTarget();
if (renderTarget)
{
renderTargetSurface = renderTarget->getSurface();
}
if (!renderTargetSurface)
{
ERR("render target pointer unexpectedly null.");
return false; // Context must be lost
}
mDevice->SetRenderTarget(0, renderTargetSurface);
renderTargetSurface->Release();
}
else
{
mDevice->SetRenderTarget(0, NULL);
}
return true;
}
bool Renderer9::setDepthStencil(gl::Renderbuffer *renderbuffer)
{
IDirect3DSurface9 *depthStencilSurface = NULL;
if (renderbuffer)
{
RenderTarget *depthStencil = renderbuffer->getDepthStencil();
if (depthStencil)
{
depthStencilSurface = depthStencil->getSurface();
}
if (!depthStencilSurface)
{
ERR("depth stencil pointer unexpectedly null.");
return false; // Context must be lost
}
mDevice->SetDepthStencilSurface(depthStencilSurface);
depthStencilSurface->Release();
}
else
{
mDevice->SetDepthStencilSurface(NULL);
}
return true;
}
bool Renderer9::boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest) bool Renderer9::boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest)
{ {
return mBlit->boxFilter(source, dest); return mBlit->boxFilter(source, dest);
......
...@@ -144,9 +144,6 @@ class Renderer9 : public Renderer ...@@ -144,9 +144,6 @@ class Renderer9 : public Renderer
virtual void readPixels(gl::Framebuffer *framebuffer, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, 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); GLsizei outputPitch, bool packReverseRowOrder, GLint packAlignment, void* pixels);
virtual bool setRenderTarget(gl::Renderbuffer *renderbuffer);
virtual bool setDepthStencil(gl::Renderbuffer *renderbuffer);
bool boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest); bool boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest);
D3DPOOL getTexturePool(DWORD usage) const; D3DPOOL getTexturePool(DWORD usage) const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment