Skip to content

Use GLSL test framework for tests that need to set uniforms #2330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhenyao merged 1 commit into from
Mar 8, 2017
Merged

Use GLSL test framework for tests that need to set uniforms #2330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 10 additions & 26 deletions sdk/tests/conformance/glsl/bugs/compare-loop-index-to-uniform.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,11 @@
<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="canvas" width="256" height="256"> </canvas>
<div id="description"></div>
<div id="console"></div>
<script id="vshader" type="x-shader/x-vertex">
attribute vec3 aPosition;

void main() {
gl_Position = vec4(aPosition, 1);
}
</script>
<script id="fshader" type="x-shader/x-fragment">
precision mediump float;
uniform int uCount;
Expand All @@ -62,25 +55,16 @@
<script type="application/javascript">
"use strict";
description("Comparing loop index to an uniform in a fragment shader should work.");
debug("");
var wtu = WebGLTestUtils;
function test() {
var gl = wtu.create3DContext("canvas");
if (!gl) {
testFailed("context does not exist");
return;
}
wtu.setupUnitQuad(gl);
var program = wtu.setupProgram(gl, ["vshader", "fshader"], ["aPosition"], undefined, true);
var uniformLoc = gl.getUniformLocation(program, 'uCount');
gl.uniform1i(uniformLoc, 5);
wtu.drawUnitQuad(gl);
wtu.checkCanvas(gl, [0, 255, 0, 255]);
};

test();
var successfullyParsed = true;
finishTest();
GLSLConformanceTester.runRenderTests([
{
fShaderId: 'fshader',
fShaderSuccess: true,
linkSuccess: true,
passMsg: 'Compare a loop index to an uniform',
uniforms: [{name: "uCount", functionName: "uniform1i", value: 5}]
}
]);
</script>
</body>
</html>
Expand Down
63 changes: 27 additions & 36 deletions sdk/tests/conformance/glsl/bugs/constant-precision-qualifier.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,11 @@
<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="canvas" width="256" height="256"> </canvas>
<div id="description"></div>
<div id="console"></div>
<script id="vshader" type="x-shader/x-vertex">
attribute vec3 aPosition;

void main() {
gl_Position = vec4(aPosition, 1);
}
</script>
<script id="fshader" type="x-shader/x-fragment">
// It is assumed that uTest is set to 0. It's here to make the expression not constant.
uniform mediump float uTest;
Expand Down Expand Up @@ -96,43 +89,41 @@
<script type="application/javascript">
"use strict";
description();
var wtu = WebGLTestUtils;

