Skip to content

A
angle
Commit 72fc5547 by Olli Etuaho Committed by Commit Bot
Options

Add a ShaderCompileTreeTest base class to use in compiler tests

The test class provides facilities for parsing test shader source into an AST and determining compile status. Compilation flags change for some of the tests, but this should only have a minor effect on code coverage - mostly affecting non-core parts such as intermediate output. BUG=angleproject:1673 TEST=angle_unittests Change-Id: I7d0900ef490e021272a27c4b0c938bfee02abf39 Reviewed-on: https://chromium-review.googlesource.com/422367Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
parent fc5aef40
Showing with 290 additions and 329 deletions
src/tests/angle_unittests.gypi
...@@ -96,6 +96,8 @@ ...@@ -96,6 +96,8 @@
'<(angle_path)/src/tests/test_utils/compiler_test.h', '<(angle_path)/src/tests/test_utils/compiler_test.h',
'<(angle_path)/src/tests/test_utils/ConstantFoldingTest.h', '<(angle_path)/src/tests/test_utils/ConstantFoldingTest.h',
'<(angle_path)/src/tests/test_utils/ConstantFoldingTest.cpp', '<(angle_path)/src/tests/test_utils/ConstantFoldingTest.cpp',
'<(angle_path)/src/tests/test_utils/ShaderCompileTreeTest.h',
'<(angle_path)/src/tests/test_utils/ShaderCompileTreeTest.cpp',
], ],
# TODO(jmadill): should probably call this windows sources # TODO(jmadill): should probably call this windows sources
'angle_unittests_hlsl_sources': 'angle_unittests_hlsl_sources':
......
src/tests/compiler_tests/ConstantFolding_test.cpp
...@@ -32,7 +32,7 @@ TEST_F(ConstantFoldingTest, FoldIntegerAdd) ...@@ -32,7 +32,7 @@ TEST_F(ConstantFoldingTest, FoldIntegerAdd)
" const int i = 1124 + 5;\n" " const int i = 1124 + 5;\n"
" my_Int = i;\n" " my_Int = i;\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_FALSE(constantFoundInAST(1124)); ASSERT_FALSE(constantFoundInAST(1124));
ASSERT_FALSE(constantFoundInAST(5)); ASSERT_FALSE(constantFoundInAST(5));
ASSERT_TRUE(constantFoundInAST(1129)); ASSERT_TRUE(constantFoundInAST(1129));
...@@ -48,7 +48,7 @@ TEST_F(ConstantFoldingTest, FoldIntegerSub) ...@@ -48,7 +48,7 @@ TEST_F(ConstantFoldingTest, FoldIntegerSub)
" const int i = 1124 - 5;\n" " const int i = 1124 - 5;\n"
" my_Int = i;\n" " my_Int = i;\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_FALSE(constantFoundInAST(1124)); ASSERT_FALSE(constantFoundInAST(1124));
ASSERT_FALSE(constantFoundInAST(5)); ASSERT_FALSE(constantFoundInAST(5));
ASSERT_TRUE(constantFoundInAST(1119)); ASSERT_TRUE(constantFoundInAST(1119));
...@@ -64,7 +64,7 @@ TEST_F(ConstantFoldingTest, FoldIntegerMul) ...@@ -64,7 +64,7 @@ TEST_F(ConstantFoldingTest, FoldIntegerMul)
" const int i = 1124 * 5;\n" " const int i = 1124 * 5;\n"
" my_Int = i;\n" " my_Int = i;\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_FALSE(constantFoundInAST(1124)); ASSERT_FALSE(constantFoundInAST(1124));
ASSERT_FALSE(constantFoundInAST(5)); ASSERT_FALSE(constantFoundInAST(5));
ASSERT_TRUE(constantFoundInAST(5620)); ASSERT_TRUE(constantFoundInAST(5620));
...@@ -80,7 +80,7 @@ TEST_F(ConstantFoldingTest, FoldIntegerDiv) ...@@ -80,7 +80,7 @@ TEST_F(ConstantFoldingTest, FoldIntegerDiv)
" const int i = 1124 / 5;\n" " const int i = 1124 / 5;\n"
" my_Int = i;\n" " my_Int = i;\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_FALSE(constantFoundInAST(1124)); ASSERT_FALSE(constantFoundInAST(1124));
ASSERT_FALSE(constantFoundInAST(5)); ASSERT_FALSE(constantFoundInAST(5));
// Rounding mode of division is undefined in the spec but ANGLE can be expected to round down. // Rounding mode of division is undefined in the spec but ANGLE can be expected to round down.
...@@ -97,7 +97,7 @@ TEST_F(ConstantFoldingTest, FoldIntegerModulus) ...@@ -97,7 +97,7 @@ TEST_F(ConstantFoldingTest, FoldIntegerModulus)
" const int i = 1124 % 5;\n" " const int i = 1124 % 5;\n"
" my_Int = i;\n" " my_Int = i;\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_FALSE(constantFoundInAST(1124)); ASSERT_FALSE(constantFoundInAST(1124));
ASSERT_FALSE(constantFoundInAST(5)); ASSERT_FALSE(constantFoundInAST(5));
ASSERT_TRUE(constantFoundInAST(4)); ASSERT_TRUE(constantFoundInAST(4));
...@@ -113,7 +113,7 @@ TEST_F(ConstantFoldingTest, FoldVectorCrossProduct) ...@@ -113,7 +113,7 @@ TEST_F(ConstantFoldingTest, FoldVectorCrossProduct)
" const vec3 v3 = cross(vec3(1.0f, 1.0f, 1.0f), vec3(1.0f, -1.0f, 1.0f));\n" " const vec3 v3 = cross(vec3(1.0f, 1.0f, 1.0f), vec3(1.0f, -1.0f, 1.0f));\n"
" my_Vec3 = v3;\n" " my_Vec3 = v3;\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
std::vector<float> input1(3, 1.0f); std::vector<float> input1(3, 1.0f);
ASSERT_FALSE(constantVectorFoundInAST(input1)); ASSERT_FALSE(constantVectorFoundInAST(input1));
std::vector<float> input2; std::vector<float> input2;
...@@ -145,7 +145,7 @@ TEST_F(ConstantFoldingTest, Fold2x2MatrixInverse) ...@@ -145,7 +145,7 @@ TEST_F(ConstantFoldingTest, Fold2x2MatrixInverse)
" mat2 m = m2 * mat2(i);\n" " mat2 m = m2 * mat2(i);\n"
" my_Vec = m[0];\n" " my_Vec = m[0];\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
float inputElements[] = float inputElements[] =
{ {
2.0f, 3.0f, 2.0f, 3.0f,
...@@ -177,7 +177,7 @@ TEST_F(ConstantFoldingTest, Fold3x3MatrixInverse) ...@@ -177,7 +177,7 @@ TEST_F(ConstantFoldingTest, Fold3x3MatrixInverse)
" mat3 m = m3 * mat3(i);\n" " mat3 m = m3 * mat3(i);\n"
" my_Vec = m3[0];\n" " my_Vec = m3[0];\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
float inputElements[] = float inputElements[] =
{ {
11.0f, 13.0f, 19.0f, 11.0f, 13.0f, 19.0f,
...@@ -213,7 +213,7 @@ TEST_F(ConstantFoldingTest, Fold4x4MatrixInverse) ...@@ -213,7 +213,7 @@ TEST_F(ConstantFoldingTest, Fold4x4MatrixInverse)
" mat4 m = m4 * mat4(i);\n" " mat4 m = m4 * mat4(i);\n"
" my_Vec = m[0];\n" " my_Vec = m[0];\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
float inputElements[] = float inputElements[] =
{ {
29.0f, 31.0f, 37.0f, 41.0f, 29.0f, 31.0f, 37.0f, 41.0f,
...@@ -250,7 +250,7 @@ TEST_F(ConstantFoldingTest, Fold2x2MatrixDeterminant) ...@@ -250,7 +250,7 @@ TEST_F(ConstantFoldingTest, Fold2x2MatrixDeterminant)
" 5.0f, 7.0f));\n" " 5.0f, 7.0f));\n"
" my_Float = f;\n" " my_Float = f;\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
float inputElements[] = float inputElements[] =
{ {
2.0f, 3.0f, 2.0f, 3.0f,
...@@ -274,7 +274,7 @@ TEST_F(ConstantFoldingTest, Fold3x3MatrixDeterminant) ...@@ -274,7 +274,7 @@ TEST_F(ConstantFoldingTest, Fold3x3MatrixDeterminant)
" 37.0f, 41.0f, 43.0f));\n" " 37.0f, 41.0f, 43.0f));\n"
" my_Float = f;\n" " my_Float = f;\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
float inputElements[] = float inputElements[] =
{ {
11.0f, 13.0f, 19.0f, 11.0f, 13.0f, 19.0f,
...@@ -300,7 +300,7 @@ TEST_F(ConstantFoldingTest, Fold4x4MatrixDeterminant) ...@@ -300,7 +300,7 @@ TEST_F(ConstantFoldingTest, Fold4x4MatrixDeterminant)
" 79.0f, 83.0f, 89.0f, 97.0f));\n" " 79.0f, 83.0f, 89.0f, 97.0f));\n"
" my_Float = f;\n" " my_Float = f;\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
float inputElements[] = float inputElements[] =
{ {
29.0f, 31.0f, 37.0f, 41.0f, 29.0f, 31.0f, 37.0f, 41.0f,
...@@ -329,7 +329,7 @@ TEST_F(ConstantFoldingTest, Fold3x3MatrixTranspose) ...@@ -329,7 +329,7 @@ TEST_F(ConstantFoldingTest, Fold3x3MatrixTranspose)
" mat3 m = m3 * mat3(i);\n" " mat3 m = m3 * mat3(i);\n"
" my_Vec = m[0];\n" " my_Vec = m[0];\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
float inputElements[] = float inputElements[] =
{ {
11.0f, 13.0f, 19.0f, 11.0f, 13.0f, 19.0f,
...@@ -363,7 +363,7 @@ TEST_F(ConstantFoldingTest, ParseWrappedHexIntLiteral) ...@@ -363,7 +363,7 @@ TEST_F(ConstantFoldingTest, ParseWrappedHexIntLiteral)
" const int i = 0xFFFFFFFF;\n" " const int i = 0xFFFFFFFF;\n"
" my_Vec = vec4(i * inInt);\n" " my_Vec = vec4(i * inInt);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(-1)); ASSERT_TRUE(constantFoundInAST(-1));
} }
...@@ -382,7 +382,7 @@ TEST_F(ConstantFoldingTest, ParseWrappedDecimalIntLiteral) ...@@ -382,7 +382,7 @@ TEST_F(ConstantFoldingTest, ParseWrappedDecimalIntLiteral)
" const int i = 3000000000;\n" " const int i = 3000000000;\n"
" my_Vec = vec4(i * inInt);\n" " my_Vec = vec4(i * inInt);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(-1294967296)); ASSERT_TRUE(constantFoundInAST(-1294967296));
} }
...@@ -401,7 +401,7 @@ TEST_F(ConstantFoldingTest, ParseMaxUintLiteral) ...@@ -401,7 +401,7 @@ TEST_F(ConstantFoldingTest, ParseMaxUintLiteral)
" const uint i = 0xFFFFFFFFu;\n" " const uint i = 0xFFFFFFFFu;\n"
" my_Vec = vec4(i * inInt);\n" " my_Vec = vec4(i * inInt);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(0xFFFFFFFFu)); ASSERT_TRUE(constantFoundInAST(0xFFFFFFFFu));
} }
...@@ -420,7 +420,7 @@ TEST_F(ConstantFoldingTest, FoldUnaryMinusOnUintLiteral) ...@@ -420,7 +420,7 @@ TEST_F(ConstantFoldingTest, FoldUnaryMinusOnUintLiteral)
" const uint i = -1u;\n" " const uint i = -1u;\n"
" my_Vec = vec4(i * inInt);\n" " my_Vec = vec4(i * inInt);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(0xFFFFFFFFu)); ASSERT_TRUE(constantFoundInAST(0xFFFFFFFFu));
} }
...@@ -435,7 +435,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingMat2) ...@@ -435,7 +435,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingMat2)
" mat2 m = cm * mult;\n" " mat2 m = cm * mult;\n"
" gl_FragColor = vec4(m[0], m[1]);\n" " gl_FragColor = vec4(m[0], m[1]);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
float outputElements[] = float outputElements[] =
{ {
0.0f, 1.0f, 0.0f, 1.0f,
...@@ -456,7 +456,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingScalar) ...@@ -456,7 +456,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingScalar)
" mat2 m = cm * mult;\n" " mat2 m = cm * mult;\n"
" gl_FragColor = vec4(m[0], m[1]);\n" " gl_FragColor = vec4(m[0], m[1]);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
float outputElements[] = float outputElements[] =
{ {
3.0f, 0.0f, 3.0f, 0.0f,
...@@ -477,7 +477,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingMix) ...@@ -477,7 +477,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingMix)
" mat2 m = cm * mult;\n" " mat2 m = cm * mult;\n"
" gl_FragColor = vec4(m[0], m[1]);\n" " gl_FragColor = vec4(m[0], m[1]);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
float outputElements[] = float outputElements[] =
{ {
-1.0, 0.0f, -1.0, 0.0f,
...@@ -498,7 +498,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingMat3) ...@@ -498,7 +498,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingMat3)
" mat2 m = cm * mult;\n" " mat2 m = cm * mult;\n"
" gl_FragColor = vec4(m[0], m[1]);\n" " gl_FragColor = vec4(m[0], m[1]);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
float outputElements[] = float outputElements[] =
{ {
0.0f, 1.0f, 0.0f, 1.0f,
...@@ -523,7 +523,7 @@ TEST_F(ConstantFoldingTest, FoldMat4x3ConstructorTakingMat3x2) ...@@ -523,7 +523,7 @@ TEST_F(ConstantFoldingTest, FoldMat4x3ConstructorTakingMat3x2)
" mat4x3 m = cm * mult;\n" " mat4x3 m = cm * mult;\n"
" my_FragColor = vec4(m[0], m[1][0]);\n" " my_FragColor = vec4(m[0], m[1][0]);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
float outputElements[] = float outputElements[] =
{ {
1.0f, 2.0f, 0.0f, 1.0f, 2.0f, 0.0f,
...@@ -547,7 +547,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingVec4) ...@@ -547,7 +547,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingVec4)
" mat2 m = cm * mult;\n" " mat2 m = cm * mult;\n"
" gl_FragColor = vec4(m[0], m[1]);\n" " gl_FragColor = vec4(m[0], m[1]);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
float outputElements[] = float outputElements[] =
{ {
0.0f, 1.0f, 0.0f, 1.0f,
...@@ -576,7 +576,7 @@ TEST_F(ConstantFoldingTest, FoldNestedDifferentStructEqualityComparison) ...@@ -576,7 +576,7 @@ TEST_F(ConstantFoldingTest, FoldNestedDifferentStructEqualityComparison)
" const S s2 = S(nested(0.0), 3.0);\n" " const S s2 = S(nested(0.0), 3.0);\n"
" gl_FragColor = (s1 == s2 ? 1.0 : 0.5) * mult;\n" " gl_FragColor = (s1 == s2 ? 1.0 : 0.5) * mult;\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(0.5f)); ASSERT_TRUE(constantFoundInAST(0.5f));
} }
...@@ -600,7 +600,7 @@ TEST_F(ConstantFoldingTest, FoldNestedIdenticalStructEqualityComparison) ...@@ -600,7 +600,7 @@ TEST_F(ConstantFoldingTest, FoldNestedIdenticalStructEqualityComparison)
" const S s2 = S(nested(0.0), 2.0, 3);\n" " const S s2 = S(nested(0.0), 2.0, 3);\n"
" gl_FragColor = (s1 == s2 ? 1.0 : 0.5) * mult;\n" " gl_FragColor = (s1 == s2 ? 1.0 : 0.5) * mult;\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(1.0f)); ASSERT_TRUE(constantFoundInAST(1.0f));
} }
...@@ -615,7 +615,7 @@ TEST_F(ConstantFoldingTest, FoldNonSquareMatrixIndexing) ...@@ -615,7 +615,7 @@ TEST_F(ConstantFoldingTest, FoldNonSquareMatrixIndexing)
"{\n" "{\n"
" my_FragColor = mat3x4(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)[1];\n" " my_FragColor = mat3x4(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)[1];\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
float outputElements[] = {4.0f, 5.0f, 6.0f, 7.0f}; float outputElements[] = {4.0f, 5.0f, 6.0f, 7.0f};
std::vector<float> result(outputElements, outputElements + 4); std::vector<float> result(outputElements, outputElements + 4);
ASSERT_TRUE(constantVectorFoundInAST(result)); ASSERT_TRUE(constantVectorFoundInAST(result));
...@@ -633,7 +633,7 @@ TEST_F(ConstantFoldingTest, FoldNonSquareOuterProduct) ...@@ -633,7 +633,7 @@ TEST_F(ConstantFoldingTest, FoldNonSquareOuterProduct)
" mat3x2 prod = outerProduct(vec2(2.0, 3.0), vec3(5.0, 7.0, 11.0));\n" " mat3x2 prod = outerProduct(vec2(2.0, 3.0), vec3(5.0, 7.0, 11.0));\n"
" my_FragColor = vec4(prod[0].x);\n" " my_FragColor = vec4(prod[0].x);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
// clang-format off // clang-format off
float outputElements[] = float outputElements[] =
{ {
...@@ -658,7 +658,7 @@ TEST_F(ConstantFoldingTest, FoldBitShiftLeftDifferentSignedness) ...@@ -658,7 +658,7 @@ TEST_F(ConstantFoldingTest, FoldBitShiftLeftDifferentSignedness)
" uint u = 0xffffffffu << 31;\n" " uint u = 0xffffffffu << 31;\n"
" my_FragColor = vec4(u);\n" " my_FragColor = vec4(u);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(0x80000000u)); ASSERT_TRUE(constantFoundInAST(0x80000000u));
} }
...@@ -674,7 +674,7 @@ TEST_F(ConstantFoldingTest, FoldBitShiftRightDifferentSignedness) ...@@ -674,7 +674,7 @@ TEST_F(ConstantFoldingTest, FoldBitShiftRightDifferentSignedness)
" uint u = 0xffffffffu >> 30;\n" " uint u = 0xffffffffu >> 30;\n"
" my_FragColor = vec4(u);\n" " my_FragColor = vec4(u);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(0x3u)); ASSERT_TRUE(constantFoundInAST(0x3u));
} }
...@@ -692,7 +692,7 @@ TEST_F(ConstantFoldingTest, FoldBitShiftRightExtendSignBit) ...@@ -692,7 +692,7 @@ TEST_F(ConstantFoldingTest, FoldBitShiftRightExtendSignBit)
" uint u = uint(i);" " uint u = uint(i);"
" my_FragColor = vec4(u);\n" " my_FragColor = vec4(u);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
// The bits of the operand are 0x8fffe000 = 1000 1111 1111 1111 1110 0000 0000 0000 // The bits of the operand are 0x8fffe000 = 1000 1111 1111 1111 1110 0000 0000 0000
// After shifting, they become 1111 1110 0011 1111 1111 1111 1000 0000 = 0xfe3fff80 // After shifting, they become 1111 1110 0011 1111 1111 1111 1000 0000 = 0xfe3fff80
ASSERT_TRUE(constantFoundInAST(0xfe3fff80u)); ASSERT_TRUE(constantFoundInAST(0xfe3fff80u));
...@@ -713,7 +713,7 @@ TEST_F(ConstantFoldingTest, FoldBitShiftLeftInterpretedAsBitPattern) ...@@ -713,7 +713,7 @@ TEST_F(ConstantFoldingTest, FoldBitShiftLeftInterpretedAsBitPattern)
" uint u = uint(i);" " uint u = uint(i);"
" my_FragColor = vec4(u);\n" " my_FragColor = vec4(u);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(0xfffffff8u)); ASSERT_TRUE(constantFoundInAST(0xfffffff8u));
} }
...@@ -732,7 +732,7 @@ TEST_F(ConstantFoldingTest, FoldDivideMinimumIntegerByMinusOne) ...@@ -732,7 +732,7 @@ TEST_F(ConstantFoldingTest, FoldDivideMinimumIntegerByMinusOne)
" int i = 0x80000000 / (-1);\n" " int i = 0x80000000 / (-1);\n"
" my_FragColor = vec4(i);\n" " my_FragColor = vec4(i);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(0x7fffffff) || constantFoundInAST(-0x7fffffff - 1)); ASSERT_TRUE(constantFoundInAST(0x7fffffff) || constantFoundInAST(-0x7fffffff - 1));
} }
...@@ -752,7 +752,7 @@ TEST_F(ConstantFoldingTest, FoldUnsignedIntegerAddOverflow) ...@@ -752,7 +752,7 @@ TEST_F(ConstantFoldingTest, FoldUnsignedIntegerAddOverflow)
" uint u = 0xffffffffu + 43u;\n" " uint u = 0xffffffffu + 43u;\n"
" my_FragColor = vec4(u);\n" " my_FragColor = vec4(u);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(42u)); ASSERT_TRUE(constantFoundInAST(42u));
} }
...@@ -772,7 +772,7 @@ TEST_F(ConstantFoldingTest, FoldSignedIntegerAddOverflow) ...@@ -772,7 +772,7 @@ TEST_F(ConstantFoldingTest, FoldSignedIntegerAddOverflow)
" int i = 0x7fffffff + 4;\n" " int i = 0x7fffffff + 4;\n"
" my_FragColor = vec4(i);\n" " my_FragColor = vec4(i);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(-0x7ffffffd)); ASSERT_TRUE(constantFoundInAST(-0x7ffffffd));
} }
...@@ -792,7 +792,7 @@ TEST_F(ConstantFoldingTest, FoldUnsignedIntegerDiffOverflow) ...@@ -792,7 +792,7 @@ TEST_F(ConstantFoldingTest, FoldUnsignedIntegerDiffOverflow)
" uint u = 0u - 5u;\n" " uint u = 0u - 5u;\n"
" my_FragColor = vec4(u);\n" " my_FragColor = vec4(u);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(0xfffffffbu)); ASSERT_TRUE(constantFoundInAST(0xfffffffbu));
} }
...@@ -812,7 +812,7 @@ TEST_F(ConstantFoldingTest, FoldSignedIntegerDiffOverflow) ...@@ -812,7 +812,7 @@ TEST_F(ConstantFoldingTest, FoldSignedIntegerDiffOverflow)
" int i = -0x7fffffff - 7;\n" " int i = -0x7fffffff - 7;\n"
" my_FragColor = vec4(i);\n" " my_FragColor = vec4(i);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(0x7ffffffa)); ASSERT_TRUE(constantFoundInAST(0x7ffffffa));
} }
...@@ -832,7 +832,7 @@ TEST_F(ConstantFoldingTest, FoldUnsignedIntegerMultiplyOverflow) ...@@ -832,7 +832,7 @@ TEST_F(ConstantFoldingTest, FoldUnsignedIntegerMultiplyOverflow)
" uint u = 0xffffffffu * 10u;\n" " uint u = 0xffffffffu * 10u;\n"
" my_FragColor = vec4(u);\n" " my_FragColor = vec4(u);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(0xfffffff6u)); ASSERT_TRUE(constantFoundInAST(0xfffffff6u));
} }
...@@ -852,7 +852,7 @@ TEST_F(ConstantFoldingTest, FoldSignedIntegerMultiplyOverflow) ...@@ -852,7 +852,7 @@ TEST_F(ConstantFoldingTest, FoldSignedIntegerMultiplyOverflow)
" int i = 0x7fffffff * 42;\n" " int i = 0x7fffffff * 42;\n"
" my_FragColor = vec4(i);\n" " my_FragColor = vec4(i);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(-42)); ASSERT_TRUE(constantFoundInAST(-42));
} }
...@@ -873,7 +873,7 @@ TEST_F(ConstantFoldingTest, FoldMinimumSignedIntegerNegation) ...@@ -873,7 +873,7 @@ TEST_F(ConstantFoldingTest, FoldMinimumSignedIntegerNegation)
" int i = -0x80000000;\n" " int i = -0x80000000;\n"
" my_FragColor = vec4(i);\n" " my_FragColor = vec4(i);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
// Negating the minimum signed integer overflows the positive range, so it wraps back to itself. // Negating the minimum signed integer overflows the positive range, so it wraps back to itself.
ASSERT_TRUE(constantFoundInAST(-0x7fffffff - 1)); ASSERT_TRUE(constantFoundInAST(-0x7fffffff - 1));
} }
...@@ -891,7 +891,7 @@ TEST_F(ConstantFoldingTest, FoldMinimumSignedIntegerRightShift) ...@@ -891,7 +891,7 @@ TEST_F(ConstantFoldingTest, FoldMinimumSignedIntegerRightShift)
" int j = (0x80000000 >> 7);\n" " int j = (0x80000000 >> 7);\n"
" my_FragColor = vec4(i, j, i, j);\n" " my_FragColor = vec4(i, j, i, j);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(-0x40000000)); ASSERT_TRUE(constantFoundInAST(-0x40000000));
ASSERT_TRUE(constantFoundInAST(-0x01000000)); ASSERT_TRUE(constantFoundInAST(-0x01000000));
} }
...@@ -909,7 +909,7 @@ TEST_F(ConstantFoldingTest, FoldShiftByZero) ...@@ -909,7 +909,7 @@ TEST_F(ConstantFoldingTest, FoldShiftByZero)
" int j = (73 << 0);\n" " int j = (73 << 0);\n"
" my_FragColor = vec4(i, j, i, j);\n" " my_FragColor = vec4(i, j, i, j);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(3)); ASSERT_TRUE(constantFoundInAST(3));
ASSERT_TRUE(constantFoundInAST(73)); ASSERT_TRUE(constantFoundInAST(73));
} }
...@@ -931,7 +931,7 @@ TEST_F(ConstantFoldingTest, FoldIsInfOutOfRangeFloatLiteral) ...@@ -931,7 +931,7 @@ TEST_F(ConstantFoldingTest, FoldIsInfOutOfRangeFloatLiteral)
" bool b = isinf(1.0e2048);\n" " bool b = isinf(1.0e2048);\n"
" my_FragColor = vec4(b);\n" " my_FragColor = vec4(b);\n"
"}\n"; "}\n";
compile(shaderString); compileAssumeSuccess(shaderString);
ASSERT_TRUE(constantFoundInAST(true)); ASSERT_TRUE(constantFoundInAST(true));
} }
......
src/tests/compiler_tests/MalformedShader_test.cpp
...@@ -11,142 +11,77 @@ ...@@ -11,142 +11,77 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "GLSLANG/ShaderLang.h" #include "GLSLANG/ShaderLang.h"
#include "compiler/translator/TranslatorESSL.h" #include "compiler/translator/TranslatorESSL.h"
#include "tests/test_utils/ShaderCompileTreeTest.h"
using namespace sh; using namespace sh;
class MalformedShaderTest : public testing::Test class MalformedShaderTest : public ShaderCompileTreeTest
{ {
public: public:
MalformedShaderTest() : mExtraCompileOptions(0) {} MalformedShaderTest() {}
protected:
virtual void SetUp()
{
ShBuiltInResources resources;
sh::InitBuiltInResources(&resources);
mTranslator = new TranslatorESSL(GL_FRAGMENT_SHADER, SH_GLES3_SPEC);
ASSERT_TRUE(mTranslator->Init(resources));
}
virtual void TearDown()
{
delete mTranslator;
}
// Return true when compilation succeeds
bool compile(const std::string& shaderString)
{
const char *shaderStrings[] = { shaderString.c_str() };
bool compilationSuccess =
mTranslator->compile(shaderStrings, 1, SH_INTERMEDIATE_TREE | mExtraCompileOptions);
TInfoSink &infoSink = mTranslator->getInfoSink();
mInfoLog = infoSink.info.c_str();
return compilationSuccess;
}
bool hasWarning() const
{
return mInfoLog.find("WARNING: ") != std::string::npos;
}
protected: protected:
std::string mInfoLog; ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
TranslatorESSL *mTranslator; ShShaderSpec getShaderSpec() const override { return SH_GLES3_SPEC; }
ShCompileOptions mExtraCompileOptions;
}; };
class MalformedVertexShaderTest : public MalformedShaderTest class MalformedVertexShaderTest : public ShaderCompileTreeTest
{ {
public: public:
MalformedVertexShaderTest() {} MalformedVertexShaderTest() {}
protected: protected:
void SetUp() override ::GLenum getShaderType() const override { return GL_VERTEX_SHADER; }
{ ShShaderSpec getShaderSpec() const override { return SH_GLES3_SPEC; }
ShBuiltInResources resources;
sh::InitBuiltInResources(&resources);
mTranslator = new TranslatorESSL(GL_VERTEX_SHADER, SH_GLES3_SPEC);
ASSERT_TRUE(mTranslator->Init(resources));
}
}; };
class MalformedWebGL2ShaderTest : public MalformedShaderTest class MalformedWebGL2ShaderTest : public ShaderCompileTreeTest
{ {
public: public:
MalformedWebGL2ShaderTest() {} MalformedWebGL2ShaderTest() {}
protected: protected:
void SetUp() override ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
{ ShShaderSpec getShaderSpec() const override { return SH_WEBGL2_SPEC; }
ShBuiltInResources resources;
sh::InitBuiltInResources(&resources);
mTranslator = new TranslatorESSL(GL_FRAGMENT_SHADER, SH_WEBGL2_SPEC);
ASSERT_TRUE(mTranslator->Init(resources));
}
}; };
class MalformedWebGL1ShaderTest : public MalformedShaderTest class MalformedWebGL1ShaderTest : public ShaderCompileTreeTest
{ {
public: public:
MalformedWebGL1ShaderTest() {} MalformedWebGL1ShaderTest() {}
protected: protected:
void SetUp() override ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
{ ShShaderSpec getShaderSpec() const override { return SH_WEBGL_SPEC; }
ShBuiltInResources resources;
sh::InitBuiltInResources(&resources);
mTranslator = new TranslatorESSL(GL_FRAGMENT_SHADER, SH_WEBGL_SPEC);
ASSERT_TRUE(mTranslator->Init(resources));
}
}; };
class MalformedVertexShaderGLES31Test : public MalformedShaderTest class MalformedVertexShaderGLES31Test : public ShaderCompileTreeTest
{ {
public: public:
MalformedVertexShaderGLES31Test() {} MalformedVertexShaderGLES31Test() {}
private: private:
void SetUp() override ::GLenum getShaderType() const override { return GL_VERTEX_SHADER; }
{ ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
ShBuiltInResources resources;
sh::InitBuiltInResources(&resources);
mTranslator = new TranslatorESSL(GL_VERTEX_SHADER, SH_GLES3_1_SPEC);
ASSERT_TRUE(mTranslator->Init(resources));
}
}; };
class MalformedFragmentShaderGLES31Test : public MalformedShaderTest class MalformedFragmentShaderGLES31Test : public ShaderCompileTreeTest
{ {
public: public:
MalformedFragmentShaderGLES31Test() {} MalformedFragmentShaderGLES31Test() {}
private: private:
void SetUp() override ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
{ ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
ShBuiltInResources resources;
sh::InitBuiltInResources(&resources);
mTranslator = new TranslatorESSL(GL_FRAGMENT_SHADER, SH_GLES3_1_SPEC);
ASSERT_TRUE(mTranslator->Init(resources));
}
}; };
class MalformedComputeShaderTest : public MalformedShaderTest class MalformedComputeShaderTest : public ShaderCompileTreeTest
{ {
public: public:
MalformedComputeShaderTest() {} MalformedComputeShaderTest() {}
private: private:
void SetUp() override ::GLenum getShaderType() const override { return GL_COMPUTE_SHADER; }
{ ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
ShBuiltInResources resources;
sh::InitBuiltInResources(&resources);
mTranslator = new TranslatorESSL(GL_COMPUTE_SHADER, SH_GLES3_1_SPEC);
ASSERT_TRUE(mTranslator->Init(resources));
}
}; };
// This is a test for a bug that used to exist in ANGLE: // This is a test for a bug that used to exist in ANGLE:
......
src/tests/compiler_tests/QualificationOrderESSL31_test.cpp
...@@ -13,45 +13,22 @@ ...@@ -13,45 +13,22 @@
#include "compiler/translator/TranslatorESSL.h" #include "compiler/translator/TranslatorESSL.h"
#include "GLSLANG/ShaderLang.h" #include "GLSLANG/ShaderLang.h"
#include "tests/test_utils/compiler_test.h" #include "tests/test_utils/compiler_test.h"
#include "tests/test_utils/ShaderCompileTreeTest.h"
using namespace sh; using namespace sh;
class QualificationVertexShaderTestESSL31 : public testing::Test class QualificationVertexShaderTestESSL31 : public ShaderCompileTreeTest
{ {
public: public:
QualificationVertexShaderTestESSL31() {} QualificationVertexShaderTestESSL31() {}
protected: protected:
virtual void SetUp() ::GLenum getShaderType() const override { return GL_VERTEX_SHADER; }
{ ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
ShBuiltInResources resources;
InitBuiltInResources(&resources);
mTranslator = new TranslatorESSL(GL_VERTEX_SHADER, SH_GLES3_1_SPEC);
ASSERT_TRUE(mTranslator->Init(resources));
}
virtual void TearDown() { delete mTranslator; }
// Return true when compilation succeeds
bool compile(const std::string &shaderString)
{
const char *shaderStrings[] = {shaderString.c_str()};
mASTRoot = mTranslator->compileTreeForTesting(shaderStrings, 1,
SH_INTERMEDIATE_TREE | SH_VARIABLES);
TInfoSink &infoSink = mTranslator->getInfoSink();
mInfoLog = infoSink.info.c_str();
return mASTRoot != nullptr;
}
const TIntermSymbol *findSymbolInAST(const TString &symbolName, TBasicType basicType) const TIntermSymbol *findSymbolInAST(const TString &symbolName, TBasicType basicType)
{ {
return FindSymbolNode(mASTRoot, symbolName, basicType); return FindSymbolNode(mASTRoot, symbolName, basicType);
} }
protected:
TranslatorESSL *mTranslator;
TIntermNode *mASTRoot;
std::string mInfoLog;
}; };
// GLSL ES 3.10 has relaxed checks on qualifier order. Any order is correct. // GLSL ES 3.10 has relaxed checks on qualifier order. Any order is correct.
......
src/tests/compiler_tests/QualificationOrder_test.cpp
...@@ -7,49 +7,37 @@ ...@@ -7,49 +7,37 @@
// OpenGL ES 3.1 removes the strict order of qualifiers imposed by the grammar. // OpenGL ES 3.1 removes the strict order of qualifiers imposed by the grammar.
// This file contains tests for invalid order and usage of qualifiers. // This file contains tests for invalid order and usage of qualifiers.
#include "angle_gl.h" #include "tests/test_utils/ShaderCompileTreeTest.h"
#include "gtest/gtest.h"
#include "GLSLANG/ShaderLang.h"
#include "compiler/translator/TranslatorESSL.h"
using namespace sh; using namespace sh;
class QualificationOrderShaderTest : public testing::Test class QualificationOrderFragmentShaderTest : public ShaderCompileTreeTest
{ {
public: public:
QualificationOrderShaderTest() {} QualificationOrderFragmentShaderTest() {}
protected: protected:
virtual void SetUp() {} void initResources(ShBuiltInResources *resources) override
virtual void TearDown() {}
// Return true when compilation succeeds
bool compile(const std::string &shaderString, ::GLenum shaderType, ShShaderSpec spec)
{ {
ShBuiltInResources resources; resources->MaxDrawBuffers = (getShaderSpec() == SH_GLES2_SPEC) ? 1 : 8;
InitBuiltInResources(&resources); }
resources.MaxDrawBuffers = (spec == SH_GLES2_SPEC) ? 1 : 8;
TranslatorESSL *translator = new TranslatorESSL(shaderType, spec);
EXPECT_TRUE(translator->Init(resources));
const char *shaderStrings[] = {shaderString.c_str()}; ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
bool compilationSuccess = translator->compile(shaderStrings, 1, SH_INTERMEDIATE_TREE);
TInfoSink &infoSink = translator->getInfoSink();
mInfoLog = infoSink.info.c_str();
delete translator; ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
};
return compilationSuccess; class QualificationOrderVertexShaderTest : public QualificationOrderFragmentShaderTest
} {
public:
QualificationOrderVertexShaderTest() {}
protected: protected:
std::string mInfoLog; ::GLenum getShaderType() const override { return GL_VERTEX_SHADER; }
}; };
// Repeating centroid qualifier is invalid. // Repeating centroid qualifier is invalid.
TEST_F(QualificationOrderShaderTest, RepeatingCentroid) TEST_F(QualificationOrderFragmentShaderTest, RepeatingCentroid)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -58,14 +46,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingCentroid) ...@@ -58,14 +46,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingCentroid)
"void main() {\n" "void main() {\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_1_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// Repeating uniform storage qualifiers is invalid. // Repeating uniform storage qualifiers is invalid.
TEST_F(QualificationOrderShaderTest, RepeatingUniforms) TEST_F(QualificationOrderFragmentShaderTest, RepeatingUniforms)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -74,14 +62,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingUniforms) ...@@ -74,14 +62,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingUniforms)
"void main() {\n" "void main() {\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_1_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// Repeating varying storage qualifiers is invalid. // Repeating varying storage qualifiers is invalid.
TEST_F(QualificationOrderShaderTest, RepeatingVaryings) TEST_F(QualificationOrderFragmentShaderTest, RepeatingVaryings)
{ {
const std::string &shaderString = const std::string &shaderString =
"precision mediump float;\n" "precision mediump float;\n"
...@@ -89,14 +77,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingVaryings) ...@@ -89,14 +77,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingVaryings)
"void main() {\n" "void main() {\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_1_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// Layout qualifier should be before the storage qualifiers. // Layout qualifier should be before the storage qualifiers.
TEST_F(QualificationOrderShaderTest, WrongOrderQualifiers) TEST_F(QualificationOrderFragmentShaderTest, WrongOrderQualifiers)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -105,14 +93,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderQualifiers) ...@@ -105,14 +93,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderQualifiers)
"void main() {\n" "void main() {\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_1_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// Centroid out is the correct order. Out centroid is incorrect. // Centroid out is the correct order. Out centroid is incorrect.
TEST_F(QualificationOrderShaderTest, WrongOrderCentroidOut) TEST_F(QualificationOrderVertexShaderTest, WrongOrderCentroidOut)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -124,14 +112,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderCentroidOut) ...@@ -124,14 +112,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderCentroidOut)
"gl_Position = uv;\n" "gl_Position = uv;\n"
"}\n"; "}\n";
if (compile(shaderString, GL_VERTEX_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// Centroid in is the correct order. In centroid is incorrect. // Centroid in is the correct order. In centroid is incorrect.
TEST_F(QualificationOrderShaderTest, WrongOrderCentroidIn) TEST_F(QualificationOrderFragmentShaderTest, WrongOrderCentroidIn)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -142,14 +130,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderCentroidIn) ...@@ -142,14 +130,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderCentroidIn)
"colorOUT = colorIN;\n" "colorOUT = colorIN;\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// Type cannot be before the storage qualifier. // Type cannot be before the storage qualifier.
TEST_F(QualificationOrderShaderTest, WrongOrderTypeStorage) TEST_F(QualificationOrderFragmentShaderTest, WrongOrderTypeStorage)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -160,14 +148,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderTypeStorage) ...@@ -160,14 +148,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderTypeStorage)
"colorOUT = colorIN;\n" "colorOUT = colorIN;\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// A variable cannot have two conflicting storage qualifiers. // A variable cannot have two conflicting storage qualifiers.
TEST_F(QualificationOrderShaderTest, RepeatingDifferentStorageQualifiers) TEST_F(QualificationOrderFragmentShaderTest, RepeatingDifferentStorageQualifiers)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -178,14 +166,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingDifferentStorageQualifiers) ...@@ -178,14 +166,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingDifferentStorageQualifiers)
"colorOUT = colorIN;\n" "colorOUT = colorIN;\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// A variable cannot have two different layout qualifiers. // A variable cannot have two different layout qualifiers.
TEST_F(QualificationOrderShaderTest, RepeatingLayoutQualifiers) TEST_F(QualificationOrderFragmentShaderTest, RepeatingLayoutQualifiers)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -196,14 +184,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingLayoutQualifiers) ...@@ -196,14 +184,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingLayoutQualifiers)
"colorOUT = colorIN;\n" "colorOUT = colorIN;\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// A variable cannot have repeating invariant qualifiers. // A variable cannot have repeating invariant qualifiers.
TEST_F(QualificationOrderShaderTest, RepeatingInvariantQualifiers) TEST_F(QualificationOrderFragmentShaderTest, RepeatingInvariantQualifiers)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -214,14 +202,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingInvariantQualifiers) ...@@ -214,14 +202,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingInvariantQualifiers)
"colorOUT = colorIN;\n" "colorOUT = colorIN;\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// A variable cannot have repeating storage qualifiers. // A variable cannot have repeating storage qualifiers.
TEST_F(QualificationOrderShaderTest, RepeatingAttributes) TEST_F(QualificationOrderVertexShaderTest, RepeatingAttributes)
{ {
const std::string &shaderString = const std::string &shaderString =
"precision mediump float;\n" "precision mediump float;\n"
...@@ -230,14 +218,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingAttributes) ...@@ -230,14 +218,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingAttributes)
"gl_Position = positionIN;\n" "gl_Position = positionIN;\n"
"}\n"; "}\n";
if (compile(shaderString, GL_VERTEX_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// Wrong order for invariant varying. It should be 'invariant varying', not 'varying invariant'. // Wrong order for invariant varying. It should be 'invariant varying', not 'varying invariant'.
TEST_F(QualificationOrderShaderTest, VaryingInvariantWrongOrder) TEST_F(QualificationOrderVertexShaderTest, VaryingInvariantWrongOrder)
{ {
const std::string &shaderString = const std::string &shaderString =
"precision mediump float;\n" "precision mediump float;\n"
...@@ -248,42 +236,45 @@ TEST_F(QualificationOrderShaderTest, VaryingInvariantWrongOrder) ...@@ -248,42 +236,45 @@ TEST_F(QualificationOrderShaderTest, VaryingInvariantWrongOrder)
"dataOUT = 0.5 * dataOUT + vec4(0.5);\n" "dataOUT = 0.5 * dataOUT + vec4(0.5);\n"
"}\n"; "}\n";
if (compile(shaderString, GL_VERTEX_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// A variable cannot have repeating storage qualifiers. // A variable cannot have repeating storage qualifiers.
TEST_F(QualificationOrderShaderTest, AttributeVaryingMix) TEST_F(QualificationOrderVertexShaderTest, AttributeVaryingMix)
{ {
const std::string &shaderString1 = const std::string &shaderString =
"precision mediump float;\n" "precision mediump float;\n"
"attribute varying vec4 positionIN;\n" "attribute varying vec4 positionIN;\n"
"void main() {\n" "void main() {\n"
"gl_Position = positionIN;\n" "gl_Position = positionIN;\n"
"}\n"; "}\n";
const std::string &shaderString2 = if (compile(shaderString))
{
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
}
}
// A variable cannot have repeating storage qualifiers.
TEST_F(QualificationOrderVertexShaderTest, VaryingAttributeMix)
{
const std::string &shaderString =
"precision mediump float;\n" "precision mediump float;\n"
"varying attribute vec4 positionIN;\n" "varying attribute vec4 positionIN;\n"
"void main() {\n" "void main() {\n"
"gl_Position = positionIN;\n" "gl_Position = positionIN;\n"
"}\n"; "}\n";
if (compile(shaderString))
if (compile(shaderString1, GL_VERTEX_SHADER, SH_GLES3_SPEC))
{
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
}
if (compile(shaderString2, GL_VERTEX_SHADER, SH_GLES3_SPEC))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// A variable cannot have repeating interpolation qualifiers. // A variable cannot have repeating interpolation qualifiers.
TEST_F(QualificationOrderShaderTest, RepeatingInterpolationQualifiers) TEST_F(QualificationOrderVertexShaderTest, RepeatingInterpolationQualifiers)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -295,7 +286,7 @@ TEST_F(QualificationOrderShaderTest, RepeatingInterpolationQualifiers) ...@@ -295,7 +286,7 @@ TEST_F(QualificationOrderShaderTest, RepeatingInterpolationQualifiers)
"dataOUT = 0.5 * dataOUT + vec4(0.5);\n" "dataOUT = 0.5 * dataOUT + vec4(0.5);\n"
"}\n"; "}\n";
if (compile(shaderString, GL_VERTEX_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
...@@ -303,7 +294,7 @@ TEST_F(QualificationOrderShaderTest, RepeatingInterpolationQualifiers) ...@@ -303,7 +294,7 @@ TEST_F(QualificationOrderShaderTest, RepeatingInterpolationQualifiers)
// Wrong order for the interpolation and storage qualifier. The correct order is interpolation // Wrong order for the interpolation and storage qualifier. The correct order is interpolation
// qualifier and then storage qualifier. // qualifier and then storage qualifier.
TEST_F(QualificationOrderShaderTest, WrongOrderInterpolationStorageQualifiers) TEST_F(QualificationOrderVertexShaderTest, WrongOrderInterpolationStorageQualifiers)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -315,14 +306,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderInterpolationStorageQualifiers) ...@@ -315,14 +306,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderInterpolationStorageQualifiers)
"dataOUT = 0.5 * dataOUT + vec4(0.5);\n" "dataOUT = 0.5 * dataOUT + vec4(0.5);\n"
"}\n"; "}\n";
if (compile(shaderString, GL_VERTEX_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// The correct order is invariant, interpolation, storage. // The correct order is invariant, interpolation, storage.
TEST_F(QualificationOrderShaderTest, WrongOrderInvariantInterpolationStorageQualifiers) TEST_F(QualificationOrderVertexShaderTest, WrongOrderInvariantInterpolationStorageQualifiers)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -334,14 +325,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderInvariantInterpolationStorageQual ...@@ -334,14 +325,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderInvariantInterpolationStorageQual
"dataOUT = 0.5 * dataOUT + vec4(0.5);\n" "dataOUT = 0.5 * dataOUT + vec4(0.5);\n"
"}\n"; "}\n";
if (compile(shaderString, GL_VERTEX_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// The invariant qualifer has to be before the storage qualifiers. // The invariant qualifer has to be before the storage qualifiers.
TEST_F(QualificationOrderShaderTest, WrongOrderInvariantNotFirst) TEST_F(QualificationOrderVertexShaderTest, WrongOrderInvariantNotFirst)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -353,14 +344,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderInvariantNotFirst) ...@@ -353,14 +344,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderInvariantNotFirst)
"dataOUT = 0.5 * dataOUT + vec4(0.5);\n" "dataOUT = 0.5 * dataOUT + vec4(0.5);\n"
"}\n"; "}\n";
if (compile(shaderString, GL_VERTEX_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// The precision qualifier is after the storage qualifiers. // The precision qualifier is after the storage qualifiers.
TEST_F(QualificationOrderShaderTest, WrongOrderPrecision) TEST_F(QualificationOrderVertexShaderTest, WrongOrderPrecision)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -372,14 +363,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderPrecision) ...@@ -372,14 +363,14 @@ TEST_F(QualificationOrderShaderTest, WrongOrderPrecision)
"dataOUT = 0.5 * dataOUT + vec4(0.5);\n" "dataOUT = 0.5 * dataOUT + vec4(0.5);\n"
"}\n"; "}\n";
if (compile(shaderString, GL_VERTEX_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// A variable cannot have multiple declarations of the 'in' storage qualifier. // A variable cannot have multiple declarations of the 'in' storage qualifier.
TEST_F(QualificationOrderShaderTest, RepeatingInQualifier) TEST_F(QualificationOrderVertexShaderTest, RepeatingInQualifier)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -389,14 +380,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingInQualifier) ...@@ -389,14 +380,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingInQualifier)
"gl_Position = positionIN;\n" "gl_Position = positionIN;\n"
"}\n"; "}\n";
if (compile(shaderString, GL_VERTEX_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// A variable cannot have multiple declarations of the 'attribute' storage qualifier. // A variable cannot have multiple declarations of the 'attribute' storage qualifier.
TEST_F(QualificationOrderShaderTest, RepeatingAttributeQualifier) TEST_F(QualificationOrderVertexShaderTest, RepeatingAttributeQualifier)
{ {
const std::string &shaderString = const std::string &shaderString =
"precision mediump float;\n" "precision mediump float;\n"
...@@ -405,14 +396,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingAttributeQualifier) ...@@ -405,14 +396,14 @@ TEST_F(QualificationOrderShaderTest, RepeatingAttributeQualifier)
"gl_Position = positionIN;\n" "gl_Position = positionIN;\n"
"}\n"; "}\n";
if (compile(shaderString, GL_VERTEX_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// Vertex input cannot be qualified with invariant. // Vertex input cannot be qualified with invariant.
TEST_F(QualificationOrderShaderTest, InvariantVertexInput) TEST_F(QualificationOrderVertexShaderTest, InvariantVertexInput)
{ {
const std::string &shaderString = const std::string &shaderString =
"precision mediump float;\n" "precision mediump float;\n"
...@@ -421,14 +412,14 @@ TEST_F(QualificationOrderShaderTest, InvariantVertexInput) ...@@ -421,14 +412,14 @@ TEST_F(QualificationOrderShaderTest, InvariantVertexInput)
"gl_Position = positionIN;\n" "gl_Position = positionIN;\n"
"}\n"; "}\n";
if (compile(shaderString, GL_VERTEX_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
} }
// Cannot have a function parameter with the invariant qualifier. // Cannot have a function parameter with the invariant qualifier.
TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersInvariant) TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersInvariant)
{ {
const std::string &shaderString = const std::string &shaderString =
"precision lowp float;\n" "precision lowp float;\n"
...@@ -441,14 +432,14 @@ TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersInvariant) ...@@ -441,14 +432,14 @@ TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersInvariant)
" gl_FragColor = vec4(foo0(value));\n" " gl_FragColor = vec4(foo0(value));\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure" << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure" << mInfoLog;
} }
} }
// Cannot have a function parameter with the attribute qualifier. // Cannot have a function parameter with the attribute qualifier.
TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersAttribute) TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersAttribute)
{ {
const std::string &shaderString = const std::string &shaderString =
"precision lowp float;\n" "precision lowp float;\n"
...@@ -461,14 +452,14 @@ TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersAttribute) ...@@ -461,14 +452,14 @@ TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersAttribute)
" gl_FragColor = vec4(foo0(value));\n" " gl_FragColor = vec4(foo0(value));\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure" << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure" << mInfoLog;
} }
} }
// Cannot have a function parameter with the varying qualifier. // Cannot have a function parameter with the varying qualifier.
TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersVarying) TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersVarying)
{ {
const std::string &shaderString = const std::string &shaderString =
"precision lowp float;\n" "precision lowp float;\n"
...@@ -481,14 +472,14 @@ TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersVarying) ...@@ -481,14 +472,14 @@ TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersVarying)
" gl_FragColor = vec4(foo0(value));\n" " gl_FragColor = vec4(foo0(value));\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure" << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure" << mInfoLog;
} }
} }
// Cannot have a function parameter with the layout qualifier // Cannot have a function parameter with the layout qualifier
TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersLayout) TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersLayout)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -503,14 +494,14 @@ TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersLayout) ...@@ -503,14 +494,14 @@ TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersLayout)
" colorOUT = vec4(foo0(value));\n" " colorOUT = vec4(foo0(value));\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure" << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure" << mInfoLog;
} }
} }
// Cannot have a function parameter with the centroid qualifier // Cannot have a function parameter with the centroid qualifier
TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersCentroidIn) TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersCentroidIn)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -525,14 +516,14 @@ TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersCentroidIn) ...@@ -525,14 +516,14 @@ TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersCentroidIn)
" colorOUT = vec4(foo0(value));\n" " colorOUT = vec4(foo0(value));\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure" << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure" << mInfoLog;
} }
} }
// Cannot have a function parameter with the flat qualifier // Cannot have a function parameter with the flat qualifier
TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersFlatIn) TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersFlatIn)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -547,7 +538,7 @@ TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersFlatIn) ...@@ -547,7 +538,7 @@ TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersFlatIn)
" colorOUT = vec4(foo0(value));\n" " colorOUT = vec4(foo0(value));\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure" << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure" << mInfoLog;
} }
...@@ -555,7 +546,7 @@ TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersFlatIn) ...@@ -555,7 +546,7 @@ TEST_F(QualificationOrderShaderTest, InvalidFunctionParametersFlatIn)
// Output layout location qualifier can't appear more than once within a declaration. // Output layout location qualifier can't appear more than once within a declaration.
// GLSL ES 3.00.6 section 4.3.8.2 Output Layout Qualifiers. // GLSL ES 3.00.6 section 4.3.8.2 Output Layout Qualifiers.
TEST_F(QualificationOrderShaderTest, TwoOutputLocations) TEST_F(QualificationOrderFragmentShaderTest, TwoOutputLocations)
{ {
const std::string &shaderString = const std::string &shaderString =
"#version 300 es\n" "#version 300 es\n"
...@@ -564,7 +555,7 @@ TEST_F(QualificationOrderShaderTest, TwoOutputLocations) ...@@ -564,7 +555,7 @@ TEST_F(QualificationOrderShaderTest, TwoOutputLocations)
"void main() {\n" "void main() {\n"
"}\n"; "}\n";
if (compile(shaderString, GL_FRAGMENT_SHADER, SH_GLES3_SPEC)) if (compile(shaderString))
{ {
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog; FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
} }
......
src/tests/compiler_tests/ShaderImage_test.cpp
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include "angle_gl.h" #include "angle_gl.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "GLSLANG/ShaderLang.h" #include "GLSLANG/ShaderLang.h"
#include "compiler/translator/TranslatorESSL.h"
#include "tests/test_utils/compiler_test.h" #include "tests/test_utils/compiler_test.h"
#include "tests/test_utils/ShaderCompileTreeTest.h"
using namespace sh; using namespace sh;
...@@ -111,39 +111,20 @@ void CheckImageDeclaration(TIntermNode *astRoot, ...@@ -111,39 +111,20 @@ void CheckImageDeclaration(TIntermNode *astRoot,
} // namespace } // namespace
class ShaderImageTest : public testing::Test class ShaderImageTest : public ShaderCompileTreeTest
{ {
public: public:
ShaderImageTest() {} ShaderImageTest() {}
protected: protected:
virtual void SetUp() void SetUp() override
{ {
ShBuiltInResources resources; ShaderCompileTreeTest::SetUp();
sh::InitBuiltInResources(&resources); mExtraCompileOptions |= SH_VARIABLES;
mTranslator = new sh::TranslatorESSL(GL_COMPUTE_SHADER, SH_GLES3_1_SPEC);
ASSERT_TRUE(mTranslator->Init(resources));
}
virtual void TearDown() { delete mTranslator; }
// Return true when compilation succeeds
bool compile(const std::string &shaderString)
{
const char *shaderStrings[] = {shaderString.c_str()};
mASTRoot = mTranslator->compileTreeForTesting(shaderStrings, 1,
SH_INTERMEDIATE_TREE | SH_VARIABLES);
TInfoSink &infoSink = mTranslator->getInfoSink();
mInfoLog = infoSink.info.c_str();
return mASTRoot != nullptr;
} }
protected: ::GLenum getShaderType() const override { return GL_COMPUTE_SHADER; }
std::string mTranslatedCode; ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
std::string mInfoLog;
sh::TranslatorESSL *mTranslator;
TIntermNode *mASTRoot;
}; };
// Test that an image2D is properly parsed and exported as a uniform. // Test that an image2D is properly parsed and exported as a uniform.
...@@ -161,7 +142,7 @@ TEST_F(ShaderImageTest, Image2DDeclaration) ...@@ -161,7 +142,7 @@ TEST_F(ShaderImageTest, Image2DDeclaration)
FAIL() << "Shader compilation failed" << mInfoLog; FAIL() << "Shader compilation failed" << mInfoLog;
} }
CheckExportedImageUniform(mTranslator->getUniforms(), 0, GL_IMAGE_2D, "myImage"); CheckExportedImageUniform(getUniforms(), 0, GL_IMAGE_2D, "myImage");
CheckImageDeclaration(mASTRoot, "myImage", EbtImage2D, EiifRGBA32F, true, false, false, false, CheckImageDeclaration(mASTRoot, "myImage", EbtImage2D, EiifRGBA32F, true, false, false, false,
false); false);
} }
...@@ -181,7 +162,7 @@ TEST_F(ShaderImageTest, Image3DDeclaration) ...@@ -181,7 +162,7 @@ TEST_F(ShaderImageTest, Image3DDeclaration)
FAIL() << "Shader compilation failed" << mInfoLog; FAIL() << "Shader compilation failed" << mInfoLog;
} }
CheckExportedImageUniform(mTranslator->getUniforms(), 0, GL_UNSIGNED_INT_IMAGE_3D, "myImage"); CheckExportedImageUniform(getUniforms(), 0, GL_UNSIGNED_INT_IMAGE_3D, "myImage");
CheckImageDeclaration(mASTRoot, "myImage", EbtUImage3D, EiifRGBA32UI, true, true, false, false, CheckImageDeclaration(mASTRoot, "myImage", EbtUImage3D, EiifRGBA32UI, true, true, false, false,
false); false);
} }
......
src/tests/test_utils/ConstantFoldingTest.cpp
...@@ -15,42 +15,6 @@ ...@@ -15,42 +15,6 @@
using namespace sh; using namespace sh;
void ConstantFoldingTest::SetUp()
{
allocator.push();
SetGlobalPoolAllocator(&allocator);
ShBuiltInResources resources;
InitBuiltInResources(&resources);
mTranslatorESSL = new TranslatorESSL(GL_FRAGMENT_SHADER, SH_GLES3_SPEC);
ASSERT_TRUE(mTranslatorESSL->Init(resources));
}
void ConstantFoldingTest::TearDown()
{
delete mTranslatorESSL;
SetGlobalPoolAllocator(NULL);
allocator.pop();
}
void ConstantFoldingTest::compile(const std::string &shaderString)
{
const char *shaderStrings[] = {shaderString.c_str()};
mASTRoot = mTranslatorESSL->compileTreeForTesting(shaderStrings, 1, SH_OBJECT_CODE);
if (!mASTRoot)
{
TInfoSink &infoSink = mTranslatorESSL->getInfoSink();
FAIL() << "Shader compilation into ESSL failed " << infoSink.info.c_str();
}
}
bool ConstantFoldingTest::hasWarning()
{
TInfoSink &infoSink = mTranslatorESSL->getInfoSink();
return infoSink.info.str().find("WARNING:") != std::string::npos;
}
void ConstantFoldingExpressionTest::evaluateFloat(const std::string &floatExpression) void ConstantFoldingExpressionTest::evaluateFloat(const std::string &floatExpression)
{ {
std::stringstream shaderStream; std::stringstream shaderStream;
...@@ -61,5 +25,5 @@ void ConstantFoldingExpressionTest::evaluateFloat(const std::string &floatExpres ...@@ -61,5 +25,5 @@ void ConstantFoldingExpressionTest::evaluateFloat(const std::string &floatExpres
"{\n" "{\n"
<< " my_FragColor = " << floatExpression << ";\n" << " my_FragColor = " << floatExpression << ";\n"
<< "}\n"; << "}\n";
compile(shaderStream.str()); compileAssumeSuccess(shaderStream.str());
} }
src/tests/test_utils/ConstantFoldingTest.h
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
#include "common/mathutil.h" #include "common/mathutil.h"
#include "compiler/translator/IntermNode.h" #include "compiler/translator/IntermNode.h"
#include "compiler/translator/PoolAlloc.h" #include "tests/test_utils/ShaderCompileTreeTest.h"
#include "gtest/gtest.h"
namespace sh namespace sh
{ {
...@@ -132,20 +131,14 @@ class ConstantFinder : public TIntermTraverser ...@@ -132,20 +131,14 @@ class ConstantFinder : public TIntermTraverser
bool mFound; bool mFound;
}; };
class ConstantFoldingTest : public testing::Test class ConstantFoldingTest : public ShaderCompileTreeTest
{ {
public: public:
ConstantFoldingTest() {} ConstantFoldingTest() {}
protected: protected:
void SetUp() override; ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
ShShaderSpec getShaderSpec() const override { return SH_GLES3_SPEC; }
void TearDown() override;
void compile(const std::string &shaderString);
// Must be called after compile()
bool hasWarning();
template <typename T> template <typename T>
bool constantFoundInAST(T constant) bool constantFoundInAST(T constant)
...@@ -176,12 +169,6 @@ class ConstantFoldingTest : public testing::Test ...@@ -176,12 +169,6 @@ class ConstantFoldingTest : public testing::Test
mASTRoot->traverse(&finder); mASTRoot->traverse(&finder);
return finder.found(); return finder.found();
} }
private:
TranslatorESSL *mTranslatorESSL;
TIntermNode *mASTRoot;
TPoolAllocator allocator;
}; };
class ConstantFoldingExpressionTest : public ConstantFoldingTest class ConstantFoldingExpressionTest : public ConstantFoldingTest
......
src/tests/test_utils/ShaderCompileTreeTest.cpp 0 → 100644
//
// Copyright (c) 2016 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.
//
// ShaderCompileTreeTest.cpp:
// Test that shader validation results in the correct compile status.
//
#include "tests/test_utils/ShaderCompileTreeTest.h"
#include "compiler/translator/TranslatorESSL.h"
using namespace sh;
void ShaderCompileTreeTest::SetUp()
{
mAllocator.push();
SetGlobalPoolAllocator(&mAllocator);
ShBuiltInResources resources;
sh::InitBuiltInResources(&resources);
initResources(&resources);
mTranslator = new TranslatorESSL(getShaderType(), getShaderSpec());
ASSERT_TRUE(mTranslator->Init(resources));
}
void ShaderCompileTreeTest::TearDown()
{
delete mTranslator;
SetGlobalPoolAllocator(nullptr);
mAllocator.pop();
}
bool ShaderCompileTreeTest::compile(const std::string &shaderString)
{
const char *shaderStrings[] = {shaderString.c_str()};
mASTRoot = mTranslator->compileTreeForTesting(shaderStrings, 1, mExtraCompileOptions);
TInfoSink &infoSink = mTranslator->getInfoSink();
mInfoLog = infoSink.info.c_str();
return mASTRoot != nullptr;
}
void ShaderCompileTreeTest::compileAssumeSuccess(const std::string &shaderString)
{
if (!compile(shaderString))
{
FAIL() << "Shader compilation into ESSL failed, log:\n" << mInfoLog;
}
}
bool ShaderCompileTreeTest::hasWarning() const
{
return mInfoLog.find("WARNING: ") != std::string::npos;
}
const std::vector<sh::Uniform> ShaderCompileTreeTest::getUniforms()
{
ASSERT(mExtraCompileOptions & SH_VARIABLES);
return mTranslator->getUniforms();
}
\ No newline at end of file
src/tests/test_utils/ShaderCompileTreeTest.h 0 → 100644
//
// Copyright (c) 2016 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.
//
// ShaderCompileTreeTest.h:
// Test that shader validation results in the correct compile status.
//
#ifndef TESTS_TEST_UTILS_SHADER_COMPILE_TREE_TEST_H_
#define TESTS_TEST_UTILS_SHADER_COMPILE_TREE_TEST_H_
#include "angle_gl.h"
#include "compiler/translator/PoolAlloc.h"
#include "gtest/gtest.h"
#include "GLSLANG/ShaderLang.h"
namespace sh
{
class TIntermBlock;
class TranslatorESSL;
class ShaderCompileTreeTest : public testing::Test
{
public:
ShaderCompileTreeTest() : mExtraCompileOptions(0) {}
protected:
void SetUp() override;
void TearDown() override;
// Return true when compilation succeeds
bool compile(const std::string &shaderString);
void compileAssumeSuccess(const std::string &shaderString);
bool hasWarning() const;
const std::vector<sh::Uniform> getUniforms();
virtual void initResources(ShBuiltInResources *resources) {}
virtual ::GLenum getShaderType() const = 0;
virtual ShShaderSpec getShaderSpec() const = 0;
std::string mInfoLog;
ShCompileOptions mExtraCompileOptions;
TIntermBlock *mASTRoot;
private:
TranslatorESSL *mTranslator;
TPoolAllocator mAllocator;
};
} // namespace sh
#endif // TESTS_TEST_UTILS_SHADER_COMPILE_TREE_TEST_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment