commit ac7579c2bd0cc9afdf5892a766e6967bf3a341f0
author Jamie Madill <jmadill@chromium.org> Wed Sep 17 16:59:33 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Thu Sep 18 18:39:26 2014 +0000
tree 6c8e04b06c31b7283370831262a99acc6073f28b
parent 02f18b883992598ffc22c2747720f17da65a330e

Use ImageIndex in getRenderTarget.

Also change ImageIndex to allow invalid indexes for layer. In 3D
indexes, sometimes the layer parameter is invalid, indicating we
index an entire mip level instead of a layer of a mip level.

BUG=angle:741

Change-Id: I7b410f9aaf568f215bb93ae063934669a8fa09bd
Reviewed-on: https://chromium-review.googlesource.com/218312
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libGLESv2/Framebuffer.cpp

diff --git a/src/libGLESv2/Framebuffer.cpp b/src/libGLESv2/Framebuffer.cpp
index e82e34d..5b21433 100644
--- a/src/libGLESv2/Framebuffer.cpp
+++ b/src/libGLESv2/Framebuffer.cpp
@@ -29,8 +29,9 @@
         gl::Texture *texture = attachment->getTexture();
         ASSERT(texture);
         TextureD3D *textureD3D = TextureD3D::makeTextureD3D(texture->getImplementation());
-
-        return textureD3D->getRenderTarget(attachment->mipLevel(), attachment->layer());
+        const gl::ImageIndex *index = attachment->getTextureImageIndex();
+        ASSERT(index);
+        return textureD3D->getRenderTarget(*index);
     }
 
     gl::Renderbuffer *renderbuffer = attachment->getRenderbuffer();
@@ -48,7 +49,9 @@
         gl::Texture *texture = attachment->getTexture();
         ASSERT(texture);
         TextureD3D *textureD3D = TextureD3D::makeTextureD3D(texture->getImplementation());
-        return textureD3D->getRenderTargetSerial(attachment->mipLevel(), attachment->layer());
+        const gl::ImageIndex *index = attachment->getTextureImageIndex();
+        ASSERT(index);
+        return textureD3D->getRenderTargetSerial(*index);
     }
 
     gl::Renderbuffer *renderbuffer = attachment->getRenderbuffer();