Translator: Rename GLSL to SPIR-V in Vulkan and Metal output

include/GLSLANG/ShaderLang.h

@@ -26,7 +26,7 @@
 
 // Version number for shader translation API.
 // It is incremented every time the API changes.
-#define ANGLE_SH_VERSION 253
+#define ANGLE_SH_VERSION 254
 
 enum ShShaderSpec
 {
@@ -69,12 +69,11 @@ enum ShShaderOutput
     SH_HLSL_4_1_OUTPUT       = 0x8B49,  // D3D 11
     SH_HLSL_4_0_FL9_3_OUTPUT = 0x8B4A,  // D3D 11 feature level 9_3
 
-    // Output specialized GLSL to be fed to glslang for Vulkan SPIR.
-    SH_GLSL_VULKAN_OUTPUT = 0x8B4B,
+    // Output SPIR-V for the Vulkan backend.
+    SH_SPIRV_VULKAN_OUTPUT = 0x8B4B,
 
-    // Output specialized GLSL to be fed to glslang for Vulkan SPIR to be cross compiled to Metal
-    // later.
-    SH_GLSL_METAL_OUTPUT = 0x8B4C,
+    // Output SPIR-V to be cross compiled to Metal.
+    SH_SPIRV_METAL_OUTPUT = 0x8B4C,
 };
 
 // Compile options.

samples/shader_translator/shader_translator.cpp

@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
                                 compileOptions |= SH_INITIALIZE_UNINITIALIZED_LOCALS;
                                 break;
                             case 'v':
-                                output = SH_GLSL_VULKAN_OUTPUT;
+                                output = SH_SPIRV_VULKAN_OUTPUT;
                                 compileOptions |= SH_INITIALIZE_UNINITIALIZED_LOCALS;
                                 break;
                             case 'h':

src/compiler/translator/OutputVulkanGLSL.cpp

@@ -4,8 +4,8 @@
 // found in the LICENSE file.
 //
 // OutputVulkanGLSL:
-//   Code that outputs shaders that fit GL_KHR_vulkan_glsl.
-//   The shaders are then fed into glslang to spit out SPIR-V (libANGLE-side).
+//   Code that outputs shaders that fit GL_KHR_vulkan_glsl, to be fed to glslang to generate
+//   SPIR-V.
 //   See: https://www.khronos.org/registry/vulkan/specs/misc/GL_KHR_vulkan_glsl.txt
 //
 

src/compiler/translator/OutputVulkanGLSL.h

@@ -4,11 +4,14 @@
 // found in the LICENSE file.
 //
 // OutputVulkanGLSL:
-//   Code that outputs shaders that fit GL_KHR_vulkan_glsl.
-//   The shaders are then fed into glslang to spit out SPIR-V (libANGLE-side).
+//   Code that outputs shaders that fit GL_KHR_vulkan_glsl, to be fed to glslang to generate
+//   SPIR-V.
 //   See: https://www.khronos.org/registry/vulkan/specs/misc/GL_KHR_vulkan_glsl.txt
 //
 
+#ifndef COMPILER_TRANSLATOR_OUTPUTVULKANGLSL_H_
+#define COMPILER_TRANSLATOR_OUTPUTVULKANGLSL_H_
+
 #include "compiler/translator/OutputGLSL.h"
 
 namespace sh
@@ -67,3 +70,5 @@ class TOutputVulkanGLSL : public TOutputGLSL
 };
 
 }  // namespace sh
+
+#endif  // COMPILER_TRANSLATOR_OUTPUTVULKANGLSL_H_

src/compiler/translator/OutputVulkanGLSLForMetal.h

@@ -8,6 +8,9 @@
 //    considerations for Metal backend limitations.
 //
 
+#ifndef COMPILER_TRANSLATOR_OUTPUTVULKANGLSLFORMETAL_H_
+#define COMPILER_TRANSLATOR_OUTPUTVULKANGLSLFORMETAL_H_
+
 #include "compiler/translator/OutputVulkanGLSL.h"
 
 namespace sh
@@ -37,3 +40,5 @@ class TOutputVulkanGLSLForMetal : public TOutputVulkanGLSL
 };
 
 }  // namespace sh
+
+#endif  // COMPILER_TRANSLATOR_OUTPUTVULKANGLSLFORMETAL_H_

src/compiler/translator/TranslatorMetal.cpp

@@ -6,7 +6,7 @@
 // TranslatorMetal:
 //   A GLSL-based translator that outputs shaders that fit GL_KHR_vulkan_glsl.
 //   It takes into account some considerations for Metal backend also.
