Move EXT_blend_func_extended to draft; add tests (#3585)

KhronosGroup · Sep 5, 2023 · f4bf599 · f4bf599
1 parent eab0468
commit f4bf599
Show file tree

Hide file tree

Showing 6 changed files with 606 additions and 4 deletions.
diff --git a/...als/EXT_blend_func_extended/extension.xml → ...ons/EXT_blend_func_extended/extension.xml b/...als/EXT_blend_func_extended/extension.xml → ...ons/EXT_blend_func_extended/extension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<proposal href="proposals/EXT_blend_func_extended/">
+<draft href="EXT_blend_func_extended/">
   <name>EXT_blend_func_extended</name>
 
   <contact> <a href="https://www.khronos.org/webgl/public-mailing-list/">WebGL
@@ -9,7 +9,7 @@
     <contributor>Members of the WebGL working group</contributor>
   </contributors>
 
-  <number>NN</number>
+  <number>58</number>
 
   <depends>
     <api version="1.0"/>
@@ -27,7 +27,7 @@
       <addendum>
         <p>
           <code>INVALID_OPERATION</code> is generated by attempting to draw
-          when any of the new blend factors are used for an active draw buffer,
+          when any of the <code>SRC1</code> blend factors are used for an active draw buffer,
           which has blending enabled, and the fragment shader does not
         </p>
         <ul>
@@ -145,4 +145,4 @@ interface EXT_blend_func_extended {
       <change>Initial Draft.</change>
     </revision>
   </history>
-</proposal>
+</draft>
diff --git a/sdk/tests/conformance/extensions/00_test_list.txt b/sdk/tests/conformance/extensions/00_test_list.txt
@@ -1,5 +1,6 @@
 --min-version 1.0.3 --max-version 1.9.9 angle-instanced-arrays.html
 --min-version 1.0.3 --max-version 1.9.9 angle-instanced-arrays-out-of-bounds.html
+--min-version 1.0.4 --max-version 1.9.9 ext-blend-func-extended.html
 --min-version 1.0.3 --max-version 1.9.9 ext-blend-minmax.html
 --min-version 1.0.4 ext-clip-control.html
 --min-version 1.0.4 ext-color-buffer-half-float.html

diff --git a/sdk/tests/conformance/extensions/ext-blend-func-extended.html b/sdk/tests/conformance/extensions/ext-blend-func-extended.html
@@ -0,0 +1,26 @@
+<!--
+Copyright (c) 2023 The Khronos Group Inc.
+Use of this source code is governed by an MIT-style license that can be
+found in the LICENSE.txt file.
+-->
+
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>WebGL 1.0 EXT_blend_func_extended Conformance Tests</title>
+<link rel="stylesheet" href="../../resources/js-test-style.css"/>
+<script src="../../js/js-test-pre.js"></script>
+<script src="../../js/webgl-test-utils.js"></script>
+</head>
+<body>
+<canvas width="32" height="32" id="c"></canvas>
+<div id="description"></div>
+<div id="console"></div>
+<script>
+var contextVersion = 1;
+</script>
+<script src="../../js/tests/ext-blend-func-extended.js"></script>
+<script src="../../js/js-test-post.js"></script>
+</body>
+</html>
diff --git a/sdk/tests/conformance2/extensions/00_test_list.txt b/sdk/tests/conformance2/extensions/00_test_list.txt
@@ -1,3 +1,4 @@
+--min-version 2.0.1 ext-blend-func-extended.html
 ext-color-buffer-float.html
 --min-version 2.0.1 ext-color-buffer-half-float.html
 --min-version 2.0.1 ext-conservative-depth.html

diff --git a/sdk/tests/conformance2/extensions/ext-blend-func-extended.html b/sdk/tests/conformance2/extensions/ext-blend-func-extended.html
@@ -0,0 +1,26 @@
+<!--
+Copyright (c) 2023 The Khronos Group Inc.
+Use of this source code is governed by an MIT-style license that can be
+found in the LICENSE.txt file.
+-->
+
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>WebGL 2.0 EXT_blend_func_extended Conformance Tests</title>
+<link rel="stylesheet" href="../../resources/js-test-style.css"/>
+<script src="../../js/js-test-pre.js"></script>
+<script src="../../js/webgl-test-utils.js"></script>
+</head>
+<body>
+<canvas width="32" height="32" id="c"></canvas>
+<div id="description"></div>
+<div id="console"></div>
+<script>
+var contextVersion = 2;
+</script>
+<script src="../../js/tests/ext-blend-func-extended.js"></script>
+<script src="../../js/js-test-post.js"></script>
+</body>
+</html>