commit 784a8fd5d851dea834691f975b02f3a0fe2af36e
author Geoff Lang <geofflang@chromium.org> Tue Sep 24 12:33:16 2013 -0400
committer Geoff Lang <geofflang@chromium.org> Mon Sep 30 15:42:00 2013 -0400
tree fc33d951b1a3bad507537106f4516ad7ad1e22cc
parent 1beb1db8015f38674fc78cd4e53316934b0e3839

Defer early-exit due to zero-sized copies until after all other validation for CopyTex*Image.

TRAC #20925

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods

src/libGLESv2/validationES2.cpp

diff --git a/src/libGLESv2/validationES2.cpp b/src/libGLESv2/validationES2.cpp
index 71d8633..09bac01 100644
--- a/src/libGLESv2/validationES2.cpp
+++ b/src/libGLESv2/validationES2.cpp
@@ -487,11 +487,6 @@
         return gl::error(GL_INVALID_VALUE, false);
     }
 
-    if (width == 0 || height == 0)
-    {
-        return false;
-    }
-
     // Verify zero border
     if (border != 0)
     {
@@ -720,7 +715,8 @@
         }
     }
 
-    return true;
+    // If width or height is zero, it is a no-op.  Return false without setting an error.
+    return (width > 0 && height > 0);
 }
 
 bool ValidateES2TexStorageParameters(gl::Context *context, GLenum target, GLsizei levels, GLenum internalformat,