From a115a655b26a04ab2ca29beb1649b12a9337ce14 Mon Sep 17 00:00:00 2001 From: Alexey Knyazev <3479527+lexaknyazev@users.noreply.github.com> Date: Fri, 30 Jun 2023 00:00:00 +0000 Subject: [PATCH] Move texture extensions to draft; add tests --- .../extension.xml | 6 +- .../WEBGL_stencil_texturing/extension.xml | 11 +- .../conformance/extensions/00_test_list.txt | 1 + .../ext-texture-mirror-clamp-to-edge.html | 217 ++++++++++++++ .../conformance2/extensions/00_test_list.txt | 1 + .../extensions/webgl-stencil-texturing.html | 270 ++++++++++++++++++ 6 files changed, 498 insertions(+), 8 deletions(-) rename extensions/{proposals => }/EXT_texture_mirror_clamp_to_edge/extension.xml (96%) rename extensions/{proposals => }/WEBGL_stencil_texturing/extension.xml (90%) create mode 100644 sdk/tests/conformance/extensions/ext-texture-mirror-clamp-to-edge.html create mode 100644 sdk/tests/conformance2/extensions/webgl-stencil-texturing.html diff --git a/extensions/proposals/EXT_texture_mirror_clamp_to_edge/extension.xml b/extensions/EXT_texture_mirror_clamp_to_edge/extension.xml similarity index 96% rename from extensions/proposals/EXT_texture_mirror_clamp_to_edge/extension.xml rename to extensions/EXT_texture_mirror_clamp_to_edge/extension.xml index 6e59a4aa8..3a32ad4f8 100644 --- a/extensions/proposals/EXT_texture_mirror_clamp_to_edge/extension.xml +++ b/extensions/EXT_texture_mirror_clamp_to_edge/extension.xml @@ -1,5 +1,5 @@ - + EXT_texture_mirror_clamp_to_edge WebGL @@ -9,7 +9,7 @@ Members of the WebGL working group - NN + 62 @@ -71,4 +71,4 @@ interface EXT_texture_mirror_clamp_to_edge { Initial Draft. - + diff --git a/extensions/proposals/WEBGL_stencil_texturing/extension.xml b/extensions/WEBGL_stencil_texturing/extension.xml similarity index 90% rename from extensions/proposals/WEBGL_stencil_texturing/extension.xml rename to extensions/WEBGL_stencil_texturing/extension.xml index ebaf54c7b..3a6ca1c1c 100644 --- a/extensions/proposals/WEBGL_stencil_texturing/extension.xml +++ b/extensions/WEBGL_stencil_texturing/extension.xml @@ -1,5 +1,5 @@ - + WEBGL_stencil_texturing WebGL @@ -9,7 +9,7 @@ Members of the WebGL working group - NN + 61 @@ -25,6 +25,7 @@ [Exposed=(Window,Worker), LegacyNoInterfaceObject] interface WEBGL_stencil_texturing { const GLenum DEPTH_STENCIL_TEXTURE_MODE_WEBGL = 0x90EA; + const GLenum STENCIL_INDEX_WEBGL = 0x1901; }; @@ -34,7 +35,7 @@ interface WEBGL_stencil_texturing { A new enum DEPTH_STENCIL_TEXTURE_MODE_WEBGL is accepted as the pname parameter; - param must be DEPTH_COMPONENT (default) or STENCIL_INDEX. + param must be DEPTH_COMPONENT (default) or STENCIL_INDEX_WEBGL. @@ -42,7 +43,7 @@ interface WEBGL_stencil_texturing { A new enum DEPTH_STENCIL_TEXTURE_MODE_WEBGL is accepted as the pname parameter; - param must be DEPTH_COMPONENT (default) or STENCIL_INDEX. + param must be DEPTH_COMPONENT (default) or STENCIL_INDEX_WEBGL. @@ -66,4 +67,4 @@ interface WEBGL_stencil_texturing { Initial Draft. - + diff --git a/sdk/tests/conformance/extensions/00_test_list.txt b/sdk/tests/conformance/extensions/00_test_list.txt index 4120f440e..e79aa2fb5 100644 --- a/sdk/tests/conformance/extensions/00_test_list.txt +++ b/sdk/tests/conformance/extensions/00_test_list.txt @@ -13,6 +13,7 @@ --min-version 1.0.3 --max-version 1.9.9 ext-shader-texture-lod.html --min-version 1.0.3 --max-version 1.9.9 ext-sRGB.html --min-version 1.0.2 ext-texture-filter-anisotropic.html +--min-version 1.0.4 ext-texture-mirror-clamp-to-edge.html --min-version 1.0.2 get-extension.html --min-version 1.0.4 khr-parallel-shader-compile.html --max-version 1.9.9 oes-standard-derivatives.html diff --git a/sdk/tests/conformance/extensions/ext-texture-mirror-clamp-to-edge.html b/sdk/tests/conformance/extensions/ext-texture-mirror-clamp-to-edge.html new file mode 100644 index 000000000..4e2f980b4 --- /dev/null +++ b/sdk/tests/conformance/extensions/ext-texture-mirror-clamp-to-edge.html @@ -0,0 +1,217 @@ + + + + + + +WebGL EXT_texture_mirror_clamp_to_edge Conformance Tests + + + + + + +
+
+ + + + diff --git a/sdk/tests/conformance2/extensions/00_test_list.txt b/sdk/tests/conformance2/extensions/00_test_list.txt index 1641a9dec..fce7491e9 100644 --- a/sdk/tests/conformance2/extensions/00_test_list.txt +++ b/sdk/tests/conformance2/extensions/00_test_list.txt @@ -24,3 +24,4 @@ promoted-extensions-in-shaders.html --min-version 2.0.1 webgl-multi-draw-instanced-base-vertex-base-instance.html --min-version 2.0.1 webgl-provoking-vertex.html --min-version 2.0.1 webgl-shader-pixel-local-storage.html +--min-version 2.0.1 webgl-stencil-texturing.html diff --git a/sdk/tests/conformance2/extensions/webgl-stencil-texturing.html b/sdk/tests/conformance2/extensions/webgl-stencil-texturing.html new file mode 100644 index 000000000..762453cc8 --- /dev/null +++ b/sdk/tests/conformance2/extensions/webgl-stencil-texturing.html @@ -0,0 +1,270 @@ + + + + + + +WebGL WEBGL_stencil_texturing Conformance Tests + + + + + +
+
+ + + +