Hash :
6f80f0f0
Author :
Date :
2022-08-06T02:29:19
Translator: Clean up the compile flag passing interface Historically, compile flags were sent to the translator as a bitmask. Recently, we were getting close to running out of bits. Additionally, direct-to-metal work had started to introduce constants to be passed to the translator, which were misplaced in ShBuiltInResources and Caps. Recent work on Pixel Local Storage adds even more constants, aggravating the situation. In this change, the interface to passing compile flags is reworked. A struct is passed (instead of a bitmask) that has one bit for each flag. This can be indefinitely extended. Additionally, the constants needed by metal and PLS are also placed in this struct. In turn, the backends can set these options directly, and don't have to hack them into Caps to further get hacked into ShBuiltInResources. Bug: angleproject:7559 Change-Id: If93f1e1b8818ad3a0ac708ab04ab93b4b397d114 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3812562 Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com> Commit-Queue: Amirali Abdolrashidi <abdolrashidi@google.com> Auto-Submit: Shahbaz Youssefi <syoussefi@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 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138
//
// Copyright 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_ESSL_OUTPUT)
{
ShCompileOptions defaultCompileOptions = {};
defaultCompileOptions.scalarizeVecAndMatConstructorArgs = true;
setDefaultCompileOptions(defaultCompileOptions);
}
};
// 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] += ", "-_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));
}
// Verifies that constructors without precision don't cause issues.
TEST_F(ScalarizeVecAndMatConstructorArgsTest, ConstructorWithoutPrecision)
{
const std::string shaderString =
R"(
precision mediump float;
uniform float u;
void main()
{
mat4 m = mat4(u);
mat2(0, bvec3(m));
})";
compile(shaderString);
}
} // anonymous namespace