From 660a18514aeb58e33b3ff6f0aa90961eee17e49c Mon Sep 17 00:00:00 2001 From: Kelsey Gilbert Date: Thu, 19 Sep 2024 17:56:17 -0700 Subject: [PATCH] Add conformance2/uniforms/uniform-block-idents-as-expr. Fixes #3644. --- .../conformance2/uniforms/00_test_list.txt | 2 +- .../uniform-block-idents-as-expr.html | 107 ++++++++++++++++++ sdk/tests/js/webgl-test-utils.js | 2 +- 3 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 sdk/tests/conformance2/uniforms/uniform-block-idents-as-expr.html diff --git a/sdk/tests/conformance2/uniforms/00_test_list.txt b/sdk/tests/conformance2/uniforms/00_test_list.txt index 05e01f554c..098239f178 100644 --- a/sdk/tests/conformance2/uniforms/00_test_list.txt +++ b/sdk/tests/conformance2/uniforms/00_test_list.txt @@ -1,9 +1,9 @@ --min-version 2.0.1 draw-with-uniform-blocks.html --min-version 2.0.1 gl-uniform-arrays-sub-source.html --min-version 2.0.1 query-uniform-blocks-after-shader-detach.html +--min-version 2.0.1 uniform-block-idents-as-expr.html --min-version 2.0.1 uniform-blocks-with-arrays.html --min-version 2.0.1 simple-buffer-change.html --min-version 2.0.1 dependent-buffer-change.html --min-version 2.0.1 incompatible-texture-type-for-sampler.html --min-version 2.0.1 large-uniform-buffers.html - diff --git a/sdk/tests/conformance2/uniforms/uniform-block-idents-as-expr.html b/sdk/tests/conformance2/uniforms/uniform-block-idents-as-expr.html new file mode 100644 index 0000000000..6860dc9005 --- /dev/null +++ b/sdk/tests/conformance2/uniforms/uniform-block-idents-as-expr.html @@ -0,0 +1,107 @@ + + + + + + +WebGL uniform block identifiers used as expressions + + + + + +
+
+ + + + + diff --git a/sdk/tests/js/webgl-test-utils.js b/sdk/tests/js/webgl-test-utils.js index f17f69fa30..3697f7f31b 100644 --- a/sdk/tests/js/webgl-test-utils.js +++ b/sdk/tests/js/webgl-test-utils.js @@ -295,7 +295,7 @@ var setupProgram = function( var shader = shaders[ii]; var shaderType = undefined; if (typeof shader == 'string') { - var element = document.getElementById(shader); + const element = shader != '' && document.getElementById(shader); if (element) { if (element.type != "x-shader/x-vertex" && element.type != "x-shader/x-fragment") shaderType = ii ? gl.FRAGMENT_SHADER : gl.VERTEX_SHADER;