Test passing a sampler array in a struct to a function (#2483)
This is broken on ANGLE's HLSL backend.
Includes some cleanup in an older similar test.
diff --git a/sdk/tests/conformance/glsl/bugs/00_test_list.txt b/sdk/tests/conformance/glsl/bugs/00_test_list.txt
index 43aa1c1..4377221 100644
--- a/sdk/tests/conformance/glsl/bugs/00_test_list.txt
+++ b/sdk/tests/conformance/glsl/bugs/00_test_list.txt
@@ -29,6 +29,7 @@
--min-version 1.0.4 pow-with-constant-exponent-should-not-crash.html
--min-version 1.0.4 qualcomm-crash.html
--min-version 1.0.4 qualcomm-loop-with-continue-crash.html
+--min-version 1.0.4 sampler-array-struct-function-arg.html
--min-version 1.0.3 sampler-array-using-loop-index.html
--min-version 1.0.4 sampler-struct-function-arg.html
--min-version 1.0.4 sequence-operator-evaluation-order.html
diff --git a/sdk/tests/conformance/glsl/bugs/sampler-array-struct-function-arg.html b/sdk/tests/conformance/glsl/bugs/sampler-array-struct-function-arg.html
new file mode 100644
index 0000000..1d72ad1
--- /dev/null
+++ b/sdk/tests/conformance/glsl/bugs/sampler-array-struct-function-arg.html
@@ -0,0 +1,92 @@
+<!--
+
+/*
+** Copyright (c) 2017 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+-->
+
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>GLSL struct containing an array of samplers passed into a user-defined function</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>
+<script src="../../../js/glsl-conformance-test.js"></script>
+</head>
+<body>
+
+<canvas id="output" style="border: none;" width="64" height="64"></canvas>
+<div id="description"></div>
+<div id="console"></div>
+<script id="fshaderSampler" type="x-shader/x-fragment">
+precision mediump float;
+
+struct S {
+ sampler2D sam[2];
+};
+
+uniform S uni;
+
+vec4 useSampler(S arg)
+{
+ return texture2D(arg.sam[0], vec2(0.0, 0.0));
+}
+
+void main() {
+ gl_FragColor = vec4(useSampler(uni));
+}
+</script>
+<script type="application/javascript">
+"use strict";
+description();
+
+var wtu = WebGLTestUtils;
+var canvas = document.getElementById("output");
+var gl = wtu.create3DContext(canvas, undefined, 2);
+
+if (!gl) {
+ testFailed("Could not create a GL context.");
+} else {
+ debug("Drawing with a shader that uses a sampler array in a struct passed into a function.");
+ var program = wtu.setupProgram(
+ gl, [wtu.simpleVertexShader, 'fshaderSampler'], ['a_position'], [0], true);
+ wtu.setupUnitQuad(gl);
+
+ var tex = gl.createTexture();
+ gl.bindTexture(gl.TEXTURE_2D, tex);
+ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
+ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
+ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
+ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
+ wtu.fillTexture(gl, tex, 1, 1, [0, 255, 0, 255]);
+
+ wtu.clearAndDrawUnitQuad(gl);
+ wtu.checkCanvas(gl, [0, 255, 0, 255], "should be green");
+}
+
+var successfullyParsed = true;
+</script>
+</body>
+</html>
diff --git a/sdk/tests/conformance/glsl/bugs/sampler-struct-function-arg.html b/sdk/tests/conformance/glsl/bugs/sampler-struct-function-arg.html
index 6986dc0..d310029 100644
--- a/sdk/tests/conformance/glsl/bugs/sampler-struct-function-arg.html
+++ b/sdk/tests/conformance/glsl/bugs/sampler-struct-function-arg.html
@@ -35,7 +35,7 @@
</head>
<body>
-<canvas id="output" style="border: none;" width="256" height="256"></canvas>
+<canvas id="output" style="border: none;" width="64" height="64"></canvas>
<div id="description"></div>
<div id="console"></div>
@@ -77,7 +77,6 @@
"use strict";
description();
-debug("");
debug("If the test passes correctly the viewport will be green.");
var wtu = WebGLTestUtils;
@@ -99,10 +98,6 @@
};
var test = function(fragShaderId, texUniformName) {
- // Clear complete viewport to red
- gl.clearColor(1.0, 0.0, 0.0, 1.0);
- gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
-
var program = wtu.setupProgram(gl, [wtu.simpleVertexShader, fragShaderId], ["a_position"], [0], true);
if (!program) {
@@ -115,7 +110,7 @@
gl.uniform1i(uniformMap[texUniformName].location, 0);
// Draw
- wtu.drawUnitQuad(gl);
+ wtu.clearAndDrawUnitQuad(gl);
// Verify output
wtu.checkCanvasRect(gl, 0, 128, 256, 128, [0, 255,0, 255], "should be green", 1);
