commit 005df41f8900641ed1df60700c8e2eca659a33cb
author Geoff Lang <geofflang@chromium.org> Wed Oct 16 14:12:50 2013 -0400
committer Geoff Lang <geofflang@chromium.org> Tue Oct 22 10:34:04 2013 -0400
tree 2bd7307a7ca21ee4c904045ffce48a41fdafed49
parent 2a6f956dbcaef95068a948325370bb2403ac0b7a

Use GLenum instead of GLint to store internal format variables.

TRAC #23785

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index bf8dc17..e85fe64 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -2211,7 +2211,7 @@
                 return gl::error(GL_INVALID_OPERATION);
             }
 
-            GLint internalFormat = texture->getBaseLevelInternalFormat();
+            GLenum internalFormat = texture->getBaseLevelInternalFormat();
 
             // Internally, all texture formats are sized so checking if the format
             // is color renderable and filterable will not fail.
@@ -4604,8 +4604,7 @@
 
         if (context)
         {
-            GLint currentInternalFormat;
-            GLenum currentFormat, currentType;
+            GLenum currentInternalFormat, currentFormat, currentType;
 
             // Failure in getCurrentReadFormatType indicates that no color attachment is currently bound,
             // and attempting to read back if that's the case is an error. The error will be registered
@@ -4648,8 +4647,7 @@
 
         if (context)
         {
-            GLint currentInternalFormat;
-            GLenum currentFormat, currentType;
+            GLenum currentInternalFormat, currentFormat, currentType;
 
             // Failure in getCurrentReadFormatType indicates that no color attachment is currently bound,
             // and attempting to read back if that's the case is an error. The error will be registered