Fix validation in TexSubImage.

src/libGLESv2/libGLESv2.cpp

@@ -5166,14 +5166,14 @@ void __stdcall glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint
         {
             if (context->getClientVersion() < 3 &&
                 !ValidateES2TexImageParameters(context, target, level, GL_NONE, false, true,
-                                               0, 0, width, height, 0, format, type, pixels))
+                                               xoffset, yoffset, width, height, 0, format, type, pixels))
             {
                 return;
             }
 
             if (context->getClientVersion() >= 3 &&
                 !ValidateES3TexImageParameters(context, target, level, GL_NONE, false, true,
-                                               0, 0, 0, width, height, 1, 0, format, type, pixels))
+                                               xoffset, yoffset, 0, width, height, 1, 0, format, type, pixels))
             {
                 return;
             }

tests/angle_tests/IncompleteTextureTest.cpp

@@ -126,7 +126,7 @@ TEST_F(IncompleteTextureTest, update_texture)
     fillTextureData(redTextureData, 255, 0, 0, 255);
     for (size_t i = 0; i < 7; i++)
     {
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, redTextureWidth >> i, redTextureHeight >> i, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+        glTexImage2D(GL_TEXTURE_2D, i, GL_RGBA, redTextureWidth >> i, redTextureHeight >> i, 0, GL_RGBA, GL_UNSIGNED_BYTE,
                      redTextureData.data());
     }
 
@@ -143,7 +143,7 @@ TEST_F(IncompleteTextureTest, update_texture)
 
     for (size_t i = 0; i < 6; i++)
     {
-        glTexSubImage2D(GL_TEXTURE_2D, 0, greenTextureWidth >> i, greenTextureHeight >> i,
+        glTexSubImage2D(GL_TEXTURE_2D, i, greenTextureWidth >> i, greenTextureHeight >> i,
                         greenTextureWidth >> i, greenTextureHeight >> i, GL_RGBA, GL_UNSIGNED_BYTE,
                         greenTextureData.data());
     }

tests/angle_tests/TextureTest.cpp

+#include "ANGLETest.h"
+
+class TextureTest : public ANGLETest
+{
+protected:
+    TextureTest()
+    {
+        setWindowWidth(128);
+        setWindowHeight(128);
+        setConfigRedBits(8);
+        setConfigGreenBits(8);
+        setConfigBlueBits(8);
+        setConfigAlphaBits(8);
+    }
+
+    virtual void SetUp()
+    {
+        ANGLETest::SetUp();
+        glGenTextures(1, &mTexture);
+
+        glBindTexture(GL_TEXTURE_2D, mTexture);
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+        EXPECT_GL_NO_ERROR();
+
+        ASSERT_GL_NO_ERROR();
+    }
+
+    virtual void TearDown()
+    {
+        glDeleteTextures(1, &mTexture);
+
+        ANGLETest::TearDown();
+    }
+
+    GLuint mTexture;
+};
+
+TEST_F(TextureTest, negative_api_subimage)
+{
+    glBindTexture(GL_TEXTURE_2D, mTexture);
+    EXPECT_GL_ERROR(GL_NO_ERROR);
+
+    const GLubyte *pixels[20] = { 0 };
+    glTexSubImage2D(GL_TEXTURE_2D, 0, 1, 1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
+}