Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 5 insertions, 8 deletions

diff --git a/gfx/angle/src/compiler/translator/util.h b/gfx/angle/src/compiler/translator/util.h
index bfad5fb4c..4e577b111 100755
--- a/gfx/angle/src/compiler/translator/util.h
+++ b/gfx/angle/src/compiler/translator/util.h
@@ -25,9 +25,10 @@ bool strtof_clamp(const std::string &str, float *value);
 // Return false if overflow happens.
 bool atoi_clamp(const char *str, unsigned int *value);
 
+class TSymbolTable;
+
 namespace sh
 {
-class TSymbolTable;
 
 GLenum GLVariableType(const TType &type);
 GLenum GLVariablePrecision(const TType &type);
@@ -36,8 +37,8 @@ bool IsVaryingOut(TQualifier qualifier);
 bool IsVarying(TQualifier qualifier);
 InterpolationType GetInterpolationType(TQualifier qualifier);
 TString ArrayString(const TType &type);
-
-TType GetShaderVariableBasicType(const sh::ShaderVariable &var);
+// Handles only basic output variable types.
+TType ConvertShaderVariableTypeToTType(sh::GLenum type);
 
 TOperator TypeToConstructorOperator(const TType &type);
 
@@ -64,10 +65,6 @@ class GetVariableTraverser : angle::NonCopyable
     const TSymbolTable &mSymbolTable;
 };
 
-bool IsBuiltinOutputVariable(TQualifier qualifier);
-bool IsBuiltinFragmentInputVariable(TQualifier qualifier);
-bool CanBeInvariantESSL1(TQualifier qualifier);
-bool CanBeInvariantESSL3OrGreater(TQualifier qualifier);
-}  // namespace sh
+}
 
 #endif // COMPILER_TRANSLATOR_UTIL_H_