Vulkan: Don't emit spec const declaration in compute shaders

src/compiler/translator/TranslatorMetal.cpp

@@ -185,7 +185,7 @@ bool TranslatorMetal::translate(TIntermBlock *root,
                                  getNameMap(), &getSymbolTable(), getShaderType(),
                                  getShaderVersion(), getOutputType(), false, true, compileOptions);
 
-    SpecConstMetal specConst(&getSymbolTable(), compileOptions);
+    SpecConstMetal specConst(&getSymbolTable(), compileOptions, getShaderType());
     DriverUniformMetal driverUniforms;
     if (!TranslatorVulkan::translateImpl(root, compileOptions, perfDiagnostics, &specConst,
                                          &driverUniforms, &outputGLSL))

src/compiler/translator/TranslatorMetal.h

@@ -27,8 +27,8 @@ namespace sh
 class SpecConstMetal : public SpecConst
 {
   public:
-    SpecConstMetal(TSymbolTable *symbolTable, ShCompileOptions compileOptions)
-        : SpecConst(symbolTable, compileOptions)
+    SpecConstMetal(TSymbolTable *symbolTable, ShCompileOptions compileOptions, GLenum shaderType)
+        : SpecConst(symbolTable, compileOptions, shaderType)
     {}
     ~SpecConstMetal() override {}
 

src/compiler/translator/TranslatorVulkan.cpp

@@ -1222,7 +1222,7 @@ bool TranslatorVulkan::translate(TIntermBlock *root,
                                  getShaderVersion(), getOutputType(), precisionEmulation,
                                  enablePrecision, compileOptions);
 
-    SpecConst specConst(&getSymbolTable(), compileOptions);
+    SpecConst specConst(&getSymbolTable(), compileOptions, getShaderType());
 
     if ((compileOptions & SH_USE_SPECIALIZATION_CONSTANT) != 0)
     {

src/compiler/translator/tree_util/SpecializationConstant.cpp

@@ -223,9 +223,14 @@ TIntermTyped *CreateFloatArrayWithRotationIndex(const Vec2EnumMap &valuesEnumMap
 }
 }  // anonymous namespace
 
-SpecConst::SpecConst(TSymbolTable *symbolTable, ShCompileOptions compileOptions)
+SpecConst::SpecConst(TSymbolTable *symbolTable, ShCompileOptions compileOptions, GLenum shaderType)
     : mSymbolTable(symbolTable), mCompileOptions(compileOptions)
 {
+    if (shaderType == GL_FRAGMENT_SHADER || shaderType == GL_COMPUTE_SHADER)
+    {
+        return;
+    }
+
     // Mark SpecConstUsage::Rotation unconditionally.  gl_Position is always rotated.
     if ((mCompileOptions & SH_USE_SPECIALIZATION_CONSTANT) != 0 &&
         (mCompileOptions & SH_ADD_PRE_ROTATION) != 0)

src/compiler/translator/tree_util/SpecializationConstant.h

@@ -23,7 +23,7 @@ namespace sh
 class SpecConst
 {
   public:
-    SpecConst(TSymbolTable *symbolTable, ShCompileOptions compileOptions);
+    SpecConst(TSymbolTable *symbolTable, ShCompileOptions compileOptions, GLenum shaderType);
     virtual ~SpecConst();
 
     // Line rasterizaton emulation