Amends CopyTexImage validation to conform to new language in the ES 3.0.3 spec.

src/libGLESv2/formatutils.h

@@ -50,7 +50,7 @@ bool IsValidFormat(GLenum format, GLuint clientVersion);
 bool IsValidType(GLenum type, GLuint clientVersion);
 
 bool IsValidFormatCombination(GLenum internalFormat, GLenum format, GLenum type, GLuint clientVersion);
-bool IsValidCopyTexImageCombination(GLenum textureInternalFormat, GLenum frameBufferInternalFormat, GLuint clientVersion);
+bool IsValidCopyTexImageCombination(GLenum textureInternalFormat, GLenum frameBufferInternalFormat, GLuint readBufferHandle, GLuint clientVersion);
 
 bool IsSizedInternalFormat(GLenum internalFormat, GLuint clientVersion);
 GLenum GetSizedInternalFormat(GLenum format, GLenum type, GLuint clientVersion);
@@ -66,6 +66,7 @@ GLuint GetStencilBits(GLenum internalFormat, GLuint clientVersion);
 
 GLuint GetTypeBytes(GLenum type);
 bool IsSpecialInterpretationType(GLenum type);
+bool IsFloatOrFixedComponentType(GLenum type);
 
 GLenum GetFormat(GLenum internalFormat, GLuint clientVersion);
 GLenum GetType(GLenum internalFormat, GLuint clientVersion);

src/libGLESv2/validationES3.cpp

@@ -435,12 +435,21 @@ bool ValidateES3CopyTexImageParameters(gl::Context *context, GLenum target, GLin
             return gl::error(GL_INVALID_VALUE, false);
         }
 
-        if (!gl::IsValidCopyTexImageCombination(textureInternalFormat, colorbufferInternalFormat,
+        if (!gl::IsValidCopyTexImageCombination(textureInternalFormat, colorbufferInternalFormat, context->getReadFramebufferHandle(),
                                                 context->getClientVersion()))
         {
             return gl::error(GL_INVALID_OPERATION, false);
         }
     }
+    else
+    {
+        if (!gl::IsValidCopyTexImageCombination(internalformat, colorbufferInternalFormat, context->getReadFramebufferHandle(),
+                                                context->getClientVersion()))
+        {
+            return gl::error(GL_INVALID_OPERATION, false);
+        }
+    }
+
 
     // If width or height is zero, it is a no-op.  Return false without setting an error.
     return (width > 0 && height > 0);