commit f5f4ad24121df4fb21e5411736b80a93c36c550d
author Jamie Madill <jmadill@chromium.org> Wed Sep 02 18:32:38 2015 +0000
committer Jamie Madill <jmadill@chromium.org> Wed Sep 02 18:33:06 2015 +0000
tree 4297a4751082654d03a0b8c56e4f8acdfb664e97
parent ca03b35c19c97ca19875f2de79f9a757c15e2035

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>

src/libANGLE/Program.cpp

diff --git a/src/libANGLE/Program.cpp b/src/libANGLE/Program.cpp
index 060bfd6..40ec835 100644
--- a/src/libANGLE/Program.cpp
+++ b/src/libANGLE/Program.cpp
@@ -312,9 +312,7 @@
 
     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;