Add validation for GL_RED and GL_RG in glReadPixels.

src/libGLESv2/validationES.cpp

@@ -847,8 +847,8 @@ bool ValidateReadPixelsParameters(gl::Context *context, GLint x, GLint y, GLsize
     if (!context->getCurrentReadFormatType(&currentInternalFormat, &currentFormat, &currentType))
         return false;
 
-    bool validReadFormat = (clientVersion < 3) ? ValidES2ReadFormatType(format, type) :
-                                                 ValidES3ReadFormatType(currentInternalFormat, format, type);
+    bool validReadFormat = (clientVersion < 3) ? ValidES2ReadFormatType(context, format, type) :
+                                                 ValidES3ReadFormatType(context, currentInternalFormat, format, type);
 
     if (!(currentFormat == format && currentType == type) && !validReadFormat)
     {

src/libGLESv2/validationES2.cpp

@@ -1044,7 +1044,7 @@ bool ValidateES2FramebufferTextureParameters(gl::Context *context, GLenum target
 }
 
 // check for combinations of format and type that are valid for ReadPixels
-bool ValidES2ReadFormatType(GLenum format, GLenum type)
+bool ValidES2ReadFormatType(gl::Context *context, GLenum format, GLenum type)
 {
     switch (format)
     {
@@ -1068,6 +1068,21 @@ bool ValidES2ReadFormatType(GLenum format, GLenum type)
             return false;
         }
         break;
+      case GL_RG_EXT:
+      case GL_RED_EXT:
+        if (!context->supportsRGTextures())
+        {
+            return false;
+        }
+        switch (type)
+        {
+          case GL_UNSIGNED_BYTE:
+            break;
+          default:
+            return false;
+        }
+        break;
+
       default:
         return false;
     }

src/libGLESv2/validationES2.h

@@ -28,7 +28,7 @@ bool ValidateES2TexStorageParameters(gl::Context *context, GLenum target, GLsize
 bool ValidateES2FramebufferTextureParameters(gl::Context *context, GLenum target, GLenum attachment,
                                              GLenum textarget, GLuint texture, GLint level);
 
-bool ValidES2ReadFormatType(GLenum format, GLenum type);
+bool ValidES2ReadFormatType(gl::Context *context, GLenum format, GLenum type);
 
 }
 

src/libGLESv2/validationES3.cpp

@@ -729,7 +729,7 @@ bool ValidateES3FramebufferTextureParameters(gl::Context *context, GLenum target
     return true;
 }
 
-bool ValidES3ReadFormatType(GLenum internalFormat, GLenum format, GLenum type)
+bool ValidES3ReadFormatType(gl::Context *context, GLenum internalFormat, GLenum format, GLenum type)
 {
     switch (format)
     {
@@ -784,6 +784,20 @@ bool ValidES3ReadFormatType(GLenum internalFormat, GLenum format, GLenum type)
             return false;
         }
         break;
+      case GL_RG_EXT:
+      case GL_RED_EXT:
+        if (!context->supportsRGTextures())
+        {
+            return false;
+        }
+        switch (type)
+        {
+        case GL_UNSIGNED_BYTE:
+            break;
+        default:
+            return false;
+        }
+        break;
       default:
         return false;
     }

src/libGLESv2/validationES3.h

@@ -29,7 +29,7 @@ bool ValidateES3FramebufferTextureParameters(gl::Context *context, GLenum target
                                              GLenum textarget, GLuint texture, GLint level, GLint layer,
                                              bool layerCall);
 
-bool ValidES3ReadFormatType(GLenum internalFormat, GLenum format, GLenum type);
+bool ValidES3ReadFormatType(gl::Context *context, GLenum internalFormat, GLenum format, GLenum type);
 
 bool ValidateInvalidateFramebufferParameters(gl::Context *context, GLenum target, GLsizei numAttachments,
                                              const GLenum* attachments);