-//   The shaders are then fed into glslang to spit out SPIR-V (libANGLE-side).
+//   The shaders are then fed into glslang to spit out SPIR-V.
 //   See: https://www.khronos.org/registry/vulkan/specs/misc/GL_KHR_vulkan_glsl.txt
 //
 //   The SPIR-V will then be translated to Metal Shading Language later in Metal backend.

src/compiler/translator/TranslatorMetal.h

@@ -6,7 +6,7 @@
 // TranslatorMetal:
 //   A GLSL-based translator that outputs shaders that fit GL_KHR_vulkan_glsl.
 //   It takes into account some considerations for Metal backend also.
-//   The shaders are then fed into glslang to spit out SPIR-V (libANGLE-side).
+//   The shaders are then fed into glslang to spit out SPIR-V.
 //   See: https://www.khronos.org/registry/vulkan/specs/misc/GL_KHR_vulkan_glsl.txt
 //
 //   The SPIR-V will then be translated to Metal Shading Language later in Metal backend.

src/compiler/translator/TranslatorVulkan.cpp

@@ -4,8 +4,8 @@
 // found in the LICENSE file.
 //
 // TranslatorVulkan:
-//   A GLSL-based translator that outputs shaders that fit GL_KHR_vulkan_glsl.
-//   The shaders are then fed into glslang to spit out SPIR-V (libANGLE-side).
+//   A GLSL-based translator that outputs shaders that fit GL_KHR_vulkan_glsl and feeds them into
+//   glslang to spit out SPIR-V.
 //   See: https://www.khronos.org/registry/vulkan/specs/misc/GL_KHR_vulkan_glsl.txt
 //
 
@@ -1295,7 +1295,7 @@ bool TranslatorVulkan::translate(TIntermBlock *root,
     TInfoSinkBase &sink = getInfoSink().obj;
 
     bool precisionEmulation = false;
-    if (!emulatePrecisionIfNeeded(root, sink, &precisionEmulation, SH_GLSL_VULKAN_OUTPUT))
+    if (!emulatePrecisionIfNeeded(root, sink, &precisionEmulation, SH_SPIRV_VULKAN_OUTPUT))
         return false;
 
     bool enablePrecision = (compileOptions & SH_IGNORE_PRECISION_QUALIFIERS) == 0;

src/compiler/translator/TranslatorVulkan.h

@@ -4,8 +4,8 @@
 // found in the LICENSE file.
 //
 // TranslatorVulkan:
-//   A GLSL-based translator that outputs shaders that fit GL_KHR_vulkan_glsl.
-//   The shaders are then fed into glslang to spit out SPIR-V (libANGLE-side).
+//   A GLSL-based translator that outputs shaders that fit GL_KHR_vulkan_glsl and feeds them into
+//   glslang to spit out SPIR-V.
 //   See: https://www.khronos.org/registry/vulkan/specs/misc/GL_KHR_vulkan_glsl.txt
 //
 

src/compiler/translator/util.cpp

@@ -863,11 +863,11 @@ bool IsOutputHLSL(ShShaderOutput output)
 }
 bool IsOutputVulkan(ShShaderOutput output)
 {
-    return output == SH_GLSL_VULKAN_OUTPUT;
+    return output == SH_SPIRV_VULKAN_OUTPUT;
 }
 bool IsOutputMetal(ShShaderOutput output)
 {
-    return output == SH_GLSL_METAL_OUTPUT;
+    return output == SH_SPIRV_METAL_OUTPUT;
 }
 
 bool IsInShaderStorageBlock(TIntermTyped *node)

src/libANGLE/renderer/metal/CompilerMtl.mm

@@ -20,7 +20,7 @@ CompilerMtl::~CompilerMtl() {}
 
 ShShaderOutput CompilerMtl::getTranslatorOutputType() const
 {
-    return SH_GLSL_METAL_OUTPUT;
+    return SH_SPIRV_METAL_OUTPUT;
 }
 
 }  // namespace rx

src/libANGLE/renderer/vulkan/CompilerVk.cpp

@@ -20,7 +20,7 @@ CompilerVk::~CompilerVk() {}
 
 ShShaderOutput CompilerVk::getTranslatorOutputType() const
 {
-    return SH_GLSL_VULKAN_OUTPUT;
+    return SH_SPIRV_VULKAN_OUTPUT;
 }
 
 }  // namespace rx

src/tests/compiler_tests/APPLE_clip_distance_test.cpp

@@ -106,7 +106,7 @@ TEST_P(APPLEClipDistanceTest, CompileSucceedsVulkan)
     mResources.APPLE_clip_distance = 1;
     mResources.MaxClipDistances    = 8;
 
