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

Fixed a bug where ES3 was validating the texture size in non-CopySubImage calls.
a4d13323 · Geoff Lang · Shannon Woods · 0d56c430 · a4d13323
Commit a4d13323 authored Jun 05, 2013 by Geoff Lang Committed by Shannon Woods Jul 19, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 9 deletions

libGLESv2.cpp src/libGLESv2/libGLESv2.cpp +12 -9

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -1189,17 +1189,20 @@ bool validateES3CopyTexImageParameters(gl::Context *context, GLenum target, GLin
        }
    }
-    if (xoffset + width > textureLevelWidth ||
+    if (isSubImage)
-        yoffset + height > textureLevelHeight ||
-        zoffset >= textureLevelDepth)
    {
-        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,
+        if (!gl::IsValidCopyTexImageCombination(textureInternalFormat, colorbufferInternalFormat,
-                                            context->getClientVersion()))
+                                                context->getClientVersion()))
-    {
+        {
-        return gl::error(GL_INVALID_OPERATION, false);
+            return gl::error(GL_INVALID_OPERATION, false);
+        }
    }
    return true;