Changeset 65279 in webkit

Timestamp:

Aug 12, 2010 4:14:19 PM (14 years ago)

Author:

zmo@google.com

Message:

2010-08-12 Zhenyao Mo <​zmo@google.com>

Reviewed by Dimitri Glazkov.

getParameter(STENCIL_VALUE_MASK) (and others) returns the wrong value
​https://bugs.webkit.org/show_bug.cgi?id=31842

• html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::getUnsignedLongParameter): Casting from int to unsigned long correctly.

2010-08-12 Zhenyao Mo <​zmo@google.com>

Reviewed by Dimitri Glazkov.

getParameter(STENCIL_VALUE_MASK) (and others) returns the wrong value
​https://bugs.webkit.org/show_bug.cgi?id=31842

• fast/canvas/webgl/gl-get-calls-expected.txt: Bring back the commented out STENCIL tests.
• fast/canvas/webgl/gl-get-calls.html: Ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt (modified) (4 diffs)
• LayoutTests/fast/canvas/webgl/gl-get-calls.html (modified) (5 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-12  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        getParameter(STENCIL_VALUE_MASK) (and others) returns the wrong value
+        https://bugs.webkit.org/show_bug.cgi?id=31842
+
+        * fast/canvas/webgl/gl-get-calls-expected.txt: Bring back the commented out STENCIL tests.
+        * fast/canvas/webgl/gl-get-calls.html: Ditto.
+
 2010-08-12  Zhenyao Mo  <zmo@google.com>
 

trunk/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt

@@ -31 +31 @@
 PASS context.getParameter(context.CULL_FACE_MODE) is context.BACK
 PASS context.getParameter(context.CURRENT_PROGRAM) is null
+PASS context.getParameter(context.DEPTH_CLEAR_VALUE) is 1
 PASS context.getParameter(context.DEPTH_FUNC) is context.LESS
 PASS context.getParameter(context.DEPTH_RANGE) is [0, 1]
@@ -54 +55 @@
 PASS context.getParameter(context.STENCIL_BACK_PASS_DEPTH_PASS) is context.KEEP
 PASS context.getParameter(context.STENCIL_BACK_REF) is 0
+PASS context.getParameter(context.STENCIL_BACK_VALUE_MASK) is 0xFFFFFFFF
+PASS context.getParameter(context.STENCIL_BACK_WRITEMASK) is 0xFFFFFFFF
 PASS context.getParameter(context.STENCIL_BITS) >= 0 is true
 PASS context.getParameter(context.STENCIL_CLEAR_VALUE) is 0
@@ -62 +65 @@
 PASS context.getParameter(context.STENCIL_REF) is 0
 PASS context.getParameter(context.STENCIL_TEST) is false
+PASS context.getParameter(context.STENCIL_VALUE_MASK) is 0xFFFFFFFF
+PASS context.getParameter(context.STENCIL_WRITEMASK) is 0xFFFFFFFF
 PASS context.getParameter(context.TEXTURE_BINDING_2D) is null
 PASS context.getParameter(context.TEXTURE_BINDING_CUBE_MAP) is null
@@ -72 +77 @@
 PASS context.getParameter(context.MAX_VARYING_VECTORS) >= 8 is true
 PASS context.getParameter(context.NUM_COMPRESSED_TEXTURE_FORMATS) is 0
-FAIL context.getParameter(context.SHADER_COMPILER) should be true (of type boolean). Was null (of type object).
 
 PASS successfullyParsed is true

trunk/LayoutTests/fast/canvas/webgl/gl-get-calls.html

@@ -32 +32 @@
     else
       testFailed("context is not correct type");
-  
+
     debug("");
     debug("Context contains getError");
@@ -59 +59 @@
     shouldBe('context.getParameter(context.CULL_FACE_MODE)', 'context.BACK');
     shouldBe('context.getParameter(context.CURRENT_PROGRAM)', 'null');
+    shouldBe('context.getParameter(context.DEPTH_CLEAR_VALUE)', '1');
     shouldBe('context.getParameter(context.DEPTH_FUNC)', 'context.LESS');
     shouldBe('context.getParameter(context.DEPTH_RANGE)', '[0, 1]');
@@ -83 +84 @@
     shouldBe('context.getParameter(context.STENCIL_BACK_REF)', '0');
 
-    // FIXME: Current WebKit implementation returns the wrong value (https://bugs.webkit.org/show_bug.cgi?id=31842)
-    // Re-enable these tests as soon as that bug has been fixed.
-    // shouldBe('context.getParameter(context.STENCIL_BACK_VALUE_MASK)', '0xFFFFFFFF');
-    // shouldBe('context.getParameter(context.STENCIL_BACK_WRITEMASK)', '0xFFFFFFFF');
+    shouldBe('context.getParameter(context.STENCIL_BACK_VALUE_MASK)', '0xFFFFFFFF');
+    shouldBe('context.getParameter(context.STENCIL_BACK_WRITEMASK)', '0xFFFFFFFF');
 
     // If EXT_packed_depth_stencil is supported, STENCIL_BITS > 0; otherwise, STENCIL_BITS == 0.
@@ -98 +97 @@
     shouldBe('context.getParameter(context.STENCIL_TEST)', 'false');
 
-    // FIXME: Current WebKit implementation returns the wrong value (https://bugs.webkit.org/show_bug.cgi?id=31842)
-    // Re-enable these tests as soon as that bug has been fixed.
-    // shouldBe('context.getParameter(context.STENCIL_VALUE_MASK)', '0xFFFFFFFF');
-    // shouldBe('context.getParameter(context.STENCIL_WRITEMASK)', '0xFFFFFFFF');
+    shouldBe('context.getParameter(context.STENCIL_VALUE_MASK)', '0xFFFFFFFF');
+    shouldBe('context.getParameter(context.STENCIL_WRITEMASK)', '0xFFFFFFFF');
 
     shouldBe('context.getParameter(context.TEXTURE_BINDING_2D)', 'null');
@@ -113 +110 @@
     shouldBeTrue('context.getParameter(context.MAX_VARYING_VECTORS) >= 8');
     shouldBe('context.getParameter(context.NUM_COMPRESSED_TEXTURE_FORMATS)', '0');
-    shouldBe('context.getParameter(context.SHADER_COMPILER)', 'true');
 }
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-12  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        getParameter(STENCIL_VALUE_MASK) (and others) returns the wrong value
+        https://bugs.webkit.org/show_bug.cgi?id=31842
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::getUnsignedLongParameter): Casting from int to unsigned long correctly.
+
 2010-08-12  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -2952 +2952 @@
     int value;
     m_context->getIntegerv(pname, &value);
-    return WebGLGetInfo(static_cast<unsigned long>(value));
+    unsigned int uValue = static_cast<unsigned int>(value);
+    return WebGLGetInfo(static_cast<unsigned long>(uValue));
 }