Do not send attribute data for built-ins

src/libANGLE/Program.cpp

@@ -3655,7 +3655,7 @@ bool Program::linkAtomicCounterBuffers()
     return true;
 }
 
-// Assigns locations to all attributes from the bindings and program locations.
+// Assigns locations to all attributes (except built-ins) from the bindings and program locations.
 bool Program::linkAttributes(const Context *context, InfoLog &infoLog)
 {
     const Caps &caps               = context->getCaps();
@@ -3791,21 +3791,23 @@ bool Program::linkAttributes(const Context *context, InfoLog &infoLog)
         ASSERT(attribute.location != -1);
         unsigned int regs = static_cast<unsigned int>(VariableRegisterCount(attribute.type));
 
+        unsigned int location = static_cast<unsigned int>(attribute.location);
         for (unsigned int r = 0; r < regs; r++)
         {
-            unsigned int location = static_cast<unsigned int>(attribute.location) + r;
-            mState.mActiveAttribLocationsMask.set(location);
-            mState.mMaxActiveAttribLocation =
-                std::max(mState.mMaxActiveAttribLocation, location + 1);
-
-            // gl_VertexID and gl_InstanceID are active attributes but don't have a bound attribute.
+            // Built-in active program inputs don't have a bound attribute.
             if (!attribute.isBuiltIn())
             {
+                mState.mActiveAttribLocationsMask.set(location);
+                mState.mMaxActiveAttribLocation =
+                    std::max(mState.mMaxActiveAttribLocation, location + 1);
+
                 ComponentType componentType =
                     GLenumToComponentType(VariableComponentType(attribute.type));
 
                 SetComponentTypeMask(componentType, location, &mState.mAttributesTypeMask);
                 mState.mAttributesMask.set(location);
+
+                location++;
             }
         }
     }

src/libANGLE/renderer/d3d/DynamicHLSL.cpp

@@ -194,8 +194,6 @@ std::string DynamicHLSL::generateVertexShaderForInputLayout(
             }
             else
             {
-                GLenum componentType = mRenderer->getVertexComponentType(vertexFormatID);
-
                 if (shaderAttribute.name == "gl_InstanceID" ||
                     shaderAttribute.name == "gl_VertexID")
                 {
@@ -205,6 +203,8 @@ std::string DynamicHLSL::generateVertexShaderForInputLayout(
                 }
                 else
                 {
+                    GLenum componentType = mRenderer->getVertexComponentType(vertexFormatID);
+
                     structStream << "    ";
                     HLSLComponentTypeString(structStream, componentType,
                                             VariableComponentCount(shaderAttribute.type));

src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt

@@ -123,8 +123,6 @@
 3520 VULKAN ANDROID : KHR-GLES31.core.shader_storage_buffer_object.advanced-unsizedArrayLength* = SKIP
 
 // OpenGL ES 3.1 conformance failures
-4107 SWIFTSHADER : KHR-GLES31.core.shader_storage_buffer_object.advanced-switchBuffers-vs = FAIL
-
 4106 SWIFTSHADER : KHR-GLES31.core.layout_binding.sampler*_layout_binding_texture_* = FAIL
 
 4108 SWIFTSHADER : KHR-GLES31.core.shader_image_size.*-nonMS-* = SKIP