Changeset 76874 in webkit

Timestamp:

Jan 27, 2011 5:26:12 PM (13 years ago)

Author:

zmo@google.com

Message:

2011-01-27 Zhenyao Mo <​zmo@google.com>

Reviewed by Kenneth Russell.

texSubImage2D's format/type needs to match the internalformat/type from the previous texImage2D call
​https://bugs.webkit.org/show_bug.cgi?id=53054

• fast/canvas/webgl/tex-sub-image-2d-bad-args-expected.txt: Added.
• fast/canvas/webgl/tex-sub-image-2d-bad-args.html: Added.

2011-01-27 Zhenyao Mo <​zmo@google.com>

Reviewed by Kenneth Russell.

texSubImage2D's format/type needs to match the internalformat/type from the previous texImage2D call
​https://bugs.webkit.org/show_bug.cgi?id=53054

Test: fast/canvas/webgl/tex-sub-image-2d-bad-args.html

• html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::texSubImage2DBase): Check format/type match.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/tex-sub-image-2d-bad-args-expected.txt (added)
• LayoutTests/fast/canvas/webgl/tex-sub-image-2d-bad-args.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-27  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        texSubImage2D's format/type needs to match the internalformat/type from the previous texImage2D call
+        https://bugs.webkit.org/show_bug.cgi?id=53054
+
+        * fast/canvas/webgl/tex-sub-image-2d-bad-args-expected.txt: Added.
+        * fast/canvas/webgl/tex-sub-image-2d-bad-args.html: Added.
+
 2011-01-27  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-27  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        texSubImage2D's format/type needs to match the internalformat/type from the previous texImage2D call
+        https://bugs.webkit.org/show_bug.cgi?id=53054
+
+        Test: fast/canvas/webgl/tex-sub-image-2d-bad-args.html
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::texSubImage2DBase): Check format/type match.
+
 2011-01-27  Yi Shen  <yi.4.shen@nokia.com>, Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
 

trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -3079 +3079 @@
     if (isContextLost())
         return;
-    if (!validateTexFuncFormatAndType(format, type))
-        return;
-    if (!validateTextureBinding(target, true))
-        return;
-    if (!validateSize(xoffset, yoffset) || !validateSize(width, height))
-        return;
+    if (!validateTexFuncParameters(target, level, format, width, height, 0, format, type))
+        return;
+    if (!validateSize(xoffset, yoffset))
+        return;
+    WebGLTexture* tex = validateTextureBinding(target, true);
+    if (!tex)
+        return;
+    if (xoffset + width > tex->getWidth(target, level) || yoffset + height > tex->getHeight(target, level)) {
+        m_context->synthesizeGLError(GraphicsContext3D::INVALID_VALUE);
+        return;
+    }
+    if (tex->getInternalFormat(target, level) != format || tex->getType(target, level) != type) {
+        m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION);
+        return;
+    }
     m_context->texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
     cleanupAfterGraphicsCall(false);