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/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index 372642d..80af8a8 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -521,14 +521,14 @@
 
         if (readColorBuffer && drawColorBuffer)
         {
-            GLenum readInternalFormat = readColorBuffer->getActualFormat();
+            GLenum readInternalFormat = readColorBuffer->getInternalFormat();
             const InternalFormat &readFormatInfo = GetInternalFormatInfo(readInternalFormat);
 
             for (unsigned int i = 0; i < gl::IMPLEMENTATION_MAX_DRAW_BUFFERS; i++)
             {
                 if (drawFramebuffer->isEnabledColorAttachment(i))
                 {
-                    GLenum drawInternalFormat = drawFramebuffer->getColorbuffer(i)->getActualFormat();
+                    GLenum drawInternalFormat = drawFramebuffer->getColorbuffer(i)->getInternalFormat();
                     const InternalFormat &drawFormatInfo = GetInternalFormatInfo(drawInternalFormat);
 
                     // The GL ES 3.0.2 spec (pg 193) states that:
@@ -628,7 +628,7 @@
 
             if (readBuffer && drawBuffer)
             {
-                if (readBuffer->getActualFormat() != drawBuffer->getActualFormat())
+                if (readBuffer->getInternalFormat() != drawBuffer->getInternalFormat())
                 {
                     context->recordError(Error(GL_INVALID_OPERATION));
                     return false;
@@ -912,7 +912,7 @@
 
     GLenum currentFormat = framebuffer->getImplementationColorReadFormat();
     GLenum currentType = framebuffer->getImplementationColorReadType();
-    GLenum currentInternalFormat = readBuffer->getActualFormat();
+    GLenum currentInternalFormat = readBuffer->getInternalFormat();
     GLuint clientVersion = context->getClientVersion();
 
     bool validReadFormat = (clientVersion < 3) ? ValidES2ReadFormatType(context, format, type) :