Revert "Merge pull request #2330 from ShabbyX/optimize_for_angle"

This reverts commit 1ee5d1c0bb, reversing
changes made to 906d48a7e8.

glslang/MachineIndependent/localintermediate.h

@@ -241,10 +241,7 @@ class TIntermediate {
 public:
     explicit TIntermediate(EShLanguage l, int v = 0, EProfile p = ENoProfile) :
         language(l),
-#ifndef GLSLANG_ANGLE
-        profile(p), version(v),
-#endif
-        treeRoot(0),
+        profile(p), version(v), treeRoot(0),
         numEntryPoints(0), numErrors(0), numPushConstants(0), recursive(false),
         invertY(false),
         useStorageBuffer(false),
@@ -298,20 +295,9 @@ public:
 #endif
     }
 
-    void setVersion(int v)
-    {
-#ifndef GLSLANG_ANGLE
-        version = v;
-#endif
-    }
-    void setProfile(EProfile p)
-    {
-#ifndef GLSLANG_ANGLE
-        profile = p;
-#endif
-    }
-
+    void setVersion(int v) { version = v; }
     int getVersion() const { return version; }
+    void setProfile(EProfile p) { profile = p; }
     EProfile getProfile() const { return profile; }
     void setSpv(const SpvVersion& s)
     {
@@ -943,13 +929,8 @@ protected:
     typedef std::list<TCall> TGraph;
     TGraph callGraph;
 
-#ifdef GLSLANG_ANGLE
-    const EProfile profile = ECoreProfile;
-    const int version = 450;
-#else
     EProfile profile;                           // source profile
     int version;                                // source version
-#endif
     SpvVersion spvVersion;
     TIntermNode* treeRoot;
     std::map<std::string, TExtensionBehavior> requestedExtensions;  // cumulation of all enabled or required extensions; not connected to what subset of the shader used them