You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
71 lines
3.4 KiB
71 lines
3.4 KiB
7 years ago
|
diff -up chromium-64.0.3282.119/third_party/angle/src/compiler/translator/StaticType.h.gcc-constexpr chromium-64.0.3282.119/third_party/angle/src/compiler/translator/StaticType.h
|
||
|
|
--- chromium-64.0.3282.119/third_party/angle/src/compiler/translator/StaticType.h.gcc-constexpr 2018-01-25 15:50:16.971171007 -0500
|
||
|
|
+++ chromium-64.0.3282.119/third_party/angle/src/compiler/translator/StaticType.h 2018-01-25 15:51:14.158053914 -0500
|
||
|
|
@@ -160,7 +160,7 @@ template <TBasicType basicType,
|
||
|
|
TPrecision precision,
|
||
|
|
TQualifier qualifier,
|
||
|
|
unsigned char secondarySize>
|
||
|
|
-const TType *GetForVecMatHelper(unsigned char primarySize)
|
||
|
|
+constexpr const TType *GetForVecMatHelper(unsigned char primarySize)
|
||
|
|
{
|
||
|
|
static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
|
||
|
|
basicType == EbtBool,
|
||
|
|
@@ -186,7 +186,7 @@ const TType *GetForVecMatHelper(unsigned
|
||
|
|
template <TBasicType basicType,
|
||
|
|
TPrecision precision = EbpUndefined,
|
||
|
|
TQualifier qualifier = EvqGlobal>
|
||
|
|
-const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
|
||
|
|
+constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
|
||
|
|
{
|
||
|
|
static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
|
||
|
|
basicType == EbtBool,
|
||
|
|
@@ -208,7 +208,7 @@ const TType *GetForVecMat(unsigned char
|
||
|
|
}
|
||
|
|
|
||
|
|
template <TBasicType basicType, TPrecision precision = EbpUndefined>
|
||
|
|
-const TType *GetForVec(TQualifier qualifier, unsigned char size)
|
||
|
|
+constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size)
|
||
|
|
{
|
||
|
|
switch (qualifier)
|
||
|
|
{
|
||
|
|
diff -up chromium-64.0.3282.119/third_party/angle/src/compiler/translator/SymbolTable.cpp.gcc-constexpr chromium-64.0.3282.119/third_party/angle/src/compiler/translator/SymbolTable.cpp
|
||
|
|
--- chromium-64.0.3282.119/third_party/angle/src/compiler/translator/SymbolTable.cpp.gcc-constexpr 2018-01-25 15:51:27.670790008 -0500
|
||
|
|
+++ chromium-64.0.3282.119/third_party/angle/src/compiler/translator/SymbolTable.cpp 2018-01-25 15:52:04.117077652 -0500
|
||
|
|
@@ -189,7 +189,7 @@ TSymbolTable::~TSymbolTable()
|
||
|
|
pop();
|
||
|
|
}
|
||
|
|
|
||
|
|
-bool IsGenType(const TType *type)
|
||
|
|
+constexpr bool IsGenType(const TType *type)
|
||
|
|
{
|
||
|
|
if (type)
|
||
|
|
{
|
||
|
|
@@ -201,7 +201,7 @@ bool IsGenType(const TType *type)
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
|
||
|
|
-bool IsVecType(const TType *type)
|
||
|
|
+constexpr bool IsVecType(const TType *type)
|
||
|
|
{
|
||
|
|
if (type)
|
||
|
|
{
|
||
|
|
diff -up chromium-64.0.3282.119/third_party/angle/src/compiler/translator/Types.h.gcc-constexpr chromium-64.0.3282.119/third_party/angle/src/compiler/translator/Types.h
|
||
|
|
--- chromium-64.0.3282.119/third_party/angle/src/compiler/translator/Types.h.gcc-constexpr 2018-01-25 15:52:15.042864767 -0500
|
||
|
|
+++ chromium-64.0.3282.119/third_party/angle/src/compiler/translator/Types.h 2018-01-25 15:52:56.763049389 -0500
|
||
|
|
@@ -236,13 +236,13 @@ class TType
|
||
|
|
{
|
||
|
|
}
|
||
|
|
|
||
|
|
- TBasicType getBasicType() const { return type; }
|
||
|
|
+ constexpr TBasicType getBasicType() const { return type; }
|
||
|
|
void setBasicType(TBasicType t);
|
||
|
|
|
||
|
|
TPrecision getPrecision() const { return precision; }
|
||
|
|
void setPrecision(TPrecision p) { precision = p; }
|
||
|
|
|
||
|
|
- TQualifier getQualifier() const { return qualifier; }
|
||
|
|
+ constexpr TQualifier getQualifier() const { return qualifier; }
|
||
|
|
void setQualifier(TQualifier q) { qualifier = q; }
|
||
|
|
|
||
|
|
bool isInvariant() const { return invariant; }
|