Revert "GL_ext_vulkan_glsl_relaxed extension support, and cross stage aware IO mapper"

glslang/Include/Types.h

@@ -501,7 +501,6 @@ public:
         noContraction = false;
         nullInit = false;
 #endif
-        defaultBlock = false;
     }
 
     // drop qualifiers that don't belong in a temporary variable
@@ -515,7 +514,6 @@ public:
         specConstant = false;
         nonUniform = false;
         nullInit = false;
-        defaultBlock = false;
         clearLayout();
     }
 
@@ -574,7 +572,6 @@ public:
     bool specConstant : 1;
     bool nonUniform   : 1;
     bool explicitOffset   : 1;
-    bool defaultBlock : 1; // default blocks with matching names have structures merged when linking
 
 #ifdef GLSLANG_WEB
     bool isWriteOnly() const { return false; }
@@ -759,46 +756,6 @@ public:
         }
     }
 
-    TBlockStorageClass getBlockStorage() const {
-        if (storage == EvqUniform && !isPushConstant()) {
-            return EbsUniform;
-        }
-        else if (storage == EvqUniform) {
-            return EbsPushConstant;
-        }
-        else if (storage == EvqBuffer) {
-            return EbsStorageBuffer;
-        }
-        return EbsNone;
-    }
-
-    void setBlockStorage(TBlockStorageClass newBacking) {
-#ifndef GLSLANG_WEB
-        layoutPushConstant = (newBacking == EbsPushConstant);
-#endif
-        switch (newBacking) {
-        case EbsUniform :
-            if (layoutPacking == ElpStd430) {
-                // std430 would not be valid
-                layoutPacking = ElpStd140;
-            }
-            storage = EvqUniform;
-            break;
-        case EbsStorageBuffer : 
-            storage = EvqBuffer;
-            break;
-#ifndef GLSLANG_WEB
-        case EbsPushConstant :
-            storage = EvqUniform;
-            layoutSet = TQualifier::layoutSetEnd;
-            layoutBinding = TQualifier::layoutBindingEnd;
-            break;
-#endif
-        default:
-            break;
-        }
-    }
-
 #ifdef GLSLANG_WEB
     bool isPerView() const { return false; }
     bool isTaskMemory() const { return false; }
@@ -895,7 +852,6 @@ public:
         return hasNonXfbLayout() ||
                hasXfb();
     }
-
     TLayoutMatrix  layoutMatrix  : 3;
     TLayoutPacking layoutPacking : 4;
     int layoutOffset;

glslang/Include/intermediate.h

@@ -593,7 +593,6 @@ enum TOperator {
     EOpTime,
 
     EOpAtomicAdd,
-    EOpAtomicSubtract,
     EOpAtomicMin,
     EOpAtomicMax,
     EOpAtomicAnd,
@@ -1136,8 +1135,6 @@ public:
     virtual TBasicType getBasicType() const { return type.getBasicType(); }
     virtual TQualifier& getQualifier() { return type.getQualifier(); }
     virtual const TQualifier& getQualifier() const { return type.getQualifier(); }
-    virtual TArraySizes* getArraySizes() { return type.getArraySizes(); }
-    virtual const TArraySizes* getArraySizes() const { return type.getArraySizes(); }
     virtual void propagatePrecision(TPrecisionQualifier);
     virtual int getVectorSize() const { return type.getVectorSize(); }
     virtual int getMatrixCols() const { return type.getMatrixCols(); }