(glslang) Cleanups

Author: LibretroAdmin

deps/glslang/glslang/SPIRV/GlslangToSpv.cpp

@@ -305,7 +305,7 @@ static spv::Dim TranslateDimensionality(const glslang::TSampler& sampler)
 static spv::Decoration TranslatePrecisionDecoration(glslang::TPrecisionQualifier glslangPrecision)
 {
     switch (glslangPrecision) {
-    case glslang::EpqLow:    return spv::DecorationRelaxedPrecision;
+    case glslang::EpqLow:
     case glslang::EpqMedium: return spv::DecorationRelaxedPrecision;
     default: break;
     }
@@ -321,11 +321,14 @@ static spv::Decoration TranslatePrecisionDecoration(const glslang::TType& type)
 // Translate glslang type to SPIR-V block decorations.
 static spv::Decoration TranslateBlockDecoration(const glslang::TType& type, bool useStorageBuffer)
 {
-    if (type.getBasicType() == glslang::EbtBlock) {
+    if (type.getBasicType() == glslang::EbtBlock)
+    {
         switch (type.getQualifier().storage) {
-        case glslang::EvqUniform:      return spv::DecorationBlock;
-        case glslang::EvqBuffer:       return useStorageBuffer ? spv::DecorationBlock : spv::DecorationBufferBlock;
-        case glslang::EvqVaryingIn:    return spv::DecorationBlock;
+        case glslang::EvqBuffer:
+		if (!useStorageBuffer) return spv::DecorationBufferBlock;
+		/* fallthrough */
+        case glslang::EvqUniform:
+        case glslang::EvqVaryingIn:
         case glslang::EvqVaryingOut:   return spv::DecorationBlock;
         default:
             break;
@@ -355,37 +358,41 @@ void TranslateMemoryDecoration(const glslang::TQualifier& qualifier, std::vector
 // Translate glslang type to SPIR-V layout decorations.
 spv::Decoration TranslateLayoutDecoration(const glslang::TType& type, glslang::TLayoutMatrix matrixLayout)
 {
-    if (type.isMatrix()) {
+    if (type.isMatrix())
+    {
         switch (matrixLayout) {
         case glslang::ElmRowMajor:
             return spv::DecorationRowMajor;
         case glslang::ElmColumnMajor:
             return spv::DecorationColMajor;
         default:
             // opaque layouts don't need a majorness
-            return spv::DecorationMax;
+	    break;
         }
-    } else {
+    }
+    else
+    {
         switch (type.getBasicType()) {
         default:
-            return spv::DecorationMax;
+            break;
         case glslang::EbtBlock:
             switch (type.getQualifier().storage) {
             case glslang::EvqUniform:
             case glslang::EvqBuffer:
                 switch (type.getQualifier().layoutPacking) {
                 case glslang::ElpShared:  return spv::DecorationGLSLShared;
                 case glslang::ElpPacked:  return spv::DecorationGLSLPacked;
-                default:
-                    return spv::DecorationMax;
+                default: break;
                 }
+		break;
             case glslang::EvqVaryingIn:
             case glslang::EvqVaryingOut:
             default:
-                return spv::DecorationMax;
+		break;
             }
         }
     }
+    return spv::DecorationMax;
 }
 
 // Translate glslang type to SPIR-V interpolation decorations.
@@ -419,11 +426,12 @@ spv::Decoration TGlslangToSpvTraverser::TranslateAuxiliaryStorageDecoration(cons
         return spv::DecorationPatch;
     else if (qualifier.centroid)
         return spv::DecorationCentroid;
-    else if (qualifier.sample) {
+    else if (qualifier.sample)
+    {
         builder.addCapability(spv::CapabilitySampleRateShading);
         return spv::DecorationSample;
-    } else
-        return spv::DecorationMax;
+    }
+    return spv::DecorationMax;
 }
 
 // If glslang type is invariant, return SPIR-V invariant decoration.