-    InitializeCompiler(SH_GLSL_VULKAN_OUTPUT);
+    InitializeCompiler(SH_SPIRV_VULKAN_OUTPUT);
     EXPECT_TRUE(TestShaderCompile(EXTPragma));
 }
 #endif
@@ -118,7 +118,7 @@ TEST_P(APPLEClipDistanceTest, CompileSucceedsMetal)
     mResources.APPLE_clip_distance = 1;
     mResources.MaxClipDistances    = 8;
 
-    InitializeCompiler(SH_GLSL_METAL_OUTPUT);
+    InitializeCompiler(SH_SPIRV_METAL_OUTPUT);
     EXPECT_TRUE(TestShaderCompile(EXTPragma));
 }
 #endif

src/tests/compiler_tests/EXT_clip_cull_distance_test.cpp

@@ -323,7 +323,7 @@ TEST_P(EXTClipCullDistanceForVertexShaderTest, CompileSucceedsVulkan)
     mResources.MaxCullDistances                = 8;
     mResources.MaxCombinedClipAndCullDistances = 8;
 
-    InitializeCompiler(SH_GLSL_VULKAN_OUTPUT);
+    InitializeCompiler(SH_SPIRV_VULKAN_OUTPUT);
     EXPECT_TRUE(TestShaderCompile(EXTPragma));
     EXPECT_FALSE(TestShaderCompile(""));
     EXPECT_TRUE(TestShaderCompile(EXTPragma));
@@ -358,7 +358,7 @@ TEST_P(EXTClipCullDistanceForFragmentShaderTest, CompileSucceedsVulkan)
     mResources.MaxCullDistances                = 8;
     mResources.MaxCombinedClipAndCullDistances = 8;
 
-    InitializeCompiler(SH_GLSL_VULKAN_OUTPUT);
+    InitializeCompiler(SH_SPIRV_VULKAN_OUTPUT);
     EXPECT_TRUE(TestShaderCompile(EXTPragma));
     EXPECT_FALSE(TestShaderCompile(""));
     EXPECT_TRUE(TestShaderCompile(EXTPragma));
@@ -380,7 +380,7 @@ TEST_P(EXTClipCullDistanceForVertexShaderCompileFailureTest, CompileFails)
     mResources.MaxCullDistances                = 8;
     mResources.MaxCombinedClipAndCullDistances = 8;
 
-    InitializeCompiler(SH_GLSL_VULKAN_OUTPUT);
+    InitializeCompiler(SH_SPIRV_VULKAN_OUTPUT);
     EXPECT_FALSE(TestShaderCompile(EXTPragma));
 }
 
@@ -392,7 +392,7 @@ TEST_P(EXTClipCullDistanceForFragmentShaderCompileFailureTest, CompileFails)
     mResources.MaxCullDistances                = 8;
     mResources.MaxCombinedClipAndCullDistances = 8;
 
-    InitializeCompiler(SH_GLSL_VULKAN_OUTPUT);
+    InitializeCompiler(SH_SPIRV_VULKAN_OUTPUT);
     EXPECT_FALSE(TestShaderCompile(EXTPragma));
 }
 #endif

src/tests/compiler_tests/EXT_shader_framebuffer_fetch_test.cpp

@@ -126,7 +126,7 @@ class EXTShaderFramebufferFetchNoncoherentTest : public sh::ShaderExtensionTest
         std::map<ShShaderOutput, std::string> shaderOutputList = {
             {SH_GLSL_450_CORE_OUTPUT, "SH_GLSL_450_CORE_OUTPUT"},
 #if defined(ANGLE_ENABLE_VULKAN)
-            {SH_GLSL_VULKAN_OUTPUT, "SH_GLSL_VULKAN_OUTPUT"}
+            {SH_SPIRV_VULKAN_OUTPUT, "SH_SPIRV_VULKAN_OUTPUT"}
 #endif
         };
 
@@ -330,7 +330,7 @@ class EXTShaderFramebufferFetchNoncoherentSuccessTest
     void SetUp() override
     {
         std::map<ShShaderOutput, std::string> shaderOutputList = {
-            {SH_GLSL_VULKAN_OUTPUT, "SH_GLSL_VULKAN_OUTPUT"}};
+            {SH_SPIRV_VULKAN_OUTPUT, "SH_SPIRV_VULKAN_OUTPUT"}};
 
         Initialize(shaderOutputList);
     }

src/tests/compiler_tests/EmulateGLBaseVertexBaseInstance_test.cpp

