Ms3

.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

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;

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;

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;
 </script>
-<script src="../../resources/js-test-post.js"></script>
-
 </body>
 </html>

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;

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 @@
               <input type="checkbox" id="autoScrollCheckbox"/>
               <label for="autoScrollCheckbox">auto scroll</label>
               <br/>
+              <input type="checkbox" id="hidePassedCheckbox"/>
+              <label for="hidePassedCheckbox">hide passed tests</label>
+              <br/>
               <input type="button" style="visibility: hidden;" value="display text summary" id="showTextSummary"/>
               <div id="nowebgl" class="nowebgl" style="display: none;">
                 This browser does not appear to support WebGL

extensions/extension.sch

@@ -4,6 +4,13 @@
   <!--<ns prefix="" uri="" />-->
 
   <pattern name="Stages" id="stage-patt">
+    <rule context="/rejected">
+      <assert test="self::node()[starts-with(@href,'rejected/')]"
+              >A rejected's @href belongs in the 'rejected' directory.</assert>
+      <assert test="self::node()[@href=concat('rejected/',name,'/')]"
+              >A rejected extension should have a URL matching its name and ending in '/'.</assert>
+    </rule>
+
     <rule context="/proposal">
       <assert test="self::node()[starts-with(@href,'proposals/')]"
               >A proposal's @href belongs in the 'proposals' directory.</assert>
@@ -27,4 +34,4 @@
               >IDL blocks should always preserve internal space.</assert>
     </rule>
   </pattern>
-</schema>
+</schema>

extensions/extension.xsl

@@ -32,6 +32,14 @@
   </xsl:call-template>
 </xsl:template>
 
+<xsl:template match="rejected">
+  <xsl:call-template name="ext_page">
+    <xsl:with-param name="spec_type" select="'Extension Rejected Specification'" />
+    <xsl:with-param name="css" select="concat($basepath,'/resources/Khronos-Rejected.css')" />
+    <xsl:with-param name="spec_status" select="'rejected'" />
+  </xsl:call-template>
+</xsl:template>
+
 <xsl:template match="proposal">
   <xsl:call-template name="ext_page">
     <xsl:with-param name="spec_type" select="'Extension Proposed Specification'" />

extensions/proposals/WEBGL_compressed_texture_es3/extension.xml

@@ -15,8 +15,8 @@
   </depends>
   <overview>
     <p>
-      This extension exposes the compressed texture formats defined as core in the 
-      <a href="hhttp://www.khronos.org/registry/gles/specs/3.0/es_spec_3.0.2.pdf">
+      This extension exposes the compressed texture formats defined as core in the
+      <a href="http://www.khronos.org/registry/gles/specs/3.0/es_spec_3.0.2.pdf">
       OpenGL ES 3.0</a> spec to WebGL.
     </p>
     <features>
@@ -25,74 +25,13 @@
         <code>COMPRESSED_SIGNED_R11_EAC</code>,
         <code>COMPRESSED_RG11_EAC</code>,
         <code>COMPRESSED_SIGNED_RG11_EAC</code>,
-        <code>COMPRESSED_RGB_ETC2</code>,
+        <code>COMPRESSED_RGB8_ETC2</code>,
         <code>COMPRESSED_SRGB8_ETC2</code>,
         <code>COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2</code>,
         <code>COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2</code>,
         <code>COMPRESSED_RGBA8_ETC2_EAC</code>,
         and <code>COMPRESSED_SRGB8_ALPHA8_ETC2_EAC</code> may be passed to
         the <code>compressedTexImage2D</code> and <code>compressedTexSubImage2D</code> entry points.
-
-        This format correspond to the format defined in the OES_compressed_ETC1_RGB8_texture OpenGL ES
-        extension. Although the enum name is changed, the numeric value is the same. The correspondence
-        is given by this table:
-        <table>
-          <tr>
-            <th>WebGL format enum</th>
-            <th>OpenGL format enum</th>
-            <th>Numeric value</th>
-          </tr>
-          <tr>
-            <td>COMPRESSED_R11_EAC</td>
-            <td>COMPRESSED_R11_EAC</td>
-            <td>0x9270</td>
-          </tr>
-          <tr>
-            <td>COMPRESSED_SIGNED_R11_EAC</td>
-            <td>COMPRESSED_SIGNED_R11_EAC</td>
-            <td>0x9271</td>
-          </tr>
-          <tr>
-            <td>COMPRESSED_RG11_EAC</td>
-            <td>COMPRESSED_RG11_EAC</td>
-            <td>0x9272</td>
-          </tr>
-          <tr>
-            <td>COMPRESSED_SIGNED_RG11_EAC</td>
-            <td>COMPRESSED_SIGNED_RG11_EAC</td>
-            <td>0x9273</td>
-          </tr>
-          <tr>
-            <td>COMPRESSED_RGB_ETC2</td>
-            <td>COMPRESSED_RGB_ETC2</td>
-            <td>0x9274</td>
-          </tr>
-          <tr>
-            <td>COMPRESSED_SRGB8_ETC2</td>
-            <td>COMPRESSED_SRGB8_ETC2</td>
-            <td>0x9275</td>
-          </tr>
-          <tr>
-            <td>COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2</td>
-            <td>COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2</td>
-            <td>0x9276</td>
-          </tr>
-          <tr>
-            <td>COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2</td>
-            <td>COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2</td>
-            <td>0x9277</td>
-          </tr>
-          <tr>
-            <td>COMPRESSED_RGBA8_ETC2_EAC</td>
-            <td>COMPRESSED_RGBA8_ETC2_EAC</td>
-            <td>0x9278</td>
-          </tr>
-          <tr>
-            <td>COMPRESSED_SRGB8_ALPHA8_ETC2_EAC</td>
-            <td>COMPRESSED_SRGB8_ALPHA8_ETC2_EAC</td>
-            <td>0x9279</td>
-          </tr>
-        </table>
       </feature>
       <feature>
         Calling <code>getParameter</code> with the argument <code>COMPRESSED_TEXTURE_FORMATS</code>
