update from Khronos fork

conformance-suites/1.0.3/conformance/extensions/webgl-compressed-texture-pvrtc.html

@@ -271,7 +271,7 @@
     wtu.glErrorShouldBe(gl, gl.NO_ERROR, "uploading compressed texture");
     gl.generateMipmap(gl.TEXTURE_2D);
     wtu.glErrorShouldBe(gl, gl.INVALID_OPERATION, "trying to generate mipmaps from compressed texture");
-    wtu.drawQuad(gl);
+    wtu.clearAndDrawUnitQuad(gl);
     compareRect(width, height, test.channels, width, height, uncompressedData, data, format);
 
     gl.compressedTexImage2D(gl.TEXTURE_2D, 0, format, width, height, 1, data);

conformance-suites/2.0.0/conformance/extensions/webgl-compressed-texture-pvrtc.html

@@ -273,7 +273,7 @@
     wtu.glErrorShouldBe(gl, gl.NO_ERROR, "uploading compressed texture");
     gl.generateMipmap(gl.TEXTURE_2D);
     wtu.glErrorShouldBe(gl, gl.INVALID_OPERATION, "trying to generate mipmaps from compressed texture");
-    wtu.drawQuad(gl);
+    wtu.clearAndDrawUnitQuad(gl);
     compareRect(width, height, test.channels, width, height, uncompressedData, data, format, undefined, "NEAREST");
     // Test again with linear filtering.
     gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);

conformance-suites/2.0.0/conformance2/misc/object-deletion-behaviour-2.html

@@ -42,9 +42,8 @@
 description("Tests deletion behavior for WebGL2 buffer, sampler, vertexArray and transformFeedback objects.");
 
 var wtu = WebGLTestUtils;
-var gl = wtu.create3DContext();
+var gl = wtu.create3DContext(undefined, undefined, 2);
 var shouldGenerateGLError = wtu.shouldGenerateGLError;
-var contextVersion = wtu.getDefault3DContextVersion();
 
 debug("");
 debug("buffer deletion");

conformance-suites/2.0.0/conformance2/renderbuffers/readbuffer.html

@@ -99,8 +99,8 @@
 
   var maxColorAttachments = gl.getParameter(gl.MAX_COLOR_ATTACHMENTS);
   gl.readBuffer(gl.COLOR_ATTACHMENT0 + maxColorAttachments);
-  wtu.glErrorShouldBe(gl, gl.INVALID_ENUM,
-      "calling readBuffer with GL_COLOR_ATTACHMENTi that exceeds MAX_COLOR_ATTACHMENT on fbo should generate INVALID_ENUM.");
+  wtu.glErrorShouldBe(gl, [gl.INVALID_ENUM, gl.INVALID_OPERATION],
+      "calling readBuffer with GL_COLOR_ATTACHMENTi that exceeds MAX_COLOR_ATTACHMENT on fbo should generate INVALID_ENUM or INVALID_OPERATION.");
   gl.readBuffer(gl.COLOR_ATTACHMENT1);
   wtu.glErrorShouldBe(gl, gl.NO_ERROR,
       "calling readBuffer with GL_COLOR_ATTACHMENT1 on the fbo should succeed.");

conformance-suites/2.0.0/conformance2/rendering/clear-srgb-color-buffer.html

@@ -93,7 +93,9 @@
     }
 
     var color_ref = wtu.linearToSRGB(color);
-    wtu.checkCanvasRect(gl, 0, 0, size, size, color_ref);
+    var tolerance = 3;
+    var msg = "";
+    wtu.checkCanvasRect(gl, 0, 0, size, size, color_ref, msg, tolerance);
 }
 
 gl.bindTexture(gl.TEXTURE_2D, null);

conformance-suites/2.0.0/conformance2/textures/misc/integer-cubemap-specification-order-bug.html

