Revert "Revert "Clean up interface to ProgramImpl::link.""
Should be fixed now with the fix the prior CL.
BUG=angleproject:1123
This reverts commit 63069dfc20bc34fe6962dee694953893ee6fc663.
Change-Id: Ie1826673820e3a24f9bb3e4ff5c723ac47570041
Reviewed-on: https://chromium-review.googlesource.com/297050
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/renderer/gl/ProgramGL.cpp b/src/libANGLE/renderer/gl/ProgramGL.cpp
index eb2093e..3a70ae9 100644
--- a/src/libANGLE/renderer/gl/ProgramGL.cpp
+++ b/src/libANGLE/renderer/gl/ProgramGL.cpp
@@ -58,14 +58,14 @@
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);