commit 3d40488b6a769aac6ac19f6540d1866e5fb276da
author Jiawei Shao <jiawei.shao@intel.com> Mon Oct 16 13:30:48 2017 +0800
committer Commit Bot <commit-bot@chromium.org> Wed Oct 25 14:44:01 2017 +0000
tree 7029ffad1db59f2d5a4e0f837fedf32202ab9966
parent d4556dfc355a06b73d3ad64f2fea03f5aa0b1693

Split varyings into input and output varyings in renderer

This patch intends to split all vector<Varying> into two vectors
to store input and output varyings separately in the renderer.

This patch is a base of supporting program linking with geometry
shader. Unlike the vertex shaders (their outputs are varyings)
and fragment shaders (their inputs are varyings), the inputs and
outputs of geometry shaders are all varyings, so we need two
vector<Varying> to store them correctly.

BUG=angleproject:1941
TEST=angle_end2end_tests

Change-Id: Ic4b8343f2fc3df87b764c45f2ea7810e565f7bee
Reviewed-on: https://chromium-review.googlesource.com/720617
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/libANGLE/Shader.cpp

diff --git a/src/libANGLE/Shader.cpp b/src/libANGLE/Shader.cpp
index e063396..c3232ce 100644
--- a/src/libANGLE/Shader.cpp
+++ b/src/libANGLE/Shader.cpp
@@ -268,7 +268,8 @@
     mState.mTranslatedSource.clear();
     mInfoLog.clear();
     mState.mShaderVersion = 100;
-    mState.mVaryings.clear();
+    mState.mInputVaryings.clear();
+    mState.mOutputVaryings.clear();
     mState.mUniforms.clear();
     mState.mUniformBlocks.clear();
     mState.mShaderStorageBlocks.clear();
@@ -360,7 +361,6 @@
     // Gather the shader information
     mState.mShaderVersion = sh::GetShaderVersion(compilerHandle);
 
-    mState.mVaryings        = GetShaderVariables(sh::GetVaryings(compilerHandle));
     mState.mUniforms        = GetShaderVariables(sh::GetUniforms(compilerHandle));
     mState.mUniformBlocks       = GetShaderVariables(sh::GetUniformBlocks(compilerHandle));
     mState.mShaderStorageBlocks = GetShaderVariables(sh::GetShaderStorageBlocks(compilerHandle));
@@ -375,6 +375,7 @@
         case GL_VERTEX_SHADER:
         {
             {
+                mState.mOutputVaryings = GetShaderVariables(sh::GetOutputVaryings(compilerHandle));
                 mState.mActiveAttributes =
                     GetActiveShaderVariables(sh::GetAttributes(compilerHandle));
                 mState.mNumViews = sh::GetVertexShaderNumViews(compilerHandle);
@@ -383,8 +384,9 @@
         }
         case GL_FRAGMENT_SHADER:
         {
+            mState.mInputVaryings = GetShaderVariables(sh::GetInputVaryings(compilerHandle));
             // TODO(jmadill): Figure out why we only sort in the FS, and if we need to.
-            std::sort(mState.mVaryings.begin(), mState.mVaryings.end(), CompareShaderVar);
+            std::sort(mState.mInputVaryings.begin(), mState.mInputVaryings.end(), CompareShaderVar);
             mState.mActiveOutputVariables =
                 GetActiveShaderVariables(sh::GetOutputVariables(compilerHandle));
             break;
@@ -441,10 +443,16 @@
     return mState.mShaderVersion;
 }
 
-const std::vector<sh::Varying> &Shader::getVaryings(const Context *context)
+const std::vector<sh::Varying> &Shader::getInputVaryings(const Context *context)
 {
     resolveCompile(context);
-    return mState.getVaryings();
+    return mState.getInputVaryings();
+}
+
+const std::vector<sh::Varying> &Shader::getOutputVaryings(const Context *context)
+{
+    resolveCompile(context);
+    return mState.getOutputVaryings();
 }
 
 const std::vector<sh::Uniform> &Shader::getUniforms(const Context *context)
@@ -480,7 +488,9 @@
 std::string Shader::getTransformFeedbackVaryingMappedName(const std::string &tfVaryingName,
                                                           const Context *context)
 {
-    const auto &varyings = getVaryings(context);
+    // TODO(jiawei.shao@intel.com): support transform feedback on geometry shader.
+    ASSERT(mState.getShaderType() == GL_VERTEX_SHADER);
+    const auto &varyings = getOutputVaryings(context);
     auto bracketPos      = tfVaryingName.find("[");
     if (bracketPos != std::string::npos)
     {