commit ce79dda155d3c22fb1527ac4150a8671d81f9f5f
author Jamie Madill <jmadill@chromium.org> Fri Aug 30 13:21:06 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Sep 09 15:27:50 2013 -0400
tree 44615aa47deb21a41cfb68e34941299fe8ac7b84
parent 1cb333ebfc645930995845a64958ba6963d15aa2

Change the varyings list type from a linked list to a vector type.

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 eb39e22..b9d4a78 100644
--- a/src/libGLESv2/Shader.cpp
+++ b/src/libGLESv2/Shader.cpp
@@ -241,10 +241,11 @@
 
 void Shader::resetVaryingsRegisterAssignment()
 {
-    for (VaryingList::iterator var = mVaryings.begin(); var != mVaryings.end(); var++)
+    for (unsigned int varyingIndex = 0; varyingIndex < mVaryings.size(); varyingIndex++)
     {
-        var->reg = -1;
-        var->col = -1;
+        Varying *varying = &mVaryings[varyingIndex];
+        varying->reg = -1;
+        varying->col = -1;
     }
 }
 
@@ -525,7 +526,7 @@
 
     compileToHLSL(mFragmentCompiler);
     parseVaryings(mFragmentCompiler);
-    mVaryings.sort(compareVarying);
+    std::sort(mVaryings.begin(), mVaryings.end(), compareVarying);
 
     const std::string &hlsl = getHLSL();
     if (!hlsl.empty())