commit 31c8c56a0f327469a6e3ee24c10e98424913e9b8
author Jamie Madill <jmadill@chromium.org> Wed Aug 19 14:08:03 2015 -0400
committer Jamie Madill <jmadill@chromium.org> Wed Aug 19 18:28:07 2015 +0000
tree 8b36b5bef9a5f778956584870eda66765e44630d
parent 18fdcbcf1d02d3b3b4b5c712f05058f2e8d629c6

Make ProgramImpl::compileProgramExecutables D3D-only.

Finally we can isolate this method into the D3D-only code, and
remove the interface from ProgramImpl.

BUG=angleproject:1123

Change-Id: I253b15d44d4cf8bbb5dbeaa78bbcc431a5267bf7
Reviewed-on: https://chromium-review.googlesource.com/293765
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Geoff Lang <geofflang@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 f470818..77ddc06 100644
--- a/src/libANGLE/Program.cpp
+++ b/src/libANGLE/Program.cpp
@@ -311,22 +311,11 @@
         return Error(GL_NO_ERROR);
     }
 
-    int registers;
-    rx::LinkResult result =
-        mProgram->link(data, mInfoLog, mData.mAttachedFragmentShader, mData.mAttachedVertexShader,
-                       &registers, &mOutputVariables);
-    if (result.error.isError() || !result.linkSuccess)
-    {
-        return result.error;
-    }
+    rx::LinkResult result = mProgram->link(data, mInfoLog, mData.mAttachedFragmentShader,
+                                           mData.mAttachedVertexShader, &mOutputVariables);
 
-    // TODO: The concept of "executables" is D3D only, and as such this belongs in ProgramD3D. It must be called,
-    // however, last in this function, so it can't simply be moved to ProgramD3D::link without further shuffling.
-    result = mProgram->compileProgramExecutables(mInfoLog, registers);
     if (result.error.isError() || !result.linkSuccess)
     {
-        mInfoLog << "Failed to create D3D shaders.";
-        unlink(false);
         return result.error;
     }