Changeset 143373 in webkit

Timestamp:

Feb 19, 2013 12:43:48 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[WebGL] Fix oes-element-index-uint.html test.
​https://bugs.webkit.org/show_bug.cgi?id=110045

Patch by Kondapally Kalyan <​kalyan.kondapally@intel.com> on 2013-02-19
Reviewed by Kenneth Russell.

This patch fixes the test case to use updated WebGLTestUtils functions
and adds shaders used during resized buffer tests. This patch
also enables the test for EFL port.

• fast/canvas/webgl/oes-element-index-uint-expected.txt:
• fast/canvas/webgl/oes-element-index-uint.html:
• platform/efl/TestExpectations:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/canvas/webgl/oes-element-index-uint-expected.txt (modified) (1 diff)
• fast/canvas/webgl/oes-element-index-uint.html (modified) (5 diffs)
• platform/efl/TestExpectations (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-19  Kondapally Kalyan  <kalyan.kondapally@intel.com>
+
+        [WebGL] Fix oes-element-index-uint.html test.
+        https://bugs.webkit.org/show_bug.cgi?id=110045
+
+        Reviewed by Kenneth Russell.
+
+        This patch fixes the test case to use updated WebGLTestUtils functions
+        and adds shaders used during resized buffer tests. This patch
+        also enables the test for EFL port.
+
+        * fast/canvas/webgl/oes-element-index-uint-expected.txt:
+        * fast/canvas/webgl/oes-element-index-uint.html:
+        * platform/efl/TestExpectations:
+
 2013-02-19  Adrienne Walker  <enne@chromium.org>
 

trunk/LayoutTests/fast/canvas/webgl/oes-element-index-uint-expected.txt

@@ -61 +61 @@
 
 TEST COMPLETE
+

trunk/LayoutTests/fast/canvas/webgl/oes-element-index-uint.html

@@ -13 +13 @@
 <canvas id="canvas" style="width: 50px; height: 50px;"> </canvas>
 <div id="console"></div>
+<script id="vs" type="x-shader/x-vertex">
+attribute vec4 vPosition;
+attribute vec4 vColor;
+varying vec4 color;
+void main() {
+    gl_Position = vPosition;
+    color = vColor;
+}
+</script>
+<script id="fs" type="x-shader/x-fragment">
+#if defined(GL_ES)
+precision mediump float;
+#endif
+varying vec4 color;
+void main() {
+  gl_FragColor = color;
+}
+</script>
 <script>
 description("This test verifies the functionality of the OES_element_index_uint extension, if it is available.");
 
 debug("");
+
+if (window.internals)
+    window.internals.settings.setWebGLErrorsToConsoleEnabled(false);
 
 var wtu = WebGLTestUtils;
@@ -76 +97 @@
     gl.viewport(0, 0, canvas.width, canvas.height);
     
-    var program = wtu.setupNoTexCoordTextureProgram(gl);
+    var program = wtu.setupSimpleTextureProgram(gl);
 
     function setupDraw(s) {
@@ -262 +283 @@
     glErrorShouldBe(gl, gl.INVALID_VALUE);
     shouldBeUndefined('gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_INT, 0)');
+    gl.disableVertexAttribArray(vertexLoc);
 }
 
@@ -295 +317 @@
     debug("Test that updating the size of a vertex buffer is properly noticed by the WebGL implementation.");
 
-    var program = setupProgram(gl, "vs", "fs", ["vPosition", "vColor"]);
+    var program = wtu.setupProgram(gl, ["vs", "fs"], ["vPosition", "vColor"]);
     glErrorShouldBe(gl, gl.NO_ERROR, "after initialization");
 
@@ -390 +412 @@
     testPassed("bufferSubData, when buffer object was initialized with null, did not crash");
 }
+
+debug("");
+successfullyParsed = true;
+isSuccessfullyParsed();
+
 </script>
-<script src="../../resources/js-test-post.js"></script>
-
 </body>
 </html>

trunk/LayoutTests/platform/efl/TestExpectations

@@ -345 +345 @@
 
 webkit.org/b/99096 fast/canvas/webgl/arraybuffer-transfer-of-control.html [ Failure Pass ]
-
-# Expected to fail until OES_element_index_uint extension is implemented
-webkit.org/b/98257 fast/canvas/webgl/oes-element-index-uint.html [ Failure Pass ]
 
 #////////////////////////////////////////////////////////////////////////////////////////