Fix program interface queries for arrays and built-ins

src/common/utilities.cpp

@@ -947,6 +947,13 @@ unsigned int ParseArrayIndex(const std::string &name, size_t *nameLengthWithoutA
                 indexIsValidDecimalNumber = false;
                 break;
             }
+
+            // Leading zeroes are invalid
+            if ((i == (open + 1)) && (name[i] == '0') && (name[i + 1] != ']'))
+            {
+                indexIsValidDecimalNumber = false;
+                break;
+            }
         }
         if (indexIsValidDecimalNumber)
         {

src/libANGLE/Program.cpp

@@ -2176,6 +2176,11 @@ GLuint Program::getOutputResourceMaxNameSize() const
 
 GLuint Program::getResourceLocation(const GLchar *name, const sh::ShaderVariable &variable) const
 {
+    if (variable.isBuiltIn())
+    {
+        return GL_INVALID_INDEX;
+    }
+
     GLint location = variable.location;
     if (variable.isArray())
     {

src/libANGLE/queryutils.cpp

@@ -676,7 +676,7 @@ GLint GetInputResourceProperty(const Program *program, GLuint index, GLenum prop
             return clampCast<GLint>(program->getInputResourceName(index).size() + 1u);
 
         case GL_LOCATION:
-            return variable.location;
+            return variable.isBuiltIn() ? GL_INVALID_INDEX : variable.location;
 
         // The query is targeted at the set of active input variables used by the first shader stage
         // of program. If program contains multiple shader stages then input variables from any

src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt

@@ -39,9 +39,6 @@
 // Separate shader objects:
 3570 VULKAN : KHR-GLES31.core.sepshaderobjs.StateInteraction = SKIP
 
-// Program interface query.
-3596 VULKAN : KHR-GLES31.core.program_interface_query.* = FAIL
-
 // Image related failures
 
 4315 VULKAN : KHR-GLES31.core.shader_image_load_store.advanced-memory-order-vsfs = FAIL