commit ae39ee280d5e15b8064402b75e8daecbe4146b98
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 19:42:02 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 19:42:02 2012 +0000
tree 867bcc3b7d673a1d47af49040d7403d586c5edd0
parent c43a60557d5e25cfb80cb0cd3c2a01920251745f

Renderer::applyRenderTarget now returns a success/failure bool.

TRAC #22124

Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1460 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/renderer/Renderer.h

diff --git a/src/libGLESv2/renderer/Renderer.h b/src/libGLESv2/renderer/Renderer.h
index 2b2ad93..9128dc9 100644
--- a/src/libGLESv2/renderer/Renderer.h
+++ b/src/libGLESv2/renderer/Renderer.h
@@ -90,7 +90,7 @@
                              unsigned int renderTargetWidth, unsigned int renderTargetHeight,
                              gl::ProgramBinary *currentProgram, bool forceSetUniforms) = 0;
 
-    virtual void applyRenderTarget(gl::Framebuffer *frameBuffer) = 0;
+    virtual bool applyRenderTarget(gl::Framebuffer *frameBuffer) = 0;
 
     virtual void clear(GLbitfield mask, const gl::Color &colorClear, float depthClear, int stencilClear,
                        gl::Framebuffer *frameBuffer) = 0;

src/libGLESv2/renderer/Renderer11.cpp

diff --git a/src/libGLESv2/renderer/Renderer11.cpp b/src/libGLESv2/renderer/Renderer11.cpp
index 248bc36..1dd4773 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -380,12 +380,14 @@
     return true;
 }
 
-void Renderer11::applyRenderTarget(gl::Framebuffer *frameBuffer)
+bool Renderer11::applyRenderTarget(gl::Framebuffer *frameBuffer)
 {
     // TODO
     UNIMPLEMENTED();
 
     mForceSetScissor = true;
+
+    return true;
 }
 
 void Renderer11::clear(GLbitfield mask, const gl::Color &colorClear, float depthClear, int stencilClear,

src/libGLESv2/renderer/Renderer11.h

diff --git a/src/libGLESv2/renderer/Renderer11.h b/src/libGLESv2/renderer/Renderer11.h
index 539781f..cab8c0b 100644
--- a/src/libGLESv2/renderer/Renderer11.h
+++ b/src/libGLESv2/renderer/Renderer11.h
@@ -61,7 +61,7 @@
                              unsigned int renderTargetWidth, unsigned int renderTargetHeight,
                              gl::ProgramBinary *currentProgram, bool forceSetUniforms);
 
-    virtual void applyRenderTarget(gl::Framebuffer *frameBuffer);
+    virtual bool applyRenderTarget(gl::Framebuffer *frameBuffer);
 
     virtual void clear(GLbitfield mask, const gl::Color &colorClear, float depthClear, int stencilClear,
                        gl::Framebuffer *frameBuffer);

src/libGLESv2/renderer/Renderer9.cpp

diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index 10a858e..7e7b8e0 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -924,13 +924,15 @@
     return true;
 }
 
-void Renderer9::applyRenderTarget(gl::Framebuffer *frameBuffer)
+bool Renderer9::applyRenderTarget(gl::Framebuffer *framebuffer)
 {
     // TODO: only set these when the rendertarget actually changes
     mForceSetScissor = true;
     mForceSetViewport = true;
 
     // TODO
+
+    return true;
 }
 
 void Renderer9::clear(GLbitfield mask, const gl::Color &colorClear, float depthClear, int stencilClear,

src/libGLESv2/renderer/Renderer9.h

diff --git a/src/libGLESv2/renderer/Renderer9.h b/src/libGLESv2/renderer/Renderer9.h
index dc69296..65458a0 100644
--- a/src/libGLESv2/renderer/Renderer9.h
+++ b/src/libGLESv2/renderer/Renderer9.h
@@ -81,7 +81,7 @@
                              unsigned int renderTargetWidth, unsigned int renderTargetHeight,
                              gl::ProgramBinary *currentProgram, bool forceSetUniforms);
 
-    virtual void applyRenderTarget(gl::Framebuffer *frameBuffer);
+    virtual bool applyRenderTarget(gl::Framebuffer *frameBuffer);
 
     virtual void clear(GLbitfield mask, const gl::Color &colorClear, float depthClear, int stencilClear,
                        gl::Framebuffer *frameBuffer);