commit d8a2258c3e552fc3aefc7d5342970f0c33cea12d
author Geoff Lang <geofflang@chromium.org> Wed Dec 17 15:28:23 2014 -0500
committer Geoff Lang <geofflang@chromium.org> Wed Jan 07 19:29:22 2015 +0000
tree 8cd0129710d05f016a21acc854d9cf4c714da528
parent 4f89e3dd5f9804c682864541a5188d021eb0f106

Remove all uses of "actual" formats.

BUG=angle:861

Change-Id: I7cd2d1a56772fdf18bcf926456399322d13e7a4f
Reviewed-on: https://chromium-review.googlesource.com/236305
Reviewed-by: Brandon Jones <bajones@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/FramebufferAttachment.cpp

diff --git a/src/libANGLE/FramebufferAttachment.cpp b/src/libANGLE/FramebufferAttachment.cpp
index 2fa9b0b..0d31148 100644
--- a/src/libANGLE/FramebufferAttachment.cpp
+++ b/src/libANGLE/FramebufferAttachment.cpp
@@ -34,42 +34,42 @@
 
 GLuint FramebufferAttachment::getRedSize() const
 {
-    return (GetInternalFormatInfo(getInternalFormat()).redBits > 0) ? GetInternalFormatInfo(getActualFormat()).redBits : 0;
+    return GetInternalFormatInfo(getInternalFormat()).redBits;
 }
 
 GLuint FramebufferAttachment::getGreenSize() const
 {
-    return (GetInternalFormatInfo(getInternalFormat()).greenBits > 0) ? GetInternalFormatInfo(getActualFormat()).greenBits : 0;
+    return GetInternalFormatInfo(getInternalFormat()).greenBits;
 }
 
 GLuint FramebufferAttachment::getBlueSize() const
 {
-    return (GetInternalFormatInfo(getInternalFormat()).blueBits > 0) ? GetInternalFormatInfo(getActualFormat()).blueBits : 0;
+    return GetInternalFormatInfo(getInternalFormat()).blueBits;
 }
 
 GLuint FramebufferAttachment::getAlphaSize() const
 {
-    return (GetInternalFormatInfo(getInternalFormat()).alphaBits > 0) ? GetInternalFormatInfo(getActualFormat()).alphaBits : 0;
+    return GetInternalFormatInfo(getInternalFormat()).alphaBits;
 }
 
 GLuint FramebufferAttachment::getDepthSize() const
 {
-    return (GetInternalFormatInfo(getInternalFormat()).depthBits > 0) ? GetInternalFormatInfo(getActualFormat()).depthBits : 0;
+    return GetInternalFormatInfo(getInternalFormat()).depthBits;
 }
 
 GLuint FramebufferAttachment::getStencilSize() const
 {
-    return (GetInternalFormatInfo(getInternalFormat()).stencilBits > 0) ? GetInternalFormatInfo(getActualFormat()).stencilBits : 0;
+    return GetInternalFormatInfo(getInternalFormat()).stencilBits;
 }
 
 GLenum FramebufferAttachment::getComponentType() const
 {
-    return GetInternalFormatInfo(getActualFormat()).componentType;
+    return GetInternalFormatInfo(getInternalFormat()).componentType;
 }
 
 GLenum FramebufferAttachment::getColorEncoding() const
 {
-    return GetInternalFormatInfo(getActualFormat()).colorEncoding;
+    return GetInternalFormatInfo(getInternalFormat()).colorEncoding;
 }
 
 ///// TextureAttachment Implementation ////////
@@ -111,11 +111,6 @@
     return mTexture->getInternalFormat(mIndex);
 }
 
-GLenum TextureAttachment::getActualFormat() const
-{
-    return mTexture->getActualFormat(mIndex);
-}
-
 GLenum TextureAttachment::type() const
 {
     return GL_TEXTURE;
@@ -181,11 +176,6 @@
     return mRenderbuffer->getInternalFormat();
 }
 
-GLenum RenderbufferAttachment::getActualFormat() const
-{
-    return mRenderbuffer->getActualFormat();
-}
-
 GLsizei RenderbufferAttachment::getSamples() const
 {
     return mRenderbuffer->getSamples();
@@ -261,11 +251,6 @@
     return mImpl->getInternalFormat();
 }
 
-GLenum DefaultAttachment::getActualFormat() const
-{
-    return mImpl->getActualFormat();
-}
-
 GLsizei DefaultAttachment::getSamples() const
 {
     return mImpl->getSamples();