function test() {
var gl = wtu.create3DContext("canvas");
var wtu = WebGLTestUtils;
var gl = wtu.create3DContext();
if (!gl) {
testFailed("context does not exist");
return;
}
if (gl.getShaderPrecisionFormat(gl.FRAGMENT_SHADER, gl.HIGH_FLOAT).precision == 0) {
testPassed("highp precision not supported");
} else {
wtu.setupUnitQuad(gl);

debug("Testing shader where the precision qualifier of a constant affects built-in function results");
var program = wtu.setupProgram(gl, ["vshader", "fshader"], ["aPosition"], undefined, true);
var uniformLoc = gl.getUniformLocation(program, 'uTest');
gl.uniform1f(uniformLoc, 0);
wtu.drawUnitQuad(gl);
wtu.checkCanvasRect(gl, 0, 0, 256, 256, [0, 255, 0, 255]);

debug("");
debug("Testing shader where the precision qualifier of a variable affects built-in function results");
program = wtu.setupProgram(gl, ["vshader", "fshaderNoConstants"], ["aPosition"], undefined, true);
uniformLoc = gl.getUniformLocation(program, 'uTest');
gl.uniform1f(uniformLoc, 0);
uniformLoc = gl.getUniformLocation(program, 'uTestHigh');
gl.uniform1f(uniformLoc, 0);
wtu.drawUnitQuad(gl);
wtu.checkCanvasRect(gl, 0, 0, 256, 256, [0, 255, 0, 255]);

debug("");
debug("Testing shader where all variables are qualified as highp");
program = wtu.setupProgram(gl, ["vshader", "fshaderAllHighp"], ["aPosition"], undefined, true);
uniformLoc = gl.getUniformLocation(program, 'uTest');
gl.uniform1f(uniformLoc, 0);
wtu.drawUnitQuad(gl);
wtu.checkCanvasRect(gl, 0, 0, 256, 256, [0, 255, 0, 255]);
GLSLConformanceTester.runRenderTests([
{
fShaderId: 'fshader',
fShaderSuccess: true,
linkSuccess: true,
passMsg: 'The precision qualifier of a constant affects built-in function results',
uniforms: [{name: "uTest", functionName: "uniform1f", value: 0}]
},
{
fShaderId: 'fshaderNoConstants',
fShaderSuccess: true,
linkSuccess: true,
passMsg: 'The precision qualifier of a variable affects built-in function results',
uniforms: [{name: "uTest", functionName: "uniform1f", value: 0},
{name: "uTestHigh", functionName: "uniform1f", value: 0}]
},
{
fShaderId: 'fshaderAllHighp',
fShaderSuccess: true,
linkSuccess: true,
passMsg: 'All variables are qualified as highp',
uniforms: [{name: "uTest", functionName: "uniform1f", value: 0}]
},
]);
}
};

Expand Down
33 changes: 14 additions & 19 deletions sdk/tests/conformance/glsl/bugs/floored-division-accuracy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@
<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="repro" style="border: none;" width="256" height="256"></canvas>
<div id="description"></div>
<div id="console"></div>

