Changeset 71164 in webkit

Timestamp:

Nov 2, 2010 2:01:45 PM (13 years ago)

Author:

zmo@google.com

Message:

2010-10-28 Zhenyao Mo <​zmo@google.com>

Reviewed by Kenneth Russell.

Update getUniform for bvec[234] to return boolean[] rather than Uint8Array
​https://bugs.webkit.org/show_bug.cgi?id=47568

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

2010-10-28 Zhenyao Mo <​zmo@google.com>

Reviewed by Kenneth Russell.

Update getUniform for bvec[234] to return boolean[] rather than Uint8Array
​https://bugs.webkit.org/show_bug.cgi?id=47568

• fast/canvas/webgl/gl-object-get-calls-expected.txt:
• fast/canvas/webgl/gl-object-get-calls.html:

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-28  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Update getUniform for bvec[234] to return boolean[] rather than Uint8Array
+        https://bugs.webkit.org/show_bug.cgi?id=47568
+
+        * fast/canvas/webgl/gl-object-get-calls-expected.txt:
+        * fast/canvas/webgl/gl-object-get-calls.html:
+
 2010-11-02  Chris Marrin  <cmarrin@apple.com>
 

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

@@ -53 +53 @@
 PASS getError was expected value: NO_ERROR : 
 PASS gl.getUniform(boolProgram, bvalLoc) is true
-PASS gl.getUniform(boolProgram, bval2Loc) is [1, 0]
-PASS gl.getUniform(boolProgram, bval3Loc) is [1, 0, 1]
-PASS gl.getUniform(boolProgram, bval4Loc) is [1, 0, 1, 0]
+PASS gl.getUniform(boolProgram, bval2Loc) is [true, false]
+PASS gl.getUniform(boolProgram, bval3Loc) is [true, false, true]
+PASS gl.getUniform(boolProgram, bval4Loc) is [true, false, true, false]
 PASS gl.getProgramParameter(intProgram, gl.LINK_STATUS) is true
 PASS getError was expected value: NO_ERROR : 

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

@@ -151 +151 @@
 glErrorShouldBe(gl, gl.NO_ERROR);
 shouldBe('gl.getUniform(boolProgram, bvalLoc)', 'true');
-shouldBe('gl.getUniform(boolProgram, bval2Loc)', '[1, 0]');
-shouldBe('gl.getUniform(boolProgram, bval3Loc)', '[1, 0, 1]');
-shouldBe('gl.getUniform(boolProgram, bval4Loc)', '[1, 0, 1, 0]');
+shouldBe('gl.getUniform(boolProgram, bval2Loc)', '[true, false]');
+shouldBe('gl.getUniform(boolProgram, bval3Loc)', '[true, false, true]');
+shouldBe('gl.getUniform(boolProgram, bval4Loc)', '[true, false, true, false]');
 // Integer uniform variables
 var intProgram = loadProgram(gl, "resources/intUniformShader.vert", "resources/noopUniformShader.frag");

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-28  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Update getUniform for bvec[234] to return boolean[] rather than Uint8Array
+        https://bugs.webkit.org/show_bug.cgi?id=47568
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::getUniform):
+
 2010-11-02  Chris Rogers  <crogers@google.com>
 

trunk/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -1756 +1756 @@
                 }
                 case GraphicsContext3D::INT: {
-                    int value[16] = {0};
+                    int value[4] = {0};
                     m_context->getUniformiv(objectOrZero(program), location, value);
                     if (length == 1)
@@ -1763 +1763 @@
                 }
                 case GraphicsContext3D::BOOL: {
-                    int value[16] = {0};
+                    int value[4] = {0};
                     m_context->getUniformiv(objectOrZero(program), location, value);
                     if (length > 1) {
-                        unsigned char boolValue[16] = {0};
+                        bool boolValue[16] = {0};
                         for (unsigned j = 0; j < length; j++)
                             boolValue[j] = static_cast<bool>(value[j]);
-                        return WebGLGetInfo(Uint8Array::create(boolValue, length));
+                        return WebGLGetInfo(boolValue, length);
                     }
                     return WebGLGetInfo(static_cast<bool>(value[0]));