Add conformance2/uniforms/uniform-block-idents-as-expr.

Fixes #3644.
KhronosGroup · Sep 20, 2024 · 660a185 · 660a185
1 parent 2652500
commit 660a185
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 2 deletions.
diff --git 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
@@ -0,0 +1,107 @@
+<!--
+Copyright (c) 2024 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 uniform block identifiers used as expressions</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>
+<div id="description"></div>
+<div id="console"></div>
+<script>
+"use strict";
+description();
+
+var wtu = WebGLTestUtils;
+var gl = wtu.create3DContext(undefined, undefined, 2);
+
+if (!gl) {
+    testFailed("WebGL context creation failed");
+} else {
+    wtu.setupUnitQuad(gl);
+
+    // -
+
+    function makeVSrc(src) {
+        src = src || 'void f() { }';
+        return `
+#version 300 es
+in vec4 vPosition;
+// -
+${src}
+// -
+void main() {
+    f();
+    gl_Position = vPosition;
+}
+        `.trim();
+    }
+    function makeFSrc(src) {
+        src = src || 'void f() { }';
+        return `
+#version 300 es
+precision mediump float;
+// -
+${src}
+// -
+void main() {
+    f();
+}
+        `.trim();
+    }
+
+    // -
+
+    const shaderTests = [
+        {shaderOk: true , src: 'uniform BlockName { vec4 member; };\nvoid f() { member; }'},
+        {shaderOk: false, src: 'uniform BlockName { vec4 member; };\nvoid f() { BlockName; }'},
+        {shaderOk: false, src: 'uniform BlockName { vec4 member; };\nvoid f() { BlockName.member; }'},
+        {shaderOk: false, src: 'uniform BlockName { vec4 member; };\nvoid f() { BlockName[0]; }'},
+        {shaderOk: false, src: 'uniform BlockName { vec4 member; };\nvoid f() { BlockName[0].member; }'},
+
+        {shaderOk: false, src: 'uniform BlockName { vec4 member; } InstanceName;\nvoid f() { member; }'},
+        {shaderOk: false, src: 'uniform BlockName { vec4 member; } InstanceName;\nvoid f() { InstanceName; }'},
+        {shaderOk: true , src: 'uniform BlockName { vec4 member; } InstanceName;\nvoid f() { InstanceName.member; }'},
+        {shaderOk: false, src: 'uniform BlockName { vec4 member; } InstanceName;\nvoid f() { InstanceName[0]; }'},
+        {shaderOk: false, src: 'uniform BlockName { vec4 member; } InstanceName;\nvoid f() { InstanceName[0].member; }'},
+
+        {shaderOk: false, src: 'uniform BlockName { vec4 member; } InstanceName[1];\nvoid f() { member; }'},
+        {shaderOk: false, src: 'uniform BlockName { vec4 member; } InstanceName[1];\nvoid f() { InstanceName; }'},
+        {shaderOk: false, src: 'uniform BlockName { vec4 member; } InstanceName[1];\nvoid f() { InstanceName.member; }'},
+        {shaderOk: false, src: 'uniform BlockName { vec4 member; } InstanceName[1];\nvoid f() { InstanceName[0]; }'},
+        {shaderOk: true , src: 'uniform BlockName { vec4 member; } InstanceName[1];\nvoid f() { InstanceName[0].member; }'},
+    ];
+    const tests = [];
+    tests.push({programOk: true, vsrc: '', fsrc: ''});
+    for (const test of shaderTests) {
+        tests.push({programOk: test.shaderOk, vsrc: test.src, fsrc: ''});
+        tests.push({programOk: test.shaderOk, vsrc: '', fsrc: test.src});
+    }
+
+    for (const [i,test] of Object.entries(tests)) {
+        debug('');
+        debug(`test[${i}]: ` + JSON.stringify(test));
+        const vsrc = makeVSrc(test.vsrc);
+        const fsrc = makeFSrc(test.fsrc);
+        const program = wtu.setupProgram(gl, [vsrc, fsrc], ['vPosition'], undefined, true);
+        const wasLinked = !!program;
+        gl.deleteProgram(program);
+        expectTrue(wasLinked == test.programOk, `Expected linked: ${test.programOk}, was ${wasLinked}`);
+    }
+}
+
+debug("");
+var successfullyParsed = true;
+</script>
+<script src="../../js/js-test-post.js"></script>
+
+</body>
+</html>
diff --git 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;