X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2Fwebgl%2Fsrc%2Fsdk%2Ftests%2Fconformance%2Fextensions%2Fwebgl-draw-buffers.html;h=079cd5e6791d3b07236deae50b2e080908140930;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=66f691ca752133f7b34b2a3c4f32a73ff6d8b875;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/webgl/src/sdk/tests/conformance/extensions/webgl-draw-buffers.html b/src/third_party/webgl/src/sdk/tests/conformance/extensions/webgl-draw-buffers.html
index 66f691c..079cd5e 100644
--- a/src/third_party/webgl/src/sdk/tests/conformance/extensions/webgl-draw-buffers.html
+++ b/src/third_party/webgl/src/sdk/tests/conformance/extensions/webgl-draw-buffers.html
@@ -105,7 +105,7 @@ var ext = null;
 var vao = null;
 
 var extensionConstants = [
-  { name: "MAX_COLOR_ATTACHMENTS_WEBGL", enum: 0x8CDF, expectedFn: function(v) { return v > 0; }, passMsg: " should be > 0"},
+  { name: "MAX_COLOR_ATTACHMENTS_WEBGL", enum: 0x8CDF, expectedFn: function(v) { return v >= 4; }, passMsg: " should be >= 4"},
   { name: "MAX_DRAW_BUFFERS_WEBGL",      enum: 0x8824, expectedFn: function(v) { return v > 0; }, passMsg: " should be > 0"},
 
   { name: "COLOR_ATTACHMENT0_WEBGL",     enum: 0x8CE0, },
@@ -177,7 +177,7 @@ if (!gl) {
 function createExtDrawBuffersProgram(scriptId, sub) {
   var fsource = wtu.getScript(scriptId);
   fsource = wtu.replaceParams(fsource, sub);
-  wtu.addShaderSource(output, "fragement shader", fsource);
+  wtu.addShaderSource(output, "fragment shader", fsource);
   return wtu.setupProgram(gl, ["vshader", fsource], ["a_position"]);
 }
 
@@ -219,13 +219,15 @@ function runEnumTestEnabled() {
   extensionConstants.forEach(function(c) {
     shouldBe("ext." + c.name, "0x" + c.enum.toString(16));
     if (c.expectedFn) {
-      wtu.glErrorShouldBe(gl, gl.NO_ERROR, "foo");
-      debug(c.name + ":" + ext[c.name].toString(16));
-      expectTrue(c.expectedFn(gl.getParameter(ext[c.name])), "gl.getParemter(ext." + c.name + ")" + c.passMsg);
+      wtu.glErrorShouldBe(gl, gl.NO_ERROR, "before getParameter");
+      debug(c.name + ": 0x" + ext[c.name].toString(16));
+      expectTrue(c.expectedFn(gl.getParameter(ext[c.name])), "gl.getParameter(ext." + c.name + ")" + c.passMsg);
       wtu.glErrorShouldBe(gl, gl.NO_ERROR, c.name + " query should succeed if extension is enabled");
     }
   });
 
+  shouldBeTrue("gl.getParameter(ext.MAX_COLOR_ATTACHMENTS_WEBGL) >= gl.getParameter(ext.MAX_DRAW_BUFFERS_WEBGL)");
+
   debug("Testing drawBuffersWEBGL with default drawing buffer");
   shouldBe("gl.getParameter(ext.DRAW_BUFFER0_WEBGL)", "gl.BACK");
   wtu.shouldGenerateGLError(gl, gl.INVALID_VALUE, "ext.drawBuffersWEBGL([])");
@@ -243,7 +245,7 @@ function testShaders(tests, sub) {
   tests.forEach(function(test) {
     var shaders = [wtu.getScript(test.shaders[0]), wtu.replaceParams(wtu.getScript(test.shaders[1]), sub)];
     wtu.addShaderSource(output, "vertex shader", shaders[0]);
-    wtu.addShaderSource(output, "fragement shader", shaders[1]);
+    wtu.addShaderSource(output, "fragment shader", shaders[1]);
     var program = wtu.setupProgram(gl, shaders, ["a_position"]);
     var programLinkedSuccessfully = (program != null);
     var expectedProgramToLinkSuccessfully = (test.expectFailure == true);
@@ -277,6 +279,9 @@ function runShadersTestEnabled() {
     { shaders: ["vshader", "fshaderMacroEnabled"],
     msg: "GL_EXT_draw_buffers should be defined as 1 in GLSL",
     },
+    { shaders: ["vshader", "fshader"],
+    msg: "fragment shader containing the #extension directive should compile",
+    },
   ], sub);
 
   var program = createExtDrawBuffersProgram("fshaderBuiltInConstEnabled", sub);
@@ -346,7 +351,8 @@ function runAttachmentTestEnabled() {
     ext.drawBuffersWEBGL(bufs);
     wtu.glErrorShouldBe(gl, gl.INVALID_OPERATION, "should not be able to call drawBuffersWEBGL with out of order attachments of size " + maxColorAttachments);
     var bufs = makeColorAttachmentArray(Math.floor(maxDrawingBuffers / 2));
-    wtu.glErrorShouldBe(gl, gl.NO_ERROR, "should not be able to call drawBuffersWEBGL with short array of attachments of size " + maxColorAttachments);
+    ext.drawBuffersWEBGL(bufs);
+    wtu.glErrorShouldBe(gl, gl.NO_ERROR, "should be able to call drawBuffersWEBGL with short array of attachments of size " + bufs.length);
   }
 
   gl.deleteFramebuffer(fb);
@@ -639,7 +645,7 @@ function runDrawTests() {
     }
   }
 
-  debug("test switching between fbos keeps drawbuffer state");
+  debug("test switching between fbos does not affect any color attachment contents");
   gl.bindFramebuffer(gl.FRAMEBUFFER, fb2);
   ext.drawBuffersWEBGL(nones);
 
@@ -649,6 +655,7 @@ function runDrawTests() {
   gl.clear(gl.COLOR_BUFFER_BIT);
   checkAttachmentsForColor(attachments, [255, 0, 0, 255]);
 
+  // fb2 still has the NONE draw buffers from before, so this draw should be a no-op.
   gl.bindFramebuffer(gl.FRAMEBUFFER, fb2);
   gl.useProgram(drawProgram);
   wtu.drawUnitQuad(gl);