diff options
Diffstat (limited to 'src/3rdparty/angle/src/compiler/translator/util.cpp')
-rw-r--r-- | src/3rdparty/angle/src/compiler/translator/util.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/3rdparty/angle/src/compiler/translator/util.cpp b/src/3rdparty/angle/src/compiler/translator/util.cpp index 42a995ee6f..0131137206 100644 --- a/src/3rdparty/angle/src/compiler/translator/util.cpp +++ b/src/3rdparty/angle/src/compiler/translator/util.cpp @@ -12,7 +12,7 @@ #include "compiler/translator/SymbolTable.h" #include "common/utilities.h" -bool atof_clamp(const char *str, float *value) +bool strtof_clamp(const std::string &str, float *value) { bool success = pp::numeric_lex_float(str, value); if (!success) @@ -20,11 +20,11 @@ bool atof_clamp(const char *str, float *value) return success; } -bool atoi_clamp(const char *str, int *value) +bool atoi_clamp(const char *str, unsigned int *value) { bool success = pp::numeric_lex_int(str, value); if (!success) - *value = std::numeric_limits<int>::max(); + *value = std::numeric_limits<unsigned int>::max(); return success; } @@ -219,7 +219,6 @@ bool IsVaryingOut(TQualifier qualifier) switch (qualifier) { case EvqVaryingOut: - case EvqInvariantVaryingOut: case EvqSmoothOut: case EvqFlatOut: case EvqCentroidOut: @@ -237,7 +236,6 @@ bool IsVaryingIn(TQualifier qualifier) switch (qualifier) { case EvqVaryingIn: - case EvqInvariantVaryingIn: case EvqSmoothIn: case EvqFlatIn: case EvqCentroidIn: @@ -269,8 +267,6 @@ InterpolationType GetInterpolationType(TQualifier qualifier) case EvqFragmentIn: case EvqVaryingIn: case EvqVaryingOut: - case EvqInvariantVaryingIn: - case EvqInvariantVaryingOut: return INTERPOLATION_SMOOTH; case EvqCentroidIn: @@ -301,13 +297,13 @@ void GetVariableTraverser::setTypeSpecificInfo( ASSERT(variable); switch (type.getQualifier()) { - case EvqInvariantVaryingIn: - case EvqInvariantVaryingOut: - variable->isInvariant = true; - break; case EvqVaryingIn: case EvqVaryingOut: - if (mSymbolTable.isVaryingInvariant(std::string(name.c_str()))) + case EvqVertexOut: + case EvqSmoothOut: + case EvqFlatOut: + case EvqCentroidOut: + if (mSymbolTable.isVaryingInvariant(std::string(name.c_str())) || type.isInvariant()) { variable->isInvariant = true; } |