<script id="shader-vs" type="x-shader/x-vertex">
attribute vec2 pos;
attribute vec4 vPosition;
uniform float divisor;
varying vec4 vColor;
void main(void) {
gl_Position = vec4(pos, 0.0, 1.0);
gl_Position = vPosition;
float index = 9.0;
// Floating point operations don't have any guaranteed precision, but they
// should at least be accurate to 1 part in 10^5.
Expand All @@ -65,31 +65,26 @@
</script>
<script>
"use strict";

description();

debug("");
// Reproduces bug seen on Mac OS X with AMD Radeon HD 6490 GPU
debug("If things are working correctly, then the square will be green.");
debug("If your card thinks floor(9. / 3.) is not 3 to within 1 part in 10^5, ");
debug("then the square will be red.");

var wtu = WebGLTestUtils;
var canvas = document.getElementById("repro");
var gl = wtu.create3DContext(canvas);
if (!gl) {
testFailed("context does not exist");
} else {
gl.clearColor(0.0, 0.0, 0.0, 1.0);
gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
wtu.setupUnitQuad(gl);
var program = wtu.setupProgram(gl, ["shader-vs", "shader-fs"], ["pos"], undefined, true);
gl.uniform1f(gl.getUniformLocation(program, "divisor"), 3);
wtu.drawUnitQuad(gl);
wtu.checkCanvasRect(gl, 128, 128, 128, 128, [ 0, 255, 0, 255 ], "should be green", 1);
GLSLConformanceTester.runRenderTests([
{
vShaderId: 'shader-vs',
vShaderSuccess: true,
fShaderId: 'shader-fs',
fShaderSuccess: true,
linkSuccess: true,
passMsg: 'Test that floor(9. / 3.) is 3 to within 1 part in 10^5',
uniforms: [{name: "divisor", functionName: "uniform1f", value: 3}]
}
]);

var successfullyParsed = true;
</script>
<script src="../../../js/js-test-post.js"></script>
</body>
</html>
50 changes: 16 additions & 34 deletions sdk/tests/conformance/glsl/bugs/logic-inside-block-without-braces.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,11 @@
<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="canvas" width="256" height="256"> </canvas>
<div id="description"></div>
<div id="console"></div>
<script id="vshader" type="x-shader/x-vertex">
attribute vec3 aPosition;

void main() {
gl_Position = vec4(aPosition, 1);
}
</script>
<script id="fshaderIf" type="x-shader/x-fragment">
precision mediump float;
uniform bool uFalse;
Expand Down Expand Up @@ -92,33 +85,22 @@
"use strict";
description("Short-circuiting logic operator with side effects inside if/for statement without braces should work.");
debug("");
var wtu = WebGLTestUtils;
function test() {
var gl = wtu.create3DContext("canvas");
if (!gl) {
testFailed("context does not exist");
return;
}
wtu.setupUnitQuad(gl);

debug("");
debug("Testing if");
var program = wtu.setupProgram(gl, ["vshader", "fshaderIf"], ["aPosition"], undefined, true);
var uniformLoc = gl.getUniformLocation(program, 'uFalse');
gl.uniform1i(uniformLoc, 0);
wtu.drawUnitQuad(gl);
wtu.checkCanvas(gl, [0, 255, 0, 255]);

debug("");
debug("Testing for");
var program = wtu.setupProgram(gl, ["vshader", "fshaderFor"], ["aPosition"], undefined, true);
wtu.drawUnitQuad(gl);
wtu.checkCanvas(gl, [0, 255, 0, 255]);
};

test();
var successfullyParsed = true;
finishTest();
GLSLConformanceTester.runRenderTests([
{
fShaderId: 'fshaderIf',
fShaderSuccess: true,
linkSuccess: true,
passMsg: 'Short-circuiting operator inside if statement without braces',
uniforms: [{name: "uFalse", functionName: "uniform1i", value: 0}]
},
{
fShaderId: 'fshaderFor',
fShaderSuccess: true,
linkSuccess: true,
passMsg: 'Short-circuiting operator inside for statement without braces'
}
]);
</script>
</body>
</html>
Expand Down
32 changes: 13 additions & 19 deletions sdk/tests/conformance/glsl/bugs/modulo-arithmetic-accuracy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@
<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="repro" style="border: none;" width="256" height="256"></canvas>
<div id="description"></div>
<div id="console"></div>

<script id="shader-vs" type="x-shader/x-vertex">
attribute vec2 pos;
attribute vec4 vPosition;
uniform float divisor;
varying vec4 vColor;
void main(void) {
gl_Position = vec4(pos, 0.0, 1.0);
gl_Position = vPosition;
float index = 9.0;
// mod(x, y) is computed as x-y*floor(x/y). There are no guarantees on
// the precision of floating point operations in WebGL shaders, but division
Expand All @@ -73,23 +73,17 @@
debug("If things are working correctly, then the square will be green.");
debug("If your card thinks mod(9,3) is not 0, then the square will be red.");

var wtu = WebGLTestUtils;
var canvas = document.getElementById("repro");
var gl = wtu.create3DContext(canvas);
if (!gl) {
testFailed("context does not exist");
} else {
gl.clearColor(0.0, 0.0, 0.0, 1.0);
gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
wtu.setupUnitQuad(gl);
var program = wtu.setupProgram(gl, ["shader-vs", "shader-fs"], ["pos"], undefined, true);
gl.uniform1f(gl.getUniformLocation(program, "divisor"), 3);
wtu.drawUnitQuad(gl);
wtu.checkCanvasRect(gl, 128, 128, 128, 128, [ 0, 255, 0, 255 ], "should be green", 1);
GLSLConformanceTester.runRenderTests([
{
vShaderId: 'shader-vs',
vShaderSuccess: true,
fShaderId: 'shader-fs',
fShaderSuccess: true,
linkSuccess: true,
passMsg: 'Test that mod(9/3) is 0',
uniforms: [{name: "divisor", functionName: "uniform1f", value: 3}]
}

var successfullyParsed = true;
]);
</script>
<script src="../../../js/js-test-post.js"></script>
</body>
</html>
Loading