Create helper for identifying builtin names

src/common/utilities.cpp

@@ -10,6 +10,7 @@
 #include "GLES3/gl3.h"
 #include "common/mathutil.h"
 #include "common/platform.h"
+#include "common/string_utils.h"
 
 #include <set>
 
@@ -920,6 +921,11 @@ std::string ParseResourceName(const std::string &name, std::vector<unsigned int>
     return name.substr(0, baseNameLength);
 }
 
+bool IsBuiltInName(const char *name)
+{
+    return angle::BeginsWith(name, "gl_");
+}
+
 std::string StripLastArrayIndex(const std::string &name)
 {
     size_t strippedNameLength = name.find_last_of('[');

src/common/utilities.h

@@ -62,6 +62,12 @@ int AllocateFirstFreeBits(unsigned int *bits, unsigned int allocationSize, unsig
 // outSubscripts.
 std::string ParseResourceName(const std::string &name, std::vector<unsigned int> *outSubscripts);
 
+bool IsBuiltInName(const char *name);
+ANGLE_INLINE bool IsBuiltInName(const std::string &name)
+{
+    return IsBuiltInName(name.c_str());
+}
+
 // Strips only the last array index from a resource name.
 std::string StripLastArrayIndex(const std::string &name);
 

src/compiler/translator/ShaderVars.cpp

@@ -333,7 +333,7 @@ const sh::ShaderVariable *ShaderVariable::findField(const std::string &fullName,
 
 bool ShaderVariable::isBuiltIn() const
 {
-    return (name.size() >= 4 && name[0] == 'g' && name[1] == 'l' && name[2] == '_');
+    return gl::IsBuiltInName(name);
 }
 
 bool ShaderVariable::isEmulatedBuiltIn() const
@@ -528,7 +528,7 @@ bool InterfaceBlock::isSameInterfaceBlockAtLinkTime(const InterfaceBlock &other)
 
 bool InterfaceBlock::isBuiltIn() const
 {
-    return (name.size() >= 4 && name[0] == 'g' && name[1] == 'l' && name[2] == '_');
+    return gl::IsBuiltInName(name);
 }
 
 void WorkGroupSize::fill(int fillValue)

src/libANGLE/FrameCapture.cpp

@@ -2819,7 +2819,7 @@ void CaptureMidExecutionSetup(const gl::Context *context,
         {
             ASSERT(attrib.location != -1);
 
-            if (angle::BeginsWith(attrib.name, "gl_"))
+            if (gl::IsBuiltInName(attrib.name))
             {
                 // Don't try to bind built-in attributes
                 continue;

src/libANGLE/renderer/glslang_wrapper_utils.cpp

@@ -636,7 +636,7 @@ void AssignVaryingLocations(const GlslangSourceOptions &options,
         programExecutable.getResources().varyingPacking.getInactiveVaryingMappedNames();
     for (const std::string &varyingName : inactiveVaryingMappedNames[shaderType])
     {
-        ASSERT(!angle::BeginsWith(varyingName, "gl_"));
+        ASSERT(!gl::IsBuiltInName(varyingName));
 
         // If name is already in the map, it will automatically have marked all other stages
         // inactive.
@@ -657,7 +657,7 @@ void AssignVaryingLocations(const GlslangSourceOptions &options,
         programExecutable.getResources().varyingPacking.getActiveOutputBuiltIns();
     for (const std::string &builtInName : activeOutputBuiltIns[shaderType])
     {
-        ASSERT(angle::BeginsWith(builtInName, "gl_"));
+        ASSERT(gl::IsBuiltInName(builtInName));
 
         ShaderInterfaceVariableInfo *info = &(*variableInfoMapOut)[shaderType][builtInName];
         info->activeStages.set(shaderType);
@@ -670,7 +670,7 @@ void AssignVaryingLocations(const GlslangSourceOptions &options,
     {
         for (const std::string &builtInName : activeOutputBuiltIns[frontShaderType])
         {
-            ASSERT(angle::BeginsWith(builtInName, "gl_"));
+            ASSERT(gl::IsBuiltInName(builtInName));
 
             ShaderInterfaceVariableInfo *info = &(*variableInfoMapOut)[shaderType][builtInName];
             info->activeStages.set(shaderType);
@@ -1922,9 +1922,9 @@ void SpirvTransformer::visitVariable(const uint32_t *instruction)
     // Handle builtins, which all start with "gl_".  Either the variable name could be an indication
     // of a builtin variable (such as with gl_FragCoord) or the type name (such as with
     // gl_PerVertex).
-    const bool isNameBuiltin = isInOut && angle::BeginsWith(name, "gl_");
+    const bool isNameBuiltin = isInOut && gl::IsBuiltInName(name);
     const bool isTypeBuiltin =
-        isInOut && mNamesById[typeId] != nullptr && angle::BeginsWith(mNamesById[typeId], "gl_");
+        isInOut && mNamesById[typeId] != nullptr && gl::IsBuiltInName(mNamesById[typeId]);
     if (isNameBuiltin || isTypeBuiltin)
     {
         // Make all builtins point to this no-op info.  Adding this entry allows us to ASSERT that
@@ -2294,7 +2294,7 @@ bool SpirvTransformer::transformTypePointer(const uint32_t *instruction, size_t
     // storage class, in case it may be necessary later.
 
     // Cannot create a Private type declaration from builtins such as gl_PerVertex.
-    if (mNamesById[typeId] != nullptr && angle::BeginsWith(mNamesById[typeId], "gl_"))
+    if (mNamesById[typeId] != nullptr && gl::IsBuiltInName(mNamesById[typeId]))
     {
         return false;
     }