Add queries for attachment targets.
Queries for the FBO attachment Textures and Renderbuffers allow us
more options than specific methods for querying the texture
storage or texture serial.
BUG=angle:732
Change-Id: Ieb4ddca3955fcf716dbf54331524d0c1e25fe946
Reviewed-on: https://chromium-review.googlesource.com/217028
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
diff --git a/src/libGLESv2/FramebufferAttachment.cpp b/src/libGLESv2/FramebufferAttachment.cpp
index 971f188..fa933ad 100644
--- a/src/libGLESv2/FramebufferAttachment.cpp
+++ b/src/libGLESv2/FramebufferAttachment.cpp
@@ -90,11 +90,6 @@
mTexture.set(NULL);
}
-rx::TextureStorage *TextureAttachment::getTextureStorage()
-{
- return mTexture->getNativeTexture()->getStorageInstance();
-}
-
GLsizei TextureAttachment::getSamples() const
{
return 0;
@@ -105,11 +100,6 @@
return mTexture->id();
}
-unsigned int TextureAttachment::getTextureSerial() const
-{
- return mTexture->getTextureSerial();
-}
-
GLsizei TextureAttachment::getWidth() const
{
return mTexture->getWidth(mIndex);
@@ -155,6 +145,17 @@
return mTexture->getRenderTargetSerial(mIndex);
}
+Texture *TextureAttachment::getTexture()
+{
+ return mTexture.get();
+}
+
+Renderbuffer *TextureAttachment::getRenderbuffer()
+{
+ UNREACHABLE();
+ return NULL;
+}
+
////// RenderbufferAttachment Implementation //////
RenderbufferAttachment::RenderbufferAttachment(GLenum binding, Renderbuffer *renderbuffer)
@@ -174,12 +175,6 @@
return mRenderbuffer->getStorage()->getRenderTarget();
}
-rx::TextureStorage *RenderbufferAttachment::getTextureStorage()
-{
- UNREACHABLE();
- return NULL;
-}
-
GLsizei RenderbufferAttachment::getWidth() const
{
return mRenderbuffer->getWidth();
@@ -230,10 +225,15 @@
return 0;
}
-unsigned int RenderbufferAttachment::getTextureSerial() const
+Texture *RenderbufferAttachment::getTexture()
{
UNREACHABLE();
- return 0;
+ return NULL;
+}
+
+Renderbuffer *RenderbufferAttachment::getRenderbuffer()
+{
+ return mRenderbuffer.get();
}
}