commit a6da33a1ebb453e34320e5e24e9e28c0583f759a
author Jamie Madill <jmadill@chromium.org> Fri Aug 30 13:21:07 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Sep 09 15:27:51 2013 -0400
tree 4da8ee4290a0f3545f279b167ad33ba42007804f
parent 139b90912c38ecf3f0c6d4e76d3595bd7463cefa

Remove the gl::Varying class, and replace all usages with sh::Varying.

TRAC #23746

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods

src/libGLESv2/Shader.cpp

diff --git a/src/libGLESv2/Shader.cpp b/src/libGLESv2/Shader.cpp
index a32c6a1..3e0c088 100644
--- a/src/libGLESv2/Shader.cpp
+++ b/src/libGLESv2/Shader.cpp
@@ -221,11 +221,7 @@
     {
         std::vector<sh::Varying> *activeVaryings;
         ShGetInfoPointer(compiler, SH_ACTIVE_VARYINGS_ARRAY, reinterpret_cast<void**>(&activeVaryings));
-
-        for (unsigned int varyingIndex = 0; varyingIndex < activeVaryings->size(); varyingIndex++)
-        {
-            mVaryings.push_back(Varying((*activeVaryings)[varyingIndex]));
-        }
+        mVaryings = *activeVaryings;
 
         mUsesMultipleRenderTargets = mHlsl.find("GL_USES_MRT")          != std::string::npos;
         mUsesFragColor             = mHlsl.find("GL_USES_FRAG_COLOR")   != std::string::npos;
@@ -414,7 +410,7 @@
 };
 
 // true if varying x has a higher priority in packing than y
-bool Shader::compareVarying(const Varying &x, const Varying &y)
+bool Shader::compareVarying(const sh::ShaderVariable &x, const sh::ShaderVariable &y)
 {
     if (x.type == y.type)
     {