commit e58e1416a5fa2f66173917a9cbcb21b252060d76
author Corentin Wallez <cwallez@chromium.org> Mon Jul 18 16:40:46 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Jul 19 15:22:21 2016 +0000
tree c710819502f769e47b16e1f45bd4b2c3f5eee6cb
parent 7f539ea52e6bc493d8e025ed2c43e10f606f088b

ShCheckVariablesWithinPackingLimits add sh::ShaderVariable overload

This overload doesn't take a stripped down version of the variable
information, which makes it possible to handle varying structs
correctly by flattening them as individual variables.

BUG=621031

Change-Id: I367629fce3d17dd7e1f876c5937eb37f3d97c7f4
Reviewed-on: https://chromium-review.googlesource.com/361460
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/compiler/translator/ShaderLang.cpp

diff --git a/src/compiler/translator/ShaderLang.cpp b/src/compiler/translator/ShaderLang.cpp
index e4f27fb..79d30b7 100644
--- a/src/compiler/translator/ShaderLang.cpp
+++ b/src/compiler/translator/ShaderLang.cpp
@@ -339,6 +339,11 @@
         sh::ShaderVariable var(varInfoArray[ii].type, varInfoArray[ii].size);
         variables.push_back(var);
     }
+    return ShCheckVariablesWithinPackingLimits(maxVectors, variables);
+}
+bool ShCheckVariablesWithinPackingLimits(int maxVectors,
+                                         const std::vector<sh::ShaderVariable> &variables)
+{
     VariablePacker packer;
     return packer.CheckVariablesWithinPackingLimits(maxVectors, variables);
 }
@@ -376,4 +381,4 @@
     static std::map<std::string, unsigned int> map;
     return &map;
 #endif  // ANGLE_ENABLE_HLSL
-}
\ No newline at end of file
+}