commit 1d743d3dd706f6055ca6bc3ad0a4afcde0b7461d
author Jamie Madill <jmadill@chromium.org> Wed Sep 03 15:07:18 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Fri Sep 05 21:22:24 2014 +0000
tree 541251587472017636e3fdffb02e8198aadd02a2
parent de3ed7043b930b54a4441e83d7ba53fac6d45fd4

Eliminate typed render target Texture attachment method.

More convergance to the base TextureAttachment class.

BUG=angle:732

Change-Id: I9aae1a49ab3908a4eb4cec4bce201b88a7d93926
Reviewed-on: https://chromium-review.googlesource.com/213859
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

src/libGLESv2/FramebufferAttachment.cpp

diff --git a/src/libGLESv2/FramebufferAttachment.cpp b/src/libGLESv2/FramebufferAttachment.cpp
index b611a44..a354a89 100644
--- a/src/libGLESv2/FramebufferAttachment.cpp
+++ b/src/libGLESv2/FramebufferAttachment.cpp
@@ -138,6 +138,16 @@
     return mIndex.layerIndex;
 }
 
+rx::RenderTarget *TextureAttachment::getRenderTarget()
+{
+    return getTexture()->getRenderTarget(mIndex);
+}
+
+unsigned int TextureAttachment::getSerial() const
+{
+    return getTexture()->getRenderTargetSerial(mIndex);
+}
+
 ///// Texture2DAttachment Implementation ////////
 
 Texture2DAttachment::Texture2DAttachment(GLenum binding, Texture2D *texture, GLint level)
@@ -152,16 +162,6 @@
     mTexture2D.set(NULL);
 }
 
-rx::RenderTarget *Texture2DAttachment::getRenderTarget()
-{
-    return mTexture2D->getRenderTarget(mLevel);
-}
-
-unsigned int Texture2DAttachment::getSerial() const
-{
-    return mTexture2D->getRenderTargetSerial(mLevel);
-}
-
 Texture *Texture2DAttachment::getTexture() const
 {
     return mTexture2D.get();
@@ -182,16 +182,6 @@
     mTextureCubeMap.set(NULL);
 }
 
-rx::RenderTarget *TextureCubeMapAttachment::getRenderTarget()
-{
-    return mTextureCubeMap->getRenderTarget(mFaceTarget, mLevel);
-}
-
-unsigned int TextureCubeMapAttachment::getSerial() const
-{
-    return mTextureCubeMap->getRenderTargetSerial(mFaceTarget, mLevel);
-}
-
 Texture *TextureCubeMapAttachment::getTexture() const
 {
     return mTextureCubeMap.get();
@@ -212,16 +202,6 @@
     mTexture3D.set(NULL);
 }
 
-rx::RenderTarget *Texture3DAttachment::getRenderTarget()
-{
-    return mTexture3D->getRenderTarget(mLevel, mLayer);
-}
-
-unsigned int Texture3DAttachment::getSerial() const
-{
-    return mTexture3D->getRenderTargetSerial(mLevel, mLayer);
-}
-
 Texture *Texture3DAttachment::getTexture() const
 {
     return mTexture3D.get();
@@ -242,16 +222,6 @@
     mTexture2DArray.set(NULL);
 }
 
-rx::RenderTarget *Texture2DArrayAttachment::getRenderTarget()
-{
-    return mTexture2DArray->getRenderTarget(mLevel, mLayer);
-}
-
-unsigned int Texture2DArrayAttachment::getSerial() const
-{
-    return mTexture2DArray->getRenderTargetSerial(mLevel, mLayer);
-}
-
 Texture *Texture2DArrayAttachment::getTexture() const
 {
     return mTexture2DArray.get();