commit 139b90912c38ecf3f0c6d4e76d3595bd7463cefa
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 c33a724759a6f68cb8d71f71a48934d3e2f3f9c8
parent ce79dda155d3c22fb1527ac4150a8671d81f9f5f

Simplify the gl::Varying struct to be more like sh::Varying.

The subsequent patches will remove gl::Varying entirely.

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 b9d4a78..a32c6a1 100644
--- a/src/libGLESv2/Shader.cpp
+++ b/src/libGLESv2/Shader.cpp
@@ -219,7 +219,7 @@
 {
     if (!mHlsl.empty())
     {
-        std::vector<sh::ShaderVariable> *activeVaryings;
+        std::vector<sh::Varying> *activeVaryings;
         ShGetInfoPointer(compiler, SH_ACTIVE_VARYINGS_ARRAY, reinterpret_cast<void**>(&activeVaryings));
 
         for (unsigned int varyingIndex = 0; varyingIndex < activeVaryings->size(); varyingIndex++)
@@ -243,9 +243,7 @@
 {
     for (unsigned int varyingIndex = 0; varyingIndex < mVaryings.size(); varyingIndex++)
     {
-        Varying *varying = &mVaryings[varyingIndex];
-        varying->reg = -1;
-        varying->col = -1;
+        mVaryings[varyingIndex].resetRegisterAssignment();
     }
 }
 
@@ -420,7 +418,7 @@
 {
     if (x.type == y.type)
     {
-        return x.size > y.size;
+        return x.arraySize > y.arraySize;
     }
 
     unsigned int xPriority = GL_INVALID_INDEX;