Changeset 71185 in webkit

Timestamp:

Nov 2, 2010 4:25:00 PM (13 years ago)

Author:

zmo@google.com

Message:

2010-11-01 Zhenyao Mo <​zmo@google.com>

Reviewed by Kenneth Russell.

blendFunc should generate INVALID_OPERATION if constant color and constant alpha are together as source and destination factors
​https://bugs.webkit.org/show_bug.cgi?id=48674

Test: fast/canvas/webgl/webgl-specific.html

• html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::blendFunc): (WebCore::WebGLRenderingContext::blendFuncSeparate):
• html/canvas/WebGLRenderingContext.h: (WebCore::WebGLRenderingContext::validateBlendFuncFactors): Helper function to do the checking.

2010-11-01 Zhenyao Mo <​zmo@google.com>

Reviewed by Kenneth Russell.

blendFunc should generate INVALID_OPERATION if constant color and constant alpha are together as source and destination factors
​https://bugs.webkit.org/show_bug.cgi?id=48674

• fast/canvas/webgl/webgl-specific-expected.txt: Added.
• fast/canvas/webgl/webgl-specific.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/webgl-specific-expected.txt (added)
• LayoutTests/fast/canvas/webgl/webgl-specific.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (3 diffs)
• WebCore/html/canvas/WebGLRenderingContext.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-01  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        blendFunc should generate INVALID_OPERATION if constant color and constant alpha are together as source and destination factors
+        https://bugs.webkit.org/show_bug.cgi?id=48674
+
+        * fast/canvas/webgl/webgl-specific-expected.txt: Added.
+        * fast/canvas/webgl/webgl-specific.html: Added.
+
 2010-11-02  Dmitry Titov  <dimich@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-01  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        blendFunc should generate INVALID_OPERATION if constant color and constant alpha are together as source and destination factors
+        https://bugs.webkit.org/show_bug.cgi?id=48674
+
+        Test: fast/canvas/webgl/webgl-specific.html
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::blendFunc):
+        (WebCore::WebGLRenderingContext::blendFuncSeparate):
+        * html/canvas/WebGLRenderingContext.h:
+        (WebCore::WebGLRenderingContext::validateBlendFuncFactors): Helper function to do the checking.
+
 2010-11-02  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -354 +354 @@
 void WebGLRenderingContext::blendFunc(unsigned long sfactor, unsigned long dfactor)
 {
+    if (!validateBlendFuncFactors(sfactor, dfactor))
+        return;
     m_context->blendFunc(sfactor, dfactor);
     cleanupAfterGraphicsCall(false);
@@ -360 +362 @@
 void WebGLRenderingContext::blendFuncSeparate(unsigned long srcRGB, unsigned long dstRGB, unsigned long srcAlpha, unsigned long dstAlpha)
 {
+    if (!validateBlendFuncFactors(srcRGB, dstRGB))
+        return;
     m_context->blendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
     cleanupAfterGraphicsCall(false);
@@ -3394 +3398 @@
 }
 
+bool WebGLRenderingContext::validateBlendFuncFactors(unsigned long src, unsigned long dst)
+{
+    if (((src == GraphicsContext3D::CONSTANT_COLOR || src == GraphicsContext3D::ONE_MINUS_CONSTANT_COLOR)
+         && (dst == GraphicsContext3D::CONSTANT_ALPHA || dst == GraphicsContext3D::ONE_MINUS_CONSTANT_ALPHA))
+        || ((dst == GraphicsContext3D::CONSTANT_COLOR || dst == GraphicsContext3D::ONE_MINUS_CONSTANT_COLOR)
+            && (src == GraphicsContext3D::CONSTANT_ALPHA || src == GraphicsContext3D::ONE_MINUS_CONSTANT_ALPHA))) {
+        m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION);
+        return false;
+    }
+    return true;
+}
+
 bool WebGLRenderingContext::validateCapability(unsigned long cap)
 {

trunk/WebCore/html/canvas/WebGLRenderingContext.h

@@ -496 +496 @@
     bool validateBlendEquation(unsigned long);
 
+    // Helper function to validate blend func factors.
+    bool validateBlendFuncFactors(unsigned long src, unsigned long dst);
+
     // Helper function to validate a GL capability.
     bool validateCapability(unsigned long);