@@ -72,7 +72,7 @@ TEST_F(EmulateGLBaseVertexBaseInstanceTest, EmulatesUniform)
     addOutputType(SH_GLSL_COMPATIBILITY_OUTPUT);
     addOutputType(SH_ESSL_OUTPUT);
 #ifdef ANGLE_ENABLE_VULKAN
-    addOutputType(SH_GLSL_VULKAN_OUTPUT);
+    addOutputType(SH_SPIRV_VULKAN_OUTPUT);
 #endif
 #ifdef ANGLE_ENABLE_HLSL
     addOutputType(SH_HLSL_3_0_OUTPUT);
@@ -101,7 +101,7 @@ TEST_F(EmulateGLBaseVertexBaseInstanceTest, EmulatesUniform)
 
 #ifdef ANGLE_ENABLE_VULKAN
     EXPECT_TRUE(foundInCode(
-        SH_GLSL_VULKAN_OUTPUT,
+        SH_SPIRV_VULKAN_OUTPUT,
         "uniform defaultUniformsVS\n{\n    int angle_BaseInstance;\n    int angle_BaseVertex;"));
 #endif
 #ifdef ANGLE_ENABLE_HLSL
@@ -191,7 +191,7 @@ TEST_F(EmulateGLBaseVertexBaseInstanceTest, AllowsUserDefinedANGLEDrawID)
     addOutputType(SH_GLSL_COMPATIBILITY_OUTPUT);
     addOutputType(SH_ESSL_OUTPUT);
 #ifdef ANGLE_ENABLE_VULKAN
-    addOutputType(SH_GLSL_VULKAN_OUTPUT);
+    addOutputType(SH_SPIRV_VULKAN_OUTPUT);
 #endif
 #ifdef ANGLE_ENABLE_HLSL
     addOutputType(SH_HLSL_3_0_OUTPUT);

src/tests/compiler_tests/EmulateGLDrawID_test.cpp

@@ -73,7 +73,7 @@ TEST_F(EmulateGLDrawIDTest, EmulatesUniform)
     addOutputType(SH_GLSL_COMPATIBILITY_OUTPUT);
     addOutputType(SH_ESSL_OUTPUT);
 #ifdef ANGLE_ENABLE_VULKAN
-    addOutputType(SH_GLSL_VULKAN_OUTPUT);
+    addOutputType(SH_SPIRV_VULKAN_OUTPUT);
 #endif
 #ifdef ANGLE_ENABLE_HLSL
     addOutputType(SH_HLSL_3_0_OUTPUT);
@@ -97,7 +97,7 @@ TEST_F(EmulateGLDrawIDTest, EmulatesUniform)
 
 #ifdef ANGLE_ENABLE_VULKAN
     EXPECT_TRUE(
-        foundInCode(SH_GLSL_VULKAN_OUTPUT, "uniform defaultUniformsVS\n{\n    int angle_DrawID;"));
+        foundInCode(SH_SPIRV_VULKAN_OUTPUT, "uniform defaultUniformsVS\n{\n    int angle_DrawID;"));
 #endif
 #ifdef ANGLE_ENABLE_HLSL
     EXPECT_TRUE(foundInCode(SH_HLSL_3_0_OUTPUT, "uniform int angle_DrawID : register"));
@@ -148,7 +148,7 @@ TEST_F(EmulateGLDrawIDTest, AllowsUserDefinedANGLEDrawID)
     addOutputType(SH_GLSL_COMPATIBILITY_OUTPUT);
     addOutputType(SH_ESSL_OUTPUT);
 #ifdef ANGLE_ENABLE_VULKAN
-    addOutputType(SH_GLSL_VULKAN_OUTPUT);
+    addOutputType(SH_SPIRV_VULKAN_OUTPUT);
 #endif
 #ifdef ANGLE_ENABLE_HLSL
     addOutputType(SH_HLSL_3_0_OUTPUT);

src/tests/compiler_tests/OES_sample_variables_test.cpp

@@ -113,7 +113,7 @@ TEST_P(OESSampleVariablesTestES31, CompileFailsWithExtensionWithoutPragma)
 TEST_P(OESSampleVariablesTestES31, CompileSucceedsWithExtensionAndPragmaOnVulkan)
 {
     mResources.OES_sample_variables = 1;
-    InitializeCompiler(SH_GLSL_VULKAN_OUTPUT);
+    InitializeCompiler(SH_SPIRV_VULKAN_OUTPUT);
     EXPECT_TRUE(TestShaderCompile(OESPragma));
     // Test reset functionality.
     EXPECT_FALSE(TestShaderCompile(""));