Some cleanup after the previous sized internal format patches

src/libGLESv2/Context.h

@@ -80,8 +80,8 @@ enum
     MAX_FRAGMENT_UNIFORM_VECTORS_SM3 = 224 - 3,
     MAX_DRAW_BUFFERS = 1,
 
-    GL_BGRA4_REV = 0x6ABC,
-    GL_BGR5_A1_REV = 0x6ABD
+    GL_BGRA4_ANGLEX = 0x6ABC,
+    GL_BGR5_A1_ANGLEX = 0x6ABD
 };
 
 enum QueryType

src/libGLESv2/Texture.cpp

@@ -28,7 +28,7 @@ namespace gl
 {
 unsigned int TextureStorage::mCurrentTextureSerial = 1;
 
-static D3DFORMAT ConvertTextureFormatType(GLint internalformat)
+static D3DFORMAT ConvertTextureInternalFormat(GLint internalformat)
 {
     switch (internalformat)
     {
@@ -168,7 +168,7 @@ bool Image::redefine(GLint internalformat, GLsizei width, GLsizei height, bool f
         mHeight = height;
         mInternalFormat = internalformat;
         // compute the d3d format that will be used
-        mD3DFormat = ConvertTextureFormatType(internalformat);
+        mD3DFormat = ConvertTextureInternalFormat(internalformat);
 
         if (mSurface)
         {
@@ -1717,7 +1717,7 @@ void Texture2D::copySubImage(GLenum target, GLint level, GLint xoffset, GLint yo
 
 void Texture2D::storage(GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    D3DFORMAT d3dfmt = ConvertTextureFormatType(internalformat);
+    D3DFORMAT d3dfmt = ConvertTextureInternalFormat(internalformat);
     DWORD d3dusage = GetTextureUsage(d3dfmt, mUsage, false);
 
     delete mTexStorage;
@@ -1776,8 +1776,8 @@ bool Texture2D::isSamplerComplete() const
       default: UNREACHABLE();
     }
 
-    if ((gl::ExtractType(getInternalFormat(0)) == GL_FLOAT && !getContext()->supportsFloat32LinearFilter()) ||
-        (gl::ExtractType(getInternalFormat(0)) == GL_HALF_FLOAT_OES && !getContext()->supportsFloat16LinearFilter()))
+    if ((IsFloat32Format(getInternalFormat(0)) && !getContext()->supportsFloat32LinearFilter()) ||
+        (IsFloat16Format(getInternalFormat(0)) && !getContext()->supportsFloat16LinearFilter()))
     {
         if (mMagFilter != GL_NEAREST || (mMinFilter != GL_NEAREST && mMinFilter != GL_NEAREST_MIPMAP_NEAREST))
         {
@@ -2675,7 +2675,7 @@ void TextureCubeMap::copySubImage(GLenum target, GLint level, GLint xoffset, GLi
 
 void TextureCubeMap::storage(GLsizei levels, GLenum internalformat, GLsizei size)
 {
-    D3DFORMAT d3dfmt = ConvertTextureFormatType(internalformat);
+    D3DFORMAT d3dfmt = ConvertTextureInternalFormat(internalformat);
     DWORD d3dusage = GetTextureUsage(d3dfmt, mUsage, false);
 
     delete mTexStorage;

src/libGLESv2/libGLESv2.cpp

@@ -1337,14 +1337,6 @@ void __stdcall glCopyTexImage2D(GLenum target, GLint level, GLenum internalforma
                 }
                 break;
               case GL_LUMINANCE:
-                if (colorbufferFormat != GL_RGB565 &&
-                    colorbufferFormat != GL_RGB8_OES &&
-                    colorbufferFormat != GL_RGBA4 &&
-                    colorbufferFormat != GL_RGB5_A1 &&
-                    colorbufferFormat != GL_RGBA8_OES)
-                {
-                    return error(GL_INVALID_OPERATION);
-                }
               case GL_RGB:
                 if (colorbufferFormat != GL_RGB565 &&
                     colorbufferFormat != GL_RGB8_OES &&
@@ -1544,16 +1536,6 @@ void __stdcall glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GL
                 }
                 break;
               case GL_LUMINANCE:
-                if (colorbufferFormat != GL_RGB565 &&
-                    colorbufferFormat != GL_RGB8_OES &&
-                    colorbufferFormat != GL_RGBA &&
-                    colorbufferFormat != GL_RGBA4 &&
-                    colorbufferFormat != GL_RGB5_A1 &&
-                    colorbufferFormat != GL_RGBA8_OES)
-                {
-                    return error(GL_INVALID_OPERATION);
-                }
-                break;
               case GL_RGB:
                 if (colorbufferFormat != GL_RGB565 &&
                     colorbufferFormat != GL_RGB8_OES &&

src/libGLESv2/utilities.cpp

@@ -323,8 +323,8 @@ int ComputePixelSize(GLint internalformat)
       case GL_RGBA32F_EXT:                      return sizeof(float) * 4;
       case GL_RGBA16F_EXT:                      return sizeof(unsigned short) * 4;
       case GL_BGRA8_EXT:                        return sizeof(unsigned char) * 4;
-      case GL_BGRA4_REV:                        return sizeof(unsigned short);
-      case GL_BGR5_A1_REV:                      return sizeof(unsigned short);
+      case GL_BGRA4_ANGLEX:                     return sizeof(unsigned short);
+      case GL_BGR5_A1_ANGLEX:                   return sizeof(unsigned short);
       default: UNREACHABLE();
     }
 
@@ -398,8 +398,8 @@ GLint ConvertSizedInternalFormat(GLenum format, GLenum type)
         switch (type)
         {
           case GL_UNSIGNED_BYTE:                    return GL_BGRA8_EXT;
-          case GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT:   return GL_BGRA4_REV;
-          case GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT:   return GL_BGR5_A1_REV;
+          case GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT:   return GL_BGRA4_ANGLEX;
+          case GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT:   return GL_BGR5_A1_ANGLEX;
           default:                                  UNIMPLEMENTED();
         }
         break;