@@ -100,7 +100,7 @@
         gl.texImage2D(face + gl.TEXTURE_CUBE_MAP_POSITIVE_X, level, gl.RG8I, levelSize, levelSize, 0, gl.RG_INTEGER, gl.BYTE, new Int8Array(backingBuffer));
     });
 
-    gl.texParameteri(gl.TEXTURE_CUBE_MAP, gl.TEXTURE_MIN_FILTER, gl.NEAREST_MIPMAP_LINEAR);
+    gl.texParameteri(gl.TEXTURE_CUBE_MAP, gl.TEXTURE_MIN_FILTER, gl.NEAREST_MIPMAP_NEAREST);
     gl.texParameteri(gl.TEXTURE_CUBE_MAP, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
     gl.texParameteri(gl.TEXTURE_CUBE_MAP, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
     gl.texParameteri(gl.TEXTURE_CUBE_MAP, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);

conformance-suites/2.0.0/conformance2/textures/misc/tex-image-with-bad-args-from-dom-elements.html

@@ -49,8 +49,9 @@
 var doTexImage = function(domElement) {
     var tex = gl.createTexture();
     gl.bindTexture(gl.TEXTURE_2D, tex);
-    gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGB10_A2, gl.RGBA, gl.UNSIGNED_INT_2_10_10_10_REV, domElement);
-    wtu.glErrorShouldBe(gl, [gl.INVALID_VALUE, gl.INVALID_ENUM, gl.INVALID_OPERATION], "TexImage2D taking RGB10_A2/RGBA/UNSIGNED_INT_2_10_10_10_REV should fail");
+    // The following test was invalidated in https://github.com/KhronosGroup/WebGL/pull/2386 .
+    // gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGB10_A2, gl.RGBA, gl.UNSIGNED_INT_2_10_10_10_REV, domElement);
+    // wtu.glErrorShouldBe(gl, [gl.INVALID_VALUE, gl.INVALID_ENUM, gl.INVALID_OPERATION], "TexImage2D taking RGB10_A2/RGBA/UNSIGNED_INT_2_10_10_10_REV should fail");
     gl.texImage2D(gl.TEXTURE_2D, 0, gl.RG8, gl.RG, gl.FLOAT, domElement);
     wtu.glErrorShouldBe(gl, gl.INVALID_OPERATION, "TexImage2D taking RG8/RG/FLOAT should fail");
     gl.deleteTexture(tex);

conformance-suites/2.0.0/conformance2/textures/misc/tex-image-with-different-data-source.html

@@ -61,8 +61,9 @@
 gl.bindTexture(gl.TEXTURE_2D, tex);
 gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGB10_A2, 16, 16, 0, gl.RGBA, gl.UNSIGNED_INT_2_10_10_10_REV, null);
 wtu.glErrorShouldBe(gl, gl.NO_ERROR, "Teximage2D taking a null array buffer should succeed");
-gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGB10_A2, gl.RGBA, gl.UNSIGNED_INT_2_10_10_10_REV, c);
-wtu.glErrorShouldBe(gl, gl.INVALID_VALUE, "TexImage2D taking RGB10_A2 internalformat and a canvas source should fail");
+// The following test was invalidated in https://github.com/KhronosGroup/WebGL/pull/2386 .
+// gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGB10_A2, gl.RGBA, gl.UNSIGNED_INT_2_10_10_10_REV, c);
+// wtu.glErrorShouldBe(gl, gl.INVALID_VALUE, "TexImage2D taking RGB10_A2 internalformat and a canvas source should fail");
 gl.deleteTexture(tex);
 
 var successfullyParsed = true;

conformance-suites/2.0.0/js/glsl-conformance-test.js

