Changeset 71291 in webkit

Timestamp:

Nov 3, 2010 5:49:21 PM (13 years ago)

Author:

zmo@google.com

Message:

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

Reviewed by Kenneth Russell.

depthRange should generate INVALID_OPERATION if zNear is greater than zFar
​https://bugs.webkit.org/show_bug.cgi?id=48676

• html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::depthRange):

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

Reviewed by Kenneth Russell.

depthRange should generate INVALID_OPERATION if zNear is greater than zFar
​https://bugs.webkit.org/show_bug.cgi?id=48676

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

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) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-03  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        depthRange should generate INVALID_OPERATION if zNear is greater than zFar
+        https://bugs.webkit.org/show_bug.cgi?id=48676
+
+        * fast/canvas/webgl/webgl-specific-expected.txt:
+        * fast/canvas/webgl/webgl-specific.html:
+
 2010-11-03  Dumitru Daniliuc  <dumi@chromium.org>
 

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: INVALID_OPERATION : depthRange should generate INVALID_OPERATION if zNear is greater than zFar
 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

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

@@ -69 +69 @@
     "constant color and constant alpha cannot be used together as source and destination factors in the blend function");
 
-/*
 gl.depthRange(20, 10);
 glErrorShouldBe(gl, gl.INVALID_OPERATION,
     "depthRange should generate INVALID_OPERATION if zNear is greater than zFar");
-*/
 
 gl.stencilMask(255);

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-03  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        depthRange should generate INVALID_OPERATION if zNear is greater than zFar
+        https://bugs.webkit.org/show_bug.cgi?id=48676
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::depthRange):
+
 2010-11-03  Adrienne Walker  <enne@google.com>
 

trunk/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -791 +791 @@
     if (isContextLost())
         return;
+    if (zNear > zFar) {
+        m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION);
+        return;
+    }
     m_context->depthRange(zNear, zFar);
     cleanupAfterGraphicsCall(false);