Remove the old single-color-attachment calls from gl::Framebuffer, preferring the new multiple-attachment versions.
TRAC #22656
Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Author: Jamie Madill
git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2066 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/renderer/Renderer11.cpp b/src/libGLESv2/renderer/Renderer11.cpp
index a0439b2..3a56e2d 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -814,12 +814,13 @@
bool Renderer11::applyRenderTarget(gl::Framebuffer *framebuffer)
{
+ // TODO: mrt support
// Get the color render buffer and serial
gl::Renderbuffer *renderbufferObject = NULL;
unsigned int renderTargetSerial = 0;
- if (framebuffer->getColorbufferType() != GL_NONE)
+ if (framebuffer->getColorbufferType(0) != GL_NONE)
{
- renderbufferObject = framebuffer->getColorbuffer();
+ renderbufferObject = framebuffer->getColorbuffer(0);
if (!renderbufferObject)
{
@@ -1464,7 +1465,8 @@
{
if (clearParams.mask & GL_COLOR_BUFFER_BIT)
{
- gl::Renderbuffer *renderbufferObject = frameBuffer->getColorbuffer();
+ // TODO: mrt clear
+ gl::Renderbuffer *renderbufferObject = frameBuffer->getColorbuffer(0);
if (renderbufferObject)
{
RenderTarget11 *renderTarget = RenderTarget11::makeRenderTarget11(renderbufferObject->getRenderTarget());
@@ -2406,7 +2408,7 @@
bool Renderer11::copyImage(gl::Framebuffer *framebuffer, const gl::Rectangle &sourceRect, GLenum destFormat,
GLint xoffset, GLint yoffset, TextureStorageInterface2D *storage, GLint level)
{
- gl::Renderbuffer *colorbuffer = framebuffer->getColorbuffer();
+ gl::Renderbuffer *colorbuffer = framebuffer->getReadColorbuffer();
if (!colorbuffer)
{
ERR("Failed to retrieve the color buffer from the frame buffer.");
@@ -2469,7 +2471,7 @@
bool Renderer11::copyImage(gl::Framebuffer *framebuffer, const gl::Rectangle &sourceRect, GLenum destFormat,
GLint xoffset, GLint yoffset, TextureStorageInterfaceCube *storage, GLenum target, GLint level)
{
- gl::Renderbuffer *colorbuffer = framebuffer->getColorbuffer();
+ gl::Renderbuffer *colorbuffer = framebuffer->getReadColorbuffer();
if (!colorbuffer)
{
ERR("Failed to retrieve the color buffer from the frame buffer.");
@@ -2844,7 +2846,8 @@
bool Renderer11::getRenderTargetResource(gl::Framebuffer *framebuffer, unsigned int *subresourceIndex, ID3D11Texture2D **resource)
{
- gl::Renderbuffer *colorbuffer = framebuffer->getColorbuffer();
+ // TODO: mrt supprt
+ gl::Renderbuffer *colorbuffer = framebuffer->getColorbuffer(0);
if (colorbuffer)
{
RenderTarget11 *renderTarget = RenderTarget11::makeRenderTarget11(colorbuffer->getRenderTarget());
@@ -3320,13 +3323,14 @@
bool Renderer11::blitRect(gl::Framebuffer *readTarget, const gl::Rectangle &readRect, gl::Framebuffer *drawTarget,
const gl::Rectangle &drawRect, BlitTarget target)
{
+ // TODO: mrt support
ASSERT(readRect.width == drawRect.width && readRect.height == drawRect.height);
gl::Renderbuffer *readBuffer = NULL;
switch (target)
{
case BLIT_RENDERTARGET:
- readBuffer = readTarget->getColorbuffer();
+ readBuffer = readTarget->getColorbuffer(0);
break;
case BLIT_DEPTHSTENCIL:
readBuffer = readTarget->getDepthOrStencilbuffer();
@@ -3384,7 +3388,7 @@
switch (target)
{
case BLIT_RENDERTARGET:
- drawBuffer = drawTarget->getColorbuffer();
+ drawBuffer = drawTarget->getColorbuffer(0);
break;
case BLIT_DEPTHSTENCIL:
drawBuffer = drawTarget->getDepthOrStencilbuffer();