@@ -270,8 +270,12 @@ function runOneTest(gl, info) {
   if (info.uniforms !== undefined) {
     for (var i = 0; i < info.uniforms.length; ++i) {
       var uniformLocation = gl.getUniformLocation(program, info.uniforms[i].name);
-      gl[info.uniforms[i].functionName](uniformLocation, info.uniforms[i].value);
-      debug(info.uniforms[i].name + ' set to ' + info.uniforms[i].value);
+      if (uniformLocation !== null) {
+        gl[info.uniforms[i].functionName](uniformLocation, info.uniforms[i].value);
+        debug(info.uniforms[i].name + ' set to ' + info.uniforms[i].value);
+      } else {
+        debug('uniform ' + info.uniforms[i].name + ' had null location and was not set');
+      }
     }
   }
 
@@ -288,7 +292,11 @@ function runOneTest(gl, info) {
   if (info.renderTolerance !== undefined) {
     tolerance = info.renderTolerance;
   }
-  wtu.checkCanvas(gl, [0, 255, 0, 255], "should be green", tolerance);
+  if (info.renderColor !== undefined) {
+    wtu.checkCanvas(gl, info.renderColor, "should be expected color " + info.renderColor, tolerance);
+  } else {
+    wtu.checkCanvas(gl, [0, 255, 0, 255], "should be green", tolerance);
+  }
 }
 
 function runTests(shaderInfos, opt_contextVersion) {
@@ -303,17 +311,11 @@ function runTests(shaderInfos, opt_contextVersion) {
     return;
   }
 
-  var testIndex = 0;
-  var runNextTest = function() {
-    if (testIndex == shaderInfos.length) {
-      finishTest();
-      return;
-    }
-
-    runOneTest(gl, shaderInfos[testIndex++]);
-    setTimeout(runNextTest, 1);
+  for (var i = 0; i < shaderInfos.length; i++) {
+    runOneTest(gl, shaderInfos[i]);
   }
-  runNextTest();
+
+  finishTest();
 };
 
 function getSource(elem) {

conformance-suites/2.0.0/js/js-test-pre.js

@@ -708,6 +708,14 @@ function webglHarnessCollectGarbage() {
         return;
     }
 
+    // WebKit's MiniBrowser with the following environment variables set:
+    //   export JSC_useDollarVM=1
+    //   export __XPC_JSC_useDollarVM=1
+    if (window.$vm) {
+        window.$vm.gc();
+        return;
+    }
+
     function gcRec(n) {
         if (n < 1)
             return {};

conformance-suites/2.0.0/py/lint/README.md

@@ -22,7 +22,7 @@ WebGL/sdk/tests working directory like this:
 You can use the lint tool to check submitted pull request and fix the errors reported by the tool.
 Reviewers will not merge branches with tests that have lint errors, so you must either
 [fix all lint errors](#fixing-lint-errors) or update
-[white-list test files] (#updating-the-whitelist) to suppress the errors.
+[allow-list test files] (#updating-the-allowlist) to suppress the errors.
 
 ## Usage of lint tool
 
@@ -46,7 +46,7 @@ WebGL/sdk/tests:</br>
 You must fix any errors the lint tool reports, unless an error is for
 something essential to a certain test or that for some other exceptional
 reason shouldn't prevent the test from being merged. In those cases you can
-update [white-list test files](#updating-the-whiteslist) to suppress the errors.
+update [allow-list test files](#updating-the-allowlist) to suppress the errors.
 Otherwise, use the details in this section to fix all errors reported.
 
 * **CR AT EOL**: Test-file line ends with CR (U+000D) character; **fix**:
@@ -65,32 +65,32 @@ Otherwise, use the details in this section to fix all errors reported.
 * **FILENAME WHITESPACE**: Test file name contains white space; **fix**:
   remove white space from test file name.
 
-## Updating the whitelist
+## Updating the allowlist
 
 Normally you must [fix all lint errors](#fixing-lint-errors). But in the
 unusual case of error reports for things essential to certain tests or that
 for other exceptional reasons shouldn't prevent a merge of a test, you can
-update and commit the `lint.whitelist` file in the WebGL/sdk/tests/py/lint/
+update and commit the `lint.allowlist` file in the WebGL/sdk/tests/py/lint/
 directory to suppress errors the lint tool would report for a test file.
 
-To add a test file or directory to the whitelist, use the following format:
+To add a test file or directory to the allowlist, use the following format:
 
 ```
 ERROR TYPE:file/name/pattern
 ```
 
-For example, to whitelist the file `example/file.html` such that all
+For example, to allowlist the file `example/file.html` such that all
 `TRAILING WHITESPACE` errors the lint tool would report for it are
-suppressed, add the following line to the `lint.whitelist` file.
+suppressed, add the following line to the `lint.allowlist` file.
 
 ```
 TRAILING WHITESPACE:example/file.html
 ```
 
-To whitelist an entire directory rather than just one file, use the `*`
-wildcard. For example, to whitelist the `example` directory such that all
+To allowlist an entire directory rather than just one file, use the `*`
+wildcard. For example, to allowlist the `example` directory such that all
 `TRAILING WHITESPACE` errors the lint tool would report for any files in it
-are suppressed, add the following line to the `lint.whitelist` file.
+are suppressed, add the following line to the `lint.allowlist` file.
 
 ```
 TRAILING WHITESPACE:example/*
@@ -100,15 +100,15 @@ If needed, you can also use the `*` wildcard to express other filename
 patterns or directory-name patterns (just as you would when, e.g.,
 executing shell commands from the command line).
 
-Finally, to whitelist just one line in a file, use the following format:
+Finally, to allowlist just one line in a file, use the following format:
 
 ```
 ERROR TYPE:file/name/pattern:line_number
 ```
 
-For example, to whitelist just line 128 of the file `example/file.html`
+For example, to allowlist just line 128 of the file `example/file.html`
 such that any `TRAILING WHITESPACE` error the lint tool would report for
-that line is suppressed, add the following to the `lint.whitelist` file.
+that line is suppressed, add the following to the `lint.allowlist` file.
 
 ```
 TRAILING WHITESPACE:example/file.html:128

conformance-suites/2.0.0/py/lint/lint.py

@@ -62,7 +62,7 @@ def check_permission(path):
     return []
 
 
-def parse_whitelist_file(filename):
+def parse_allowlist_file(filename):
     data = defaultdict(lambda:defaultdict(set))
 
     with open(filename) as f:
@@ -80,29 +80,29 @@ def parse_whitelist_file(filename):
             data[file_match][error_type].add(line_number)
 
     def inner(path, errors):
-        whitelisted = [False for item in xrange(len(errors))]
+        allowlisted = [False for item in xrange(len(errors))]
 
-        for file_match, whitelist_errors in data.iteritems():
+        for file_match, allowlist_errors in data.iteritems():
             if fnmatch.fnmatch(path, file_match):
                 for i, (error_type, msg, line) in enumerate(errors):
-                    if "*" in whitelist_errors:
-                        whitelisted[i] = True
-                    elif error_type in whitelist_errors:
-                        allowed_lines = whitelist_errors[error_type]
+                    if "*" in allowlist_errors:
+                        allowlisted[i] = True
+                    elif error_type in allowlist_errors:
+                        allowed_lines = allowlist_errors[error_type]
                         if None in allowed_lines or line in allowed_lines:
-                            whitelisted[i] = True
+                            allowlisted[i] = True
 
-        return [item for i, item in enumerate(errors) if not whitelisted[i]]
+        return [item for i, item in enumerate(errors) if not allowlisted[i]]
     return inner
 
 
-_whitelist_fn = None
-def whitelist_errors(path, errors):
-    global _whitelist_fn
+_allowlist_fn = None
+def allowlist_errors(path, errors):
+    global _allowlist_fn
 
-    if _whitelist_fn is None:
-        _whitelist_fn = parse_whitelist_file(os.path.join(lint_root, "lint.whitelist"))
-    return _whitelist_fn(path, errors)
+    if _allowlist_fn is None:
+        _allowlist_fn = parse_allowlist_file(os.path.join(lint_root, "lint.allowlist"))
+    return _allowlist_fn(path, errors)
 
 
 class Regexp(object):
@@ -189,7 +189,7 @@ def main():
     repo_root = repo_root.replace("WebGL/sdk/tests", options.repo)
 
     def run_lint(path, fn, *args):
-        errors = whitelist_errors(path, fn(path, *args))
+        errors = allowlist_errors(path, fn(path, *args))
         output_errors(errors)
         for error_type, error, line in errors:
             error_count[error_type] += 1

extensions/EXT_clip_cull_distance/extension.xml

@@ -7,6 +7,7 @@
 
   <contributors>
     <contributor>Members of the WebGL working group</contributor>
+    <contributor>Kevin Rogovin (kevinrogovin[at]invisionapp.com</contributor>
   </contributors>
 
   <number>43</number>
@@ -18,6 +19,10 @@
   <overview>
     <mirrors href="https://www.khronos.org/registry/gles/extensions/EXT/EXT_clip_cull_distance.txt"
              name="EXT_clip_cull_distance">
+      <addendum>
+        <p>WebGL implementations can return 0 for the maximum number cull planes
+        (MAX_CULL_DISTANCES_EXT) supported.</p>
+      </addendum>
     </mirrors>
 
     <features>
@@ -78,5 +83,8 @@
     <revision date="2019/09/25">
       <change>Promoted to Draft.</change>
     </revision>
+    <revision date="2020/07/01">
+      <change>Added addendum that allows for the number of cull planes to be 0.</change>
+    </revision>
   </history>
 </draft>

extensions/EXT_texture_compression_bptc/extension.xml

@@ -26,6 +26,12 @@
       <a href="https://www.khronos.org/registry/OpenGL/extensions/EXT/EXT_sRGB.txt">EXT_sRGB</a> OpenGL ES
       extension.
     </p>
+    <p>
+      Unlike the OpenGL ES extension, this WebGL extension does not extend <code>texImage2D</code> entry point.
+    </p>
+    <p>
+      For compatibility reasons, the width and the height of the top level mip map are required to be a multiple of 4.
+    </p>
     <features>
       <feature>
         Compression format <code>COMPRESSED_RGBA_BPTC_UNORM_EXT</code>,
@@ -50,6 +56,22 @@
         </code></blockquote>
         <p>If it is not, an <code>INVALID_VALUE</code> error is generated.</p>
       </feature>
+      <feature>
+        <p>The following format-specific restrictions must be enforced:</p>
+        <dl>
+          <dt>COMPRESSED_RGBA_BPTC_UNORM_EXT</dt>
+          <dt>COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT</dt>
+          <dt>COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT</dt>
+          <dt>COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT</dt>
+          <dd>
+          <p>When <code>level</code> equals zero <code>width</code> and <code>height</code>
+          must be a multiple of 4.</p>
+          <p>
+          If they are not an <code>INVALID_OPERATION</code> error is generated.
+          </p>
+          </dd>
+          </dl>
+      </feature>
     </features>
   </overview>
   <idl xml:space="preserve">
@@ -93,6 +115,11 @@ interface EXT_texture_compression_bptc {
         ceil(width / 4) * ceil(height / 4) * 16
       </code></blockquote>
     </error>
+    <error enum="INVALID_OPERATION">
+      The error <code>INVALID_OPERATION</code> is generated by <code>compressedTexImage2D</code> and
+      <code>compressedTexSubImage2D</code> if the <code>level</code> parameter is
+      <code>0</code> and the <code>width</code> or <code>height</code> is not a multiple of 4.
+    </error>
   </errors>
 
   <history>
@@ -109,5 +136,11 @@ interface EXT_texture_compression_bptc {
     <revision date="2018/11/05">
       <change>Moved to Community Approved status.</change>
     </revision>
+    <revision date="2020/06/25">
+      <change>Clarified <code>texImage2D</code> entry point.</change>
+    </revision>
+    <revision date="2020/07/07">
+      <change>Clarified WebGL-specific dimensions restriction.</change>
+    </revision>
   </history>
 </extension>