commit 218b6ede4c9419fe4d752e3a7220eca3b4fe9a0e
author Jamie Madill <jmadill@chromium.org> Mon Jun 16 10:34:01 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Wed Jun 18 16:48:27 2014 +0000
tree a9e9c9b5c395c51c38ab2fe718c77313e5ee38b1
parent 2bf8b3728e7e72c769139de488fd80f2373d95de

Add queries for object id and type to FBO attachments.

BUG=angle:660

Change-Id: Id91f6f2ae84eaefd59f9d568736bd99e3a27ef5d
Reviewed-on: https://chromium-review.googlesource.com/201836
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/FramebufferAttachment.cpp

diff --git a/src/libGLESv2/FramebufferAttachment.cpp b/src/libGLESv2/FramebufferAttachment.cpp
index bdafc2f..072177f 100644
--- a/src/libGLESv2/FramebufferAttachment.cpp
+++ b/src/libGLESv2/FramebufferAttachment.cpp
@@ -105,9 +105,14 @@
     return mTexture2D->getRenderTargetSerial(mLevel);
 }
 
-bool Texture2DAttachment::isTexture() const
+GLuint Texture2DAttachment::id() const
 {
-    return true;
+    return mTexture2D->id();
+}
+
+GLenum Texture2DAttachment::type() const
+{
+    return GL_TEXTURE_2D;
 }
 
 unsigned int Texture2DAttachment::getTextureSerial() const
@@ -185,9 +190,14 @@
     return mTextureCubeMap->getRenderTargetSerial(mFaceTarget, mLevel);
 }
 
-bool TextureCubeMapAttachment::isTexture() const
+GLuint TextureCubeMapAttachment::id() const
 {
-    return true;
+    return mTextureCubeMap->id();
+}
+
+GLenum TextureCubeMapAttachment::type() const
+{
+    return mFaceTarget;
 }
 
 unsigned int TextureCubeMapAttachment::getTextureSerial() const
@@ -265,9 +275,14 @@
     return mTexture3D->getRenderTargetSerial(mLevel, mLayer);
 }
 
-bool Texture3DAttachment::isTexture() const
+GLuint Texture3DAttachment::id() const
 {
-    return true;
+    return mTexture3D->id();
+}
+
+GLenum Texture3DAttachment::type() const
+{
+    return GL_TEXTURE_3D;
 }
 
 unsigned int Texture3DAttachment::getTextureSerial() const
@@ -343,9 +358,14 @@
     return mTexture2DArray->getRenderTargetSerial(mLevel, mLayer);
 }
 
-bool Texture2DArrayAttachment::isTexture() const
+GLuint Texture2DArrayAttachment::id() const
 {
-    return true;
+    return mTexture2DArray->id();
+}
+
+GLenum Texture2DArrayAttachment::type() const
+{
+    return GL_TEXTURE_2D_ARRAY;
 }
 
 unsigned int Texture2DArrayAttachment::getTextureSerial() const
@@ -500,6 +520,11 @@
     return gl::GetColorEncoding(getActualFormat(), clientVersion);
 }
 
+bool FramebufferAttachment::isTexture() const
+{
+    return (type() != GL_RENDERBUFFER);
+}
+
 GLsizei FramebufferAttachment::getSamples() const
 {
     return mImpl->getSamples();
@@ -510,9 +535,14 @@
     return mImpl->getSerial();
 }
 
-bool FramebufferAttachment::isTexture() const
+GLuint FramebufferAttachment::id() const
 {
-    return mImpl->isTexture();
+    return mImpl->id();
+}
+
+GLuint FramebufferAttachment::type() const
+{
+    return mImpl->type();
 }
 
 unsigned int FramebufferAttachment::getTextureSerial() const
@@ -585,9 +615,14 @@
     return mRenderbuffer->getStorage()->getSerial();
 }
 
-bool RenderbufferAttachment::isTexture() const
+GLuint RenderbufferAttachment::id() const
 {
-    return false;
+    return mRenderbuffer->id();
+}
+
+GLenum RenderbufferAttachment::type() const
+{
+    return GL_RENDERBUFFER;
 }
 
 unsigned int RenderbufferAttachment::getTextureSerial() const