Hash :
ae04e1e4
Author :
Date :
2017-11-27T16:00:39
Fix scalarizing vec and mat constructor args Scalarizing vec and mat constructor args can generate new statements in the parent block of the constructor. To preserve the correct execution order of expressions, scalarized vector and matrix constructors need to be first moved out from inside loop conditions and sequence operators. This is done whenever the compiler flag to scalarize args is on. BUG=chromium:772653 TEST=angle_unittests Change-Id: Id40f8d848a9d087e186ef2e680c8e4cd440221d9 Reviewed-on: https://chromium-review.googlesource.com/790412 Commit-Queue: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120
//
// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// ScalarizeVecAndMatConstructorArgs_test.cpp:
// Tests for scalarizing vector and matrix constructor args.
//
#include "GLSLANG/ShaderLang.h"
#include "angle_gl.h"
#include "gtest/gtest.h"
#include "tests/test_utils/compiler_test.h"
using namespace sh;
namespace
{
class ScalarizeVecAndMatConstructorArgsTest : public MatchOutputCodeTest
{
public:
ScalarizeVecAndMatConstructorArgsTest()
: MatchOutputCodeTest(GL_FRAGMENT_SHADER,
SH_SCALARIZE_VEC_AND_MAT_CONSTRUCTOR_ARGS,
SH_ESSL_OUTPUT)
{
}
};
// Verifies scalarizing matrix inside a vector constructor.
TEST_F(ScalarizeVecAndMatConstructorArgsTest, MatrixInVectorConstructor)
{
const std::string shaderString =
R"(
precision mediump float;
uniform mat2 umat2;
void main()
{
gl_FragColor = vec4(umat2);
})";
compile(shaderString);
std::vector<const char *> expectedStrings = {
"main()", " = _uumat2", "gl_FragColor = vec4(", "[0][0],", "[0][1],", "[1][0],", "[1][1])"};
EXPECT_TRUE(foundInCodeInOrder(expectedStrings));
}
// Verifies scalarizing a vector insized a matrix constructor.
TEST_F(ScalarizeVecAndMatConstructorArgsTest, VectorInMatrixConstructor)
{
const std::string shaderString =
R"(
precision mediump float;
uniform vec2 uvec2;
void main()
{
mat2 m = mat2(uvec2, uvec2);
gl_FragColor = vec4(m * uvec2, m * uvec2);
})";
compile(shaderString);
std::vector<const char *> expectedStrings = {
"main()", " = _uuvec2", "mat2(", "[0],", "[1],", "[0],", "[1])", "gl_FragColor = vec4("};
EXPECT_TRUE(foundInCodeInOrder(expectedStrings));
}
// Verifies that scalarizing vector and matrix constructor args inside a sequence operator preserves
// correct order of operations.
TEST_F(ScalarizeVecAndMatConstructorArgsTest, SequenceOperator)
{
const std::string shaderString =
R"(
precision mediump float;
uniform vec2 u;
void main()
{
vec2 v = u;
mat2 m = (v[0] += 1.0, mat2(v, v[1], -v[0]));
gl_FragColor = vec4(m[0], m[1]);
})";
compile(shaderString);
std::vector<const char *> expectedStrings = {"_uv[0] += 1.0", "-_uv[0]"};
EXPECT_TRUE(foundInCodeInOrder(expectedStrings));
}
// Verifies that scalarizing vector and matrix constructor args inside multiple declarations
// preserves the correct order of operations.
TEST_F(ScalarizeVecAndMatConstructorArgsTest, MultiDeclaration)
{
const std::string shaderString =
R"(
precision mediump float;
uniform vec2 u;
void main()
{
vec2 v = vec2(u[0]),
w = mat2(v, v) * u;
gl_FragColor = vec4(v, w);
})";
compile(shaderString);
std::vector<const char *> expectedStrings = {"vec2(_uu[0])", "mat2("};
EXPECT_TRUE(foundInCodeInOrder(expectedStrings));
}
} // anonymous namespace