commit a4d1332364ccd0856fb56a85b5466cb72097593d
author Geoff Lang <geoff.lang@transgaming.com> Wed Jun 05 14:57:51 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:04:49 2013 -0400
tree fcc804671fd44d2a2be2b9974fe6c23ec5546cfa
parent 0d56c43064648240fac6d6c13a76ad2c07292afa

Fixed a bug where ES3 was validating the texture size in non-CopySubImage calls.

TRAC #23276

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Author: Geoff Lang

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 7d0b154..5a34f04 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -1189,17 +1189,20 @@
         }
     }
 
-    if (xoffset + width > textureLevelWidth ||
-        yoffset + height > textureLevelHeight ||
-        zoffset >= textureLevelDepth)
+    if (isSubImage)
     {
-        return gl::error(GL_INVALID_VALUE, false);
-    }
+        if (xoffset + width > textureLevelWidth ||
+            yoffset + height > textureLevelHeight ||
+            zoffset >= textureLevelDepth)
+        {
+            return gl::error(GL_INVALID_VALUE, false);
+        }
 
-    if (!gl::IsValidCopyTexImageCombination(textureInternalFormat, colorbufferInternalFormat,
-                                            context->getClientVersion()))
-    {
-        return gl::error(GL_INVALID_OPERATION, false);
+        if (!gl::IsValidCopyTexImageCombination(textureInternalFormat, colorbufferInternalFormat,
+                                                context->getClientVersion()))
+        {
+            return gl::error(GL_INVALID_OPERATION, false);
+        }
     }
 
     return true;