Changeset 71282 in webkit

Timestamp:

Nov 3, 2010 4:53:19 PM (13 years ago)

Author:

zmo@google.com

Message:

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

Reviewed by Kenneth Russell.

A different mask or reference value in stencil operations should generate INVALID_OPERATION
​https://bugs.webkit.org/show_bug.cgi?id=48669

• html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::WebGLRenderingContext): Init stencil func ref/mask and stencil mask to default. (WebCore::WebGLRenderingContext::stencilFunc): Cache ref/mask value. (WebCore::WebGLRenderingContext::stencilFuncSeparate): Generate error if front/back values differ. (WebCore::WebGLRenderingContext::stencilMask): Cache mask value. (WebCore::WebGLRenderingContext::stencilMaskSeparate): Generate error if front/back values differ. (WebCore::WebGLRenderingContext::validateFace): Validate face parameter. (WebCore::WebGLRenderingContext::validateStencilFunc): Validate stencil func parameter.
• html/canvas/WebGLRenderingContext.h: Add members to track stencil func ref/mask and stencil mask.

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

Reviewed by Kenneth Russell.

A different mask or reference value in stencil operations should generate INVALID_OPERATION
​https://bugs.webkit.org/show_bug.cgi?id=48669

• fast/canvas/webgl/webgl-specific-expected.txt:
• fast/canvas/webgl/webgl-specific.html: Uncomment the test cases for the bug.

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-02  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        A different mask or reference value in stencil operations should generate INVALID_OPERATION
+        https://bugs.webkit.org/show_bug.cgi?id=48669
+
+        * fast/canvas/webgl/webgl-specific-expected.txt:
+        * fast/canvas/webgl/webgl-specific.html: Uncomment the test cases for the bug.
+
 2010-11-03  Oliver Hunt  <oliver@apple.com>
 

trunk/LayoutTests/fast/canvas/webgl/webgl-specific-expected.txt

@@ -19 +19 @@
 PASS getError was expected value: INVALID_OPERATION : constant color and constant alpha cannot be used together as source and destination factors in the blend function
 PASS getError was expected value: INVALID_OPERATION : constant color and constant alpha cannot be used together as source and destination factors in the blend function
+PASS getError was expected value: NO_ERROR : stencilMask should generate no error
+PASS getError was expected value: INVALID_OPERATION : a different mask value for front and back facing is illegal
+PASS getError was expected value: INVALID_OPERATION : a different mask value for front and back facing is illegal
+PASS getError was expected value: NO_ERROR : stencilFunc should generate no error
+PASS getError was expected value: INVALID_OPERATION : a different reference value for front and back facing is illegal
+PASS getError was expected value: INVALID_OPERATION : a different reference value for front and back facing is illegal
+PASS getError was expected value: INVALID_OPERATION : a different mask value for front and back facing is illegal
+PASS getError was expected value: INVALID_OPERATION : a different mask value for front and back facing is illegal
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/canvas/webgl/webgl-specific.html

@@ -73 +73 @@
 glErrorShouldBe(gl, gl.INVALID_OPERATION,
     "depthRange should generate INVALID_OPERATION if zNear is greater than zFar");
+*/
 
 gl.stencilMask(255);
@@ -99 +100 @@
 glErrorShouldBe(gl, gl.INVALID_OPERATION,
     "a different mask value for front and back facing is illegal");
-*/
 
 successfullyParsed = true;

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-02  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        A different mask or reference value in stencil operations should generate INVALID_OPERATION
+        https://bugs.webkit.org/show_bug.cgi?id=48669
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::WebGLRenderingContext): Init stencil func ref/mask and stencil mask to default.
+        (WebCore::WebGLRenderingContext::stencilFunc): Cache ref/mask value.
+        (WebCore::WebGLRenderingContext::stencilFuncSeparate): Generate error if front/back values differ.
+        (WebCore::WebGLRenderingContext::stencilMask): Cache mask value.
+        (WebCore::WebGLRenderingContext::stencilMaskSeparate): Generate error if front/back values differ.
+        (WebCore::WebGLRenderingContext::validateFace): Validate face parameter.
+        (WebCore::WebGLRenderingContext::validateStencilFunc): Validate stencil func parameter.
+        * html/canvas/WebGLRenderingContext.h: Add members to track stencil func ref/mask and stencil mask.
+
 2010-11-03  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -105 +105 @@
     , m_videoCache(4)
     , m_contextLost(false)
+    , m_stencilMask(0xFFFFFFFF)
+    , m_stencilFuncRef(0)
+    , m_stencilFuncMask(0xFFFFFFFF)
 {
     ASSERT(m_context);
@@ -2218 +2221 @@
     if (isContextLost())
         return;
+    if (!validateStencilFunc(func))
+        return;
+    m_stencilFuncRef = ref;
+    m_stencilFuncMask = mask;
     m_context->stencilFunc(func, ref, mask);
     cleanupAfterGraphicsCall(false);
@@ -2226 +2233 @@
     if (isContextLost())
         return;
+    if (!validateFace(face) || !validateStencilFunc(func))
+        return;
+    if (face == GraphicsContext3D::FRONT_AND_BACK) {
+        m_stencilFuncRef = ref;
+        m_stencilFuncMask = mask;
+    } else if (m_stencilFuncRef != ref || m_stencilFuncMask != mask) {
+        // for ref value, we generate an error if user specify a different value
+        // for front/back faces even if they clamp to the same value internally.
+        m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION);
+        return;
+    }
     m_context->stencilFuncSeparate(face, func, ref, mask);
     cleanupAfterGraphicsCall(false);
@@ -2234 +2252 @@
     if (isContextLost())
         return;
+    m_stencilMask = mask;
     m_context->stencilMask(mask);
     cleanupAfterGraphicsCall(false);
@@ -2242 +2261 @@
     if (isContextLost())
         return;
+    if (!validateFace(face))
+        return;
+    if (face == GraphicsContext3D::FRONT_AND_BACK)
+        m_stencilMask = mask;
+    else if (m_stencilMask != mask) {
+        m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION);
+        return;
+    }
     m_context->stencilMaskSeparate(face, mask);
     cleanupAfterGraphicsCall(false);
@@ -3556 +3583 @@
 }
 
+bool WebGLRenderingContext::validateFace(unsigned long face)
+{
+    switch (face) {
+    case GraphicsContext3D::FRONT:
+    case GraphicsContext3D::BACK:
+    case GraphicsContext3D::FRONT_AND_BACK:
+        return true;
+    default:
+        m_context->synthesizeGLError(GraphicsContext3D::INVALID_ENUM);
+        return false;
+    }
+}
+
+bool WebGLRenderingContext::validateStencilFunc(unsigned long func)
+{
+    switch (func) {
+    case GraphicsContext3D::NEVER:
+    case GraphicsContext3D::LESS:
+    case GraphicsContext3D::LEQUAL:
+    case GraphicsContext3D::GREATER:
+    case GraphicsContext3D::GEQUAL:
+    case GraphicsContext3D::EQUAL:
+    case GraphicsContext3D::NOTEQUAL:
+    case GraphicsContext3D::ALWAYS:
+        return true;
+    default:
+        m_context->synthesizeGLError(GraphicsContext3D::INVALID_ENUM);
+        return false;
+    }
+}
+
 void WebGLRenderingContext::printWarningToConsole(const String& message)
 {

trunk/WebCore/html/canvas/WebGLRenderingContext.h

@@ -427 +427 @@
     bool m_contextLost;
 
+    long m_stencilBits;
+    unsigned long m_stencilMask;
+    long m_stencilFuncRef; // Note that this is the user specified value, not the internal clamped value.
+    unsigned long m_stencilFuncMask;
+
     // Helpers for getParameter and others
     WebGLGetInfo getBooleanParameter(unsigned long pname);
@@ -486 +491 @@
     bool validateDrawMode(unsigned long);
 
+    // Helper function to validate face.
+    bool validateFace(unsigned long);
+
+    // Helper function to validate stencil func.
+    bool validateStencilFunc(unsigned long);
+
     // Helper function for texParameterf and texParameteri.
     void texParameter(unsigned long target, unsigned long pname, float parami, int paramf, bool isFloat);