Bind native GL attributes to match the locations in gl::Program.

src/libANGLE/Program.cpp

@@ -258,7 +258,6 @@ void AttributeBindings::bindAttributeLocation(GLuint index, const char *name)
 void Program::bindAttributeLocation(GLuint index, const char *name)
 {
     mAttributeBindings.bindAttributeLocation(index, name);
-    mProgram->bindAttributeLocation(index, name);
 }
 
 // Links the HLSL code of the vertex and pixel shader by matching up their varyings,

src/libANGLE/renderer/ProgramImpl.h

@@ -50,8 +50,6 @@ class ProgramImpl : angle::NonCopyable
 
     virtual GLboolean validate(const gl::Caps &caps, gl::InfoLog *infoLog) = 0;
 
-    virtual void bindAttributeLocation(GLuint index, const std::string &name) = 0;
-
     virtual void setUniform1fv(GLint location, GLsizei count, const GLfloat *v) = 0;
     virtual void setUniform2fv(GLint location, GLsizei count, const GLfloat *v) = 0;
     virtual void setUniform3fv(GLint location, GLsizei count, const GLfloat *v) = 0;

src/libANGLE/renderer/d3d/ProgramD3D.cpp

@@ -1175,10 +1175,6 @@ GLboolean ProgramD3D::validate(const gl::Caps &caps, gl::InfoLog *infoLog)
     return validateSamplers(infoLog, caps);
 }
 
-void ProgramD3D::bindAttributeLocation(GLuint index, const std::string &name)
-{
-}
-
 void ProgramD3D::initializeUniformStorage()
 {
     // Compute total default block size

src/libANGLE/renderer/d3d/ProgramD3D.h

@@ -76,8 +76,6 @@ class ProgramD3D : public ProgramImpl
 
     GLboolean validate(const gl::Caps &caps, gl::InfoLog *infoLog) override;
 
-    void bindAttributeLocation(GLuint index, const std::string &name) override;
-
     void initializeUniformStorage();
     gl::Error applyUniforms();
     gl::Error applyUniformBuffers(const gl::Data &data);

src/libANGLE/renderer/gl/ProgramGL.cpp

@@ -74,6 +74,23 @@ LinkResult ProgramGL::link(const gl::Data &data,
     mFunctions->attachShader(mProgramID, vertexShaderGL->getShaderID());
     mFunctions->attachShader(mProgramID, fragmentShaderGL->getShaderID());
 
+    // Bind attribute locations to match the GL layer.
+    for (const sh::Attribute &attribute : mData.getAttributes())
+    {
+        if (!attribute.staticUse)
+        {
+            continue;
+        }
+
+        mFunctions->bindAttribLocation(mProgramID, attribute.location, attribute.name.c_str());
+
+        int registerCount = gl::VariableRegisterCount(attribute.type);
+        for (int offset = 0; offset < registerCount; ++offset)
+        {
+            mActiveAttributesMask.set(attribute.location + offset);
+        }
+    }
+
     // Link and verify
     mFunctions->linkProgram(mProgramID);
 
@@ -169,37 +186,6 @@ LinkResult ProgramGL::link(const gl::Data &data,
         }
     }
 
-    for (const sh::Attribute &attribute : mData.getAttributes())
-    {
-        if (!attribute.staticUse)
-            continue;
-
-        GLint realLocation = mFunctions->getAttribLocation(mProgramID, attribute.name.c_str());
-
-        // Some drivers optimize attributes more aggressively.
-        if (realLocation == -1)
-        {
-            continue;
-        }
-
-        // TODO(jmadill): Fix this
-        ASSERT(attribute.location == realLocation);
-
-        int registerCount = gl::VariableRegisterCount(attribute.type);
-
-        if (static_cast<GLint>(mAttributeRealLocations.size()) <
-            attribute.location + registerCount + 1)
-        {
-            mAttributeRealLocations.resize(attribute.location + registerCount + 1, -1);
-        }
-
-        for (int offset = 0; offset < registerCount; ++offset)
-        {
-            mActiveAttributesMask.set(attribute.location + offset);
-            mAttributeRealLocations[attribute.location + offset] = realLocation + offset;
-        }
-    }
-
     return LinkResult(true, gl::Error(GL_NO_ERROR));
 }
 
@@ -209,11 +195,6 @@ GLboolean ProgramGL::validate(const gl::Caps & /*caps*/, gl::InfoLog * /*infoLog
     return true;
 }
 
-void ProgramGL::bindAttributeLocation(GLuint index, const std::string &name)
-{
-    mFunctions->bindAttribLocation(mProgramID, index, name.c_str());
-}
-
 void ProgramGL::setUniform1fv(GLint location, GLsizei count, const GLfloat *v)
 {
     mStateManager->useProgram(mProgramID);
@@ -378,7 +359,6 @@ void ProgramGL::reset()
     mSamplerUniformMap.clear();
     mSamplerBindings.clear();
     mActiveAttributesMask.reset();
-    mAttributeRealLocations.clear();
 }
 
 GLuint ProgramGL::getProgramID() const

src/libANGLE/renderer/gl/ProgramGL.h

@@ -45,8 +45,6 @@ class ProgramGL : public ProgramImpl
 
     GLboolean validate(const gl::Caps &caps, gl::InfoLog *infoLog) override;
 
-    void bindAttributeLocation(GLuint index, const std::string &name) override;
-
     void setUniform1fv(GLint location, GLsizei count, const GLfloat *v) override;
     void setUniform2fv(GLint location, GLsizei count, const GLfloat *v) override;
     void setUniform3fv(GLint location, GLsizei count, const GLfloat *v) override;
@@ -101,9 +99,6 @@ class ProgramGL : public ProgramImpl
     // An array of the samplers that are used by the program
     std::vector<SamplerBindingGL> mSamplerBindings;
 
-    // Map from GL-layer attribute location to native location.
-    std::vector<GLint> mAttributeRealLocations;
-
     // Array of attribute locations used by this program
     gl::AttributesMask mActiveAttributesMask;