diff --git a/.gitignore b/.gitignore index de96bdddeb..e2ab5132ef 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,7 @@ other/test-runner/output/ extensions/MARK_README.txt extensions/*/index.html extensions/proposals/*/index.html +extensions/rejected/*/index.html extensions/index.atom extensions/index.html extensions/registry.xml diff --git a/conformance-suites/1.0.1/conformance/misc/bad-arguments-test.html b/conformance-suites/1.0.1/conformance/misc/bad-arguments-test.html index 50c3171d4d..8d1ee3d1f0 100644 --- a/conformance-suites/1.0.1/conformance/misc/bad-arguments-test.html +++ b/conformance-suites/1.0.1/conformance/misc/bad-arguments-test.html @@ -68,15 +68,13 @@ } for (var i = 0; i < arguments.length; ++i) { - var func, func2, func3; + var func, func2; if (arguments[i].throws) { func = shouldThrow; func2 = shouldThrow; - func3 = shouldThrow; } else { func = shouldBeUndefined; func2 = shouldBeNull; - func3 = shouldBeEmptyString; } argument = arguments[i].value; func("context.compileShader(argument)"); @@ -98,15 +96,15 @@ func("context.uniform2iv(argument, new Int32Array([0, 0]))"); func("context.uniformMatrix2fv(argument, false, new Float32Array([0.0, 0.0, 0.0, 0.0]))"); + func2("context.getProgramInfoLog(argument)"); func2("context.getProgramParameter(argument, 0)"); + func2("context.getShaderInfoLog(argument)"); func2("context.getShaderParameter(argument, 0)"); + func2("context.getShaderSource(argument)"); func2("context.getUniform(argument, loc)"); func2("context.getUniform(program, argument)"); func2("context.getUniformLocation(argument, 'u_modelViewProjMatrix')"); - func3("context.getProgramInfoLog(argument)"); - func3("context.getShaderInfoLog(argument)"); - func3("context.getShaderSource(argument)"); } successfullyParsed = true; diff --git a/conformance-suites/1.0.2/conformance/misc/bad-arguments-test.html b/conformance-suites/1.0.2/conformance/misc/bad-arguments-test.html index a762a34663..db8dee1ceb 100644 --- a/conformance-suites/1.0.2/conformance/misc/bad-arguments-test.html +++ b/conformance-suites/1.0.2/conformance/misc/bad-arguments-test.html @@ -72,15 +72,13 @@ } for (var i = 0; i < testArguments.length; ++i) { - var func, func2, func3; + var func, func2; if (testArguments[i].throws) { func = shouldThrow; func2 = shouldThrow; - func3 = shouldThrow; } else { func = shouldBeUndefined; func2 = shouldBeNull; - func3 = shouldBeEmptyString; } argument = testArguments[i].value; func("context.compileShader(argument)"); @@ -102,15 +100,15 @@ func("context.uniform2iv(argument, new Int32Array([0, 0]))"); func("context.uniformMatrix2fv(argument, false, new Float32Array([0.0, 0.0, 0.0, 0.0]))"); + func2("context.getProgramInfoLog(argument)"); func2("context.getProgramParameter(argument, 0)"); + func2("context.getShaderInfoLog(argument)"); func2("context.getShaderParameter(argument, 0)"); + func2("context.getShaderSource(argument)"); func2("context.getUniform(argument, loc)"); func2("context.getUniform(program, argument)"); func2("context.getUniformLocation(argument, 'u_modelViewProjMatrix')"); - func3("context.getProgramInfoLog(argument)"); - func3("context.getShaderInfoLog(argument)"); - func3("context.getShaderSource(argument)"); } var successfullyParsed = true; diff --git a/conformance-suites/1.0.3/conformance/extensions/angle-instanced-arrays.html b/conformance-suites/1.0.3/conformance/extensions/angle-instanced-arrays.html index a08bff7432..84c649dbba 100644 --- a/conformance-suites/1.0.3/conformance/extensions/angle-instanced-arrays.html +++ b/conformance-suites/1.0.3/conformance/extensions/angle-instanced-arrays.html @@ -77,6 +77,7 @@ if (!gl) { testFailed("WebGL context does not exist"); + finishTest(); } else { testPassed("WebGL context exists"); @@ -88,6 +89,7 @@ testPassed("No ANGLE_instanced_arrays support -- this is legal"); runSupportedTest(false); + finishTest(); } else { testPassed("Successfully enabled ANGLE_instanced_arrays extension"); @@ -413,10 +415,6 @@ cycleAndTest(); } - -var successfullyParsed = true; - - diff --git a/conformance-suites/1.0.3/conformance/misc/bad-arguments-test.html b/conformance-suites/1.0.3/conformance/misc/bad-arguments-test.html index 0046222c02..2933f47296 100644 --- a/conformance-suites/1.0.3/conformance/misc/bad-arguments-test.html +++ b/conformance-suites/1.0.3/conformance/misc/bad-arguments-test.html @@ -71,15 +71,13 @@ } for (var i = 0; i < testArguments.length; ++i) { - var func, func2, func3; + var func, func2; if (testArguments[i].throws) { func = shouldThrow; func2 = shouldThrow; - func3 = shouldThrow; } else { func = shouldBeUndefined; func2 = shouldBeNull; - func3 = shouldBeEmptyString; } argument = testArguments[i].value; func("context.compileShader(argument)"); @@ -101,15 +99,15 @@ func("context.uniform2iv(argument, new Int32Array([0, 0]))"); func("context.uniformMatrix2fv(argument, false, new Float32Array([0.0, 0.0, 0.0, 0.0]))"); + func2("context.getProgramInfoLog(argument)"); func2("context.getProgramParameter(argument, 0)"); + func2("context.getShaderInfoLog(argument)"); func2("context.getShaderParameter(argument, 0)"); + func2("context.getShaderSource(argument)"); func2("context.getUniform(argument, loc)"); func2("context.getUniform(program, argument)"); func2("context.getUniformLocation(argument, 'u_modelViewProjMatrix')"); - func3("context.getProgramInfoLog(argument)"); - func3("context.getShaderInfoLog(argument)"); - func3("context.getShaderSource(argument)"); } var successfullyParsed = true; diff --git a/conformance-suites/1.0.3/webgl-conformance-tests.html b/conformance-suites/1.0.3/webgl-conformance-tests.html index 381b8cd461..b0a6471dc3 100644 --- a/conformance-suites/1.0.3/webgl-conformance-tests.html +++ b/conformance-suites/1.0.3/webgl-conformance-tests.html @@ -180,6 +180,13 @@ } } + function createStylesheet() { + var style = document.createElement("style"); + style.appendChild(document.createTextNode("")); + document.head.appendChild(style); + return style.sheet; + } + function create3DContext(canvas, attrs, version) { if (!canvas) { canvas = document.createElement("canvas"); @@ -926,6 +933,19 @@ autoScrollEnabled = autoScrollCheckbox.checked; autoScroll = autoScrollEnabled; }; + + var hidePassedSheet = createStylesheet(); + var hidePassedCheckbox = document.getElementById("hidePassedCheckbox"); + hidePassedCheckbox.checked = false; + hidePassedCheckbox.onclick = function() { + var hidePassedTests = hidePassedCheckbox.checked; + if (hidePassedTests) { + hidePassedSheet.insertRule(".testpagesuccess { display: none; }", 0); + } else { + hidePassedSheet.deleteRule(0); + } + }; + var textbutton = document.getElementById("showTextSummary"); textbutton.onclick = function() { log("click"); @@ -992,6 +1012,9 @@
+ + +