Revert "Revert "Clean up interface to ProgramImpl::link.""

src/libANGLE/Program.cpp

@@ -312,9 +312,7 @@ Error Program::link(const gl::Data &data)
 
     linkOutputVariables();
 
-    rx::LinkResult result =
-        mProgram->link(data, mInfoLog, mData.mAttachedFragmentShader, mData.mAttachedVertexShader);
-
+    rx::LinkResult result = mProgram->link(data, mInfoLog);
     if (result.error.isError() || !result.linkSuccess)
     {
         return result.error;

src/libANGLE/renderer/ProgramImpl.h

@@ -40,11 +40,7 @@ class ProgramImpl : angle::NonCopyable
     virtual LinkResult load(gl::InfoLog &infoLog, gl::BinaryInputStream *stream) = 0;
     virtual gl::Error save(gl::BinaryOutputStream *stream) = 0;
 
-    virtual LinkResult link(const gl::Data &data,
-                            gl::InfoLog &infoLog,
-                            gl::Shader *fragmentShader,
-                            gl::Shader *vertexShader) = 0;
-
+    virtual LinkResult link(const gl::Data &data, gl::InfoLog &infoLog) = 0;
     virtual GLboolean validate(const gl::Caps &caps, gl::InfoLog *infoLog) = 0;
 
     virtual void setUniform1fv(GLint location, GLsizei count, const GLfloat *v) = 0;

src/libANGLE/renderer/d3d/ProgramD3D.cpp

@@ -1124,24 +1124,24 @@ LinkResult ProgramD3D::compileProgramExecutables(gl::InfoLog &infoLog,
     return LinkResult(linkSuccess, gl::Error(GL_NO_ERROR));
 }
 
-LinkResult ProgramD3D::link(const gl::Data &data,
-                            gl::InfoLog &infoLog,
-                            gl::Shader *fragmentShader,
-                            gl::Shader *vertexShader)
+LinkResult ProgramD3D::link(const gl::Data &data, gl::InfoLog &infoLog)
 {
-    ShaderD3D *vertexShaderD3D = GetImplAs<ShaderD3D>(vertexShader);
-    ShaderD3D *fragmentShaderD3D = GetImplAs<ShaderD3D>(fragmentShader);
+    const gl::Shader *vertexShader   = mData.getAttachedVertexShader();
+    const gl::Shader *fragmentShader = mData.getAttachedFragmentShader();
 
-    mSamplersPS.resize(data.caps->maxTextureImageUnits);
-    mSamplersVS.resize(data.caps->maxVertexTextureImageUnits);
+    const ShaderD3D *vertexShaderD3D   = GetImplAs<ShaderD3D>(vertexShader);
+    const ShaderD3D *fragmentShaderD3D = GetImplAs<ShaderD3D>(fragmentShader);
 
-    mPixelHLSL = fragmentShaderD3D->getTranslatedSource();
-    fragmentShaderD3D->generateWorkarounds(&mPixelWorkarounds);
+    mSamplersVS.resize(data.caps->maxVertexTextureImageUnits);
+    mSamplersPS.resize(data.caps->maxTextureImageUnits);
 
     mVertexHLSL = vertexShaderD3D->getTranslatedSource();
     vertexShaderD3D->generateWorkarounds(&mVertexWorkarounds);
     mShaderVersion = vertexShaderD3D->getShaderVersion();
 
+    mPixelHLSL = fragmentShaderD3D->getTranslatedSource();
+    fragmentShaderD3D->generateWorkarounds(&mPixelWorkarounds);
+
     if (mRenderer->getRendererLimitations().noFrontFacingSupport)
     {
         if (fragmentShaderD3D->usesFrontFacing())

src/libANGLE/renderer/d3d/ProgramD3D.h

@@ -70,11 +70,7 @@ class ProgramD3D : public ProgramImpl
     gl::Error getVertexExecutableForInputLayout(const gl::InputLayout &inputLayout, ShaderExecutableD3D **outExectuable, gl::InfoLog *infoLog);
     ShaderExecutableD3D *getGeometryExecutable() const { return mGeometryExecutable; }
 
-    LinkResult link(const gl::Data &data,
-                    gl::InfoLog &infoLog,
-                    gl::Shader *fragmentShader,
-                    gl::Shader *vertexShader) override;
-
+    LinkResult link(const gl::Data &data, gl::InfoLog &infoLog) override;
     GLboolean validate(const gl::Caps &caps, gl::InfoLog *infoLog) override;
 
     void initializeUniformStorage();

src/libANGLE/renderer/gl/ProgramGL.cpp

@@ -58,14 +58,14 @@ gl::Error ProgramGL::save(gl::BinaryOutputStream *stream)
     return gl::Error(GL_INVALID_OPERATION);
 }
 
-LinkResult ProgramGL::link(const gl::Data &data,
-                           gl::InfoLog &infoLog,
-                           gl::Shader *fragmentShader,
-                           gl::Shader *vertexShader)
+LinkResult ProgramGL::link(const gl::Data &data, gl::InfoLog &infoLog)
 {
     // Reset the program state, delete the current program if one exists
     reset();
 
+    const gl::Shader *vertexShader   = mData.getAttachedVertexShader();
+    const gl::Shader *fragmentShader = mData.getAttachedFragmentShader();
+
     const ShaderGL *vertexShaderGL   = GetImplAs<ShaderGL>(vertexShader);
     const ShaderGL *fragmentShaderGL = GetImplAs<ShaderGL>(fragmentShader);
 

src/libANGLE/renderer/gl/ProgramGL.h

@@ -37,11 +37,7 @@ class ProgramGL : public ProgramImpl
     LinkResult load(gl::InfoLog &infoLog, gl::BinaryInputStream *stream) override;
     gl::Error save(gl::BinaryOutputStream *stream) override;
 
-    LinkResult link(const gl::Data &data,
-                    gl::InfoLog &infoLog,
-                    gl::Shader *fragmentShader,
-                    gl::Shader *vertexShader) override;
-
+    LinkResult link(const gl::Data &data, gl::InfoLog &infoLog) override;
     GLboolean validate(const gl::Caps &caps, gl::InfoLog *infoLog) override;
 
     void setUniform1fv(GLint location, GLsizei count, const GLfloat *v) override;