kc3-lang/angle/src/tests/compiler_tests/EmulateGLBaseVertexBaseInstance_test.cpp
-
Show log
Commit
-
Hash : 776c6015
Author :
Date : 2021-02-26T00:00:57
Vulkan: Call glslang at compile time With this change, the ANGLE translator immediately compiles the generated GLSL into SPIR-V with glslang and discards the source. This is in preparation for generating SPIR-V directly, by making the frontend and backend already able to digest it. This change also allows the expensive glslang calls to be parallelized, improving the following perf test by about 20%: LinkProgramBenchmark.Run/vulkan_compile_and_link_multi_thread Previously, the test was run as such in the Vulkan backend: Main Thread 1 Thread 2 Compile1 ---> Compile2 ---------------------> Translator Translator <--- <--------------------- Link glslang for shader1 glslang for shader2 Done With this change, it is run as such: Main Thread 1 Thread 2 Compile1 ---> Compile2 ---------------------> Translator Translator glslang glslang <--- <--------------------- Link Done glslang_wrapper_utils no longer interacts with glslang! A rename will follow. Bug: angleproject:4889 Change-Id: If4303e8ba0ba43b1a2f47f8c0a9133d0bee1a19a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2721195 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>
-
src/tests/compiler_tests/EmulateGLBaseVertexBaseInstance_test.cpp
-
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 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215
// // Copyright 2019 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. // // ANGLE_base_vertex_base_instance.cpp: // Test for ANGLE_base_vertex_base_instance extension // #include "GLSLANG/ShaderLang.h" #include "angle_gl.h" #include "compiler/translator/tree_ops/EmulateMultiDrawShaderBuiltins.h" #include "gtest/gtest.h" #include "tests/test_utils/compiler_test.h" using namespace sh; class EmulateGLBaseVertexBaseInstanceTest : public MatchOutputCodeTest { public: EmulateGLBaseVertexBaseInstanceTest() : MatchOutputCodeTest(GL_VERTEX_SHADER, SH_VARIABLES, SH_GLSL_COMPATIBILITY_OUTPUT) { getResources()->ANGLE_base_vertex_base_instance = 1; } protected: void CheckCompileFailure(const std::string &shaderString, const char *expectedError = nullptr) { std::string translatedCode; std::string infoLog; bool success = compileTestShader(GL_VERTEX_SHADER, SH_GLES3_SPEC, SH_GLSL_COMPATIBILITY_OUTPUT, shaderString, getResources(), SH_VARIABLES, &translatedCode, &infoLog); EXPECT_FALSE(success); if (expectedError) { EXPECT_TRUE(infoLog.find(expectedError) != std::string::npos); } } }; // Check that compilation fails if the compile option to emulate gl_BaseVertex and gl_BaseInstance // is not set TEST_F(EmulateGLBaseVertexBaseInstanceTest, RequiresEmulation) { CheckCompileFailure( "#extension GL_ANGLE_base_vertex_base_instance : require\n" "void main() {\n" " gl_Position = vec4(float(gl_BaseVertex), float(gl_BaseInstance), 0.0, 1.0);\n" "}\n", "extension is not supported"); } // Check that compiling with emulation with gl_BaseVertex and gl_BaseInstance works with different // shader versions TEST_F(EmulateGLBaseVertexBaseInstanceTest, CheckCompile) { const std::string shaderString = "#extension GL_ANGLE_base_vertex_base_instance : require\n" "void main() {\n" " gl_Position = vec4(float(gl_BaseVertex), float(gl_BaseInstance), 0.0, 1.0);\n" "}\n"; compile("#version 300 es\n" + shaderString, SH_OBJECT_CODE | SH_VARIABLES | SH_EMULATE_GL_BASE_VERTEX_BASE_INSTANCE); } // Check that gl_BaseVertex and gl_BaseInstance is properly emulated TEST_F(EmulateGLBaseVertexBaseInstanceTest, EmulatesUniform) { addOutputType(SH_GLSL_COMPATIBILITY_OUTPUT); addOutputType(SH_ESSL_OUTPUT); #ifdef ANGLE_ENABLE_VULKAN addOutputType(SH_SPIRV_VULKAN_OUTPUT); #endif #ifdef ANGLE_ENABLE_HLSL addOutputType(SH_HLSL_3_0_OUTPUT); addOutputType(SH_HLSL_3_0_OUTPUT); #endif const std::string &shaderString = "#version 300 es\n" "#extension GL_ANGLE_base_vertex_base_instance : require\n" "void main() {\n" " gl_Position = vec4(float(gl_BaseVertex), float(gl_BaseInstance), 0.0, 1.0);\n" "}\n"; compile(shaderString, SH_OBJECT_CODE | SH_VARIABLES | SH_EMULATE_GL_BASE_VERTEX_BASE_INSTANCE); EXPECT_TRUE(notFoundInCode("gl_BaseVertex")); EXPECT_TRUE(foundInCode("angle_BaseVertex")); EXPECT_TRUE(notFoundInCode("gl_BaseInstance")); EXPECT_TRUE(foundInCode("angle_BaseInstance")); EXPECT_TRUE(notFoundInCode("GL_ANGLE_base_vertex_base_instance")); EXPECT_TRUE(foundInCode(SH_GLSL_COMPATIBILITY_OUTPUT, "uniform int angle_BaseVertex")); EXPECT_TRUE(foundInCode(SH_GLSL_COMPATIBILITY_OUTPUT, "uniform int angle_BaseInstance")); EXPECT_TRUE(foundInCode(SH_ESSL_OUTPUT, "uniform highp int angle_BaseVertex")); EXPECT_TRUE(foundInCode(SH_ESSL_OUTPUT, "uniform highp int angle_BaseInstance")); #ifdef ANGLE_ENABLE_HLSL EXPECT_TRUE(foundInCode(SH_HLSL_3_0_OUTPUT, "uniform int angle_BaseVertex : register")); EXPECT_TRUE(foundInCode(SH_HLSL_3_0_OUTPUT, "uniform int angle_BaseInstance : register")); #endif } // Check that a user-defined "gl_BaseVertex" or "gl_BaseInstance" is not permitted TEST_F(EmulateGLBaseVertexBaseInstanceTest, DisallowsUserDefinedGLDrawID) { // Check that it is not permitted without the extension CheckCompileFailure( "#version 300 es\n" "uniform int gl_BaseVertex;\n" "void main() {\n" " gl_Position = vec4(float(gl_BaseVertex), 0.0, 0.0, 1.0);\n" "}\n", "reserved built-in name"); CheckCompileFailure( "#version 300 es\n" "uniform int gl_BaseInstance;\n" "void main() {\n" " gl_Position = vec4(float(gl_BaseInstance), 0.0, 0.0, 1.0);\n" "}\n", "reserved built-in name"); CheckCompileFailure( "#version 300 es\n" "void main() {\n" " int gl_BaseVertex = 0;\n" " gl_Position = vec4(float(gl_BaseVertex), 0.0, 0.0, 1.0);\n" "}\n", "reserved built-in name"); CheckCompileFailure( "#version 300 es\n" "void main() {\n" " int gl_BaseInstance = 0;\n" " gl_Position = vec4(float(gl_BaseInstance), 0.0, 0.0, 1.0);\n" "}\n", "reserved built-in name"); // Check that it is not permitted with the extension CheckCompileFailure( "#version 300 es\n" "#extension GL_ANGLE_base_vertex_base_instance : require\n" "uniform int gl_BaseVertex;\n" "void main() {\n" " gl_Position = vec4(float(gl_BaseVertex), 0.0, 0.0, 1.0);\n" "}\n", "reserved built-in name"); CheckCompileFailure( "#version 300 es\n" "#extension GL_ANGLE_base_vertex_base_instance : require\n" "uniform int gl_BaseInstance;\n" "void main() {\n" " gl_Position = vec4(float(gl_BaseInstance), 0.0, 0.0, 1.0);\n" "}\n", "reserved built-in name"); CheckCompileFailure( "#version 300 es\n" "#extension GL_ANGLE_base_vertex_base_instance : require\n" "void main() {\n" " int gl_BaseVertex = 0;\n" " gl_Position = vec4(float(gl_BaseVertex), 0.0, 0.0, 1.0);\n" "}\n", "reserved built-in name"); CheckCompileFailure( "#version 300 es\n" "#extension GL_ANGLE_base_vertex_base_instance : require\n" "void main() {\n" " int gl_BaseInstance = 0;\n" " gl_Position = vec4(float(gl_BaseInstance), 0.0, 0.0, 1.0);\n" "}\n", "reserved built-in name"); } // gl_BaseVertex and gl_BaseInstance are translated to angle_BaseVertex and angle_BaseInstance // internally. Check that a user-defined angle_BaseVertex or angle_BaseInstance is permitted TEST_F(EmulateGLBaseVertexBaseInstanceTest, AllowsUserDefinedANGLEDrawID) { addOutputType(SH_GLSL_COMPATIBILITY_OUTPUT); addOutputType(SH_ESSL_OUTPUT); #ifdef ANGLE_ENABLE_VULKAN addOutputType(SH_SPIRV_VULKAN_OUTPUT); #endif #ifdef ANGLE_ENABLE_HLSL addOutputType(SH_HLSL_3_0_OUTPUT); addOutputType(SH_HLSL_3_0_OUTPUT); #endif const std::string &shaderString = "#version 300 es\n" "#extension GL_ANGLE_base_vertex_base_instance : require\n" "uniform int angle_BaseVertex;\n" "uniform int angle_BaseInstance;\n" "void main() {\n" " gl_Position = vec4(\n" " float(angle_BaseVertex + gl_BaseVertex),\n" " float(angle_BaseInstance + gl_BaseInstance),\n" " 0.0, 1.0);\n" "}\n"; compile(shaderString, SH_OBJECT_CODE | SH_VARIABLES | SH_EMULATE_GL_BASE_VERTEX_BASE_INSTANCE); // " angle_BaseVertex" (note the space) should appear exactly twice: // once in the declaration and once in the body. // The user-defined angle_BaseVertex should be decorated EXPECT_TRUE(foundInCode(" angle_BaseVertex", 2)); EXPECT_TRUE(foundInCode(" angle_BaseInstance", 2)); }