@@ -103,7 +42,7 @@
         <dl>
           <dt>COMPRESSED_R11_EAC</dt>
           <dt>COMPRESSED_SIGNED_R11_EAC</dt>
-          <dt>COMPRESSED_RGB_ETC2</dt>
+          <dt>COMPRESSED_RGB8_ETC2</dt>
           <dt>COMPRESSED_SRGB8_ETC2</dt>
           <dt>COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2</dt>
           <dt>COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2</dt>
@@ -137,15 +76,15 @@
 [NoInterfaceObject]
 interface WEBGL_compressed_texture_es3 {
     /* Compressed Texture Format */
-    const GLenum COMPRESSED_R11_EAC                        = 0x9270; 
-    const GLenum COMPRESSED_SIGNED_R11_EAC                 = 0x9271; 
-    const GLenum COMPRESSED_RG11_EAC                       = 0x9272; 
-    const GLenum COMPRESSED_SIGNED_RG11_EAC                = 0x9273; 
-    const GLenum COMPRESSED_RGB_ETC2                       = 0x9274; 
-    const GLenum COMPRESSED_SRGB8_ETC2                     = 0x9275; 
-    const GLenum COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2  = 0x9276; 
-    const GLenum COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 = 0x9277; 
-    const GLenum COMPRESSED_RGBA8_ETC2_EAC                 = 0x9278; 
+    const GLenum COMPRESSED_R11_EAC                        = 0x9270;
+    const GLenum COMPRESSED_SIGNED_R11_EAC                 = 0x9271;
+    const GLenum COMPRESSED_RG11_EAC                       = 0x9272;
+    const GLenum COMPRESSED_SIGNED_RG11_EAC                = 0x9273;
+    const GLenum COMPRESSED_RGB8_ETC2                      = 0x9274;
+    const GLenum COMPRESSED_SRGB8_ETC2                     = 0x9275;
+    const GLenum COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2  = 0x9276;
+    const GLenum COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 = 0x9277;
+    const GLenum COMPRESSED_RGBA8_ETC2_EAC                 = 0x9278;
     const GLenum COMPRESSED_SRGB8_ALPHA8_ETC2_EAC          = 0x9279;
 };
   </idl>
@@ -156,5 +95,9 @@ interface WEBGL_compressed_texture_es3 {
     <revision date="2014/07/15">
       <change>Added NoInterfaceObject extended attribute.</change>
     </revision>
+    <revision date="2014/12/12">
+      <change>COMPRESSED_RGB_ETC2 should be COMPRESSED_RGB8_ETC2.</change>
+      <change>Remove unnecessary language.</change>
+    </revision>
   </history>
 </proposal>

extensions/registry.html

@@ -106,9 +106,16 @@ <h2 class="no-toc">Extension Development Process</h2>
     <p>
         Extensions move through four states during their
         development: <em>proposed</em>, <em>draft</em>, <em>community approved</em>, and <em>Khronos
-        ratified</em>.
+        ratified</em>. Every extension should advance to <em>Khronos ratified</em>.
+        If an extension cannot advance through the extension process it can be <em>rejected</em>.
     </p>
     <ul>
+        <li> <em>Rejected</em> extensions should never be implemented.
+        An extension enters <em>rejected</em> status because consensus on it could not be reached at the <em>proposal</em> stage
+        or technical difficulties arise during implementation at the <em>draft</em> stage.
+        A <em>community approved</em> extension can only be rejected in extraordinary circumstances.
+        A <em>Khronos ratified</em> extension cannot be rejected.
+
         <li> <em>Proposed</em> extensions are intended for discussion on the public WebGL mailing
         list, in order to move to <em>draft</em> status; they should not be implemented, even under
         a vendor prefix. If consensus is reached in the community, the extension can be moved
@@ -179,6 +186,17 @@ <h2 class="no-toc">Proposed WebGL Extensions (do not implement!)</h2>
     <td class="list"><ul class="indexlist" id="proposed-by-name"></ul>
     </tr>
     </table>
+
+    <h2 class="no-toc">Rejected WebGL Extensions</h2>
+
+    <table style="border: 2px; width: 100%;">
+    <tr>
+    <td class="list"><h3>By Name</h3>
+    </tr>
+    <tr>
+    <td class="list"><ul class="indexlist" id="rejected-by-name"></ul>
+    </tr>
+    </table>
 
     <h2 class="no-toc">Recent WebGL Extension Revisions</h2>
     <ol id="recent-revisions"></ol>