Rename renderbufferObject to colorbuffer in Renderer11::applyRenderTarget.

TRAC #22656 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@2013 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 855c746d
...@@ -816,13 +816,13 @@ bool Renderer11::applyRenderTarget(gl::Framebuffer *framebuffer) ...@@ -816,13 +816,13 @@ bool Renderer11::applyRenderTarget(gl::Framebuffer *framebuffer)
{ {
// TODO: mrt support // TODO: mrt support
// Get the color render buffer and serial // Get the color render buffer and serial
gl::Renderbuffer *renderbufferObject = NULL; gl::Renderbuffer *colorbuffer = NULL;
unsigned int renderTargetSerial = 0; unsigned int renderTargetSerial = 0;
if (framebuffer->getColorbufferType(0) != GL_NONE) if (framebuffer->getColorbufferType(0) != GL_NONE)
{ {
renderbufferObject = framebuffer->getColorbuffer(0); colorbuffer = framebuffer->getColorbuffer(0);
if (!renderbufferObject) if (!colorbuffer)
{ {
ERR("render target pointer unexpectedly null."); ERR("render target pointer unexpectedly null.");
return false; return false;
...@@ -831,12 +831,12 @@ bool Renderer11::applyRenderTarget(gl::Framebuffer *framebuffer) ...@@ -831,12 +831,12 @@ bool Renderer11::applyRenderTarget(gl::Framebuffer *framebuffer)
// check for zero-sized default framebuffer, which is a special case. // check for zero-sized default framebuffer, which is a special case.
// in this case we do not wish to modify any state and just silently return false. // in this case we do not wish to modify any state and just silently return false.
// this will not report any gl error but will cause the calling method to return. // this will not report any gl error but will cause the calling method to return.
if (renderbufferObject->getWidth() == 0 || renderbufferObject->getHeight() == 0) if (colorbuffer->getWidth() == 0 || colorbuffer->getHeight() == 0)
{ {
return false; return false;
} }
renderTargetSerial = renderbufferObject->getSerial(); renderTargetSerial = colorbuffer->getSerial();
} }
// Get the depth stencil render buffer and serials // Get the depth stencil render buffer and serials
...@@ -871,9 +871,9 @@ bool Renderer11::applyRenderTarget(gl::Framebuffer *framebuffer) ...@@ -871,9 +871,9 @@ bool Renderer11::applyRenderTarget(gl::Framebuffer *framebuffer)
unsigned int renderTargetHeight = 0; unsigned int renderTargetHeight = 0;
GLenum renderTargetFormat = 0; GLenum renderTargetFormat = 0;
ID3D11RenderTargetView* framebufferRTV = NULL; ID3D11RenderTargetView* framebufferRTV = NULL;
if (renderbufferObject) if (colorbuffer)
{ {
RenderTarget11 *renderTarget = RenderTarget11::makeRenderTarget11(renderbufferObject->getRenderTarget()); RenderTarget11 *renderTarget = RenderTarget11::makeRenderTarget11(colorbuffer->getRenderTarget());
if (!renderTarget) if (!renderTarget)
{ {
ERR("render target pointer unexpectedly null."); ERR("render target pointer unexpectedly null.");
...@@ -887,9 +887,9 @@ bool Renderer11::applyRenderTarget(gl::Framebuffer *framebuffer) ...@@ -887,9 +887,9 @@ bool Renderer11::applyRenderTarget(gl::Framebuffer *framebuffer)
return false; return false;
} }
renderTargetWidth = renderbufferObject->getWidth(); renderTargetWidth = colorbuffer->getWidth();
renderTargetHeight = renderbufferObject->getHeight(); renderTargetHeight = colorbuffer->getHeight();
renderTargetFormat = renderbufferObject->getActualFormat(); renderTargetFormat = colorbuffer->getActualFormat();
} }
// Extract the depth stencil sizes and view // Extract the depth stencil sizes and view
...@@ -922,7 +922,7 @@ bool Renderer11::applyRenderTarget(gl::Framebuffer *framebuffer) ...@@ -922,7 +922,7 @@ bool Renderer11::applyRenderTarget(gl::Framebuffer *framebuffer)
// If there is no render buffer, the width, height and format values come from // If there is no render buffer, the width, height and format values come from
// the depth stencil // the depth stencil
if (!renderbufferObject) if (!colorbuffer)
{ {
renderTargetWidth = depthStencil->getWidth(); renderTargetWidth = depthStencil->getWidth();
renderTargetHeight = depthStencil->getHeight(); renderTargetHeight = depthStencil->getHeight();
......
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