Built-in string for vertex shaders can be empty. Nicolas handled this case in…

Built-in string for vertex shaders can be empty. Nicolas handled this case in r433 but r437 overwrote it. Review URL: http://codereview.appspot.com/2233046 git-svn-id: https://angleproject.googlecode.com/svn/trunk@439 736b8ea6-26fd-11df-bfd4-992fa37f6226

Built-in string for vertex shaders can be empty. Nicolas handled this case in…
570bfc7c · alokp@chromium.org · e979ead8 · 570bfc7c
Commit 570bfc7c authored Sep 24, 2010 by alokp@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

Compiler.cpp src/compiler/Compiler.cpp +5 -6

No files found.
--- a/src/compiler/Compiler.cpp
+++ b/src/compiler/Compiler.cpp
@@ -41,13 +41,12 @@ static bool InitializeSymbolTable(

    for (TBuiltInStrings::const_iterator i = builtInStrings.begin(); i != builtInStrings.end(); ++i)
    {
-        const char* builtInShaders[1];
-        int builtInLengths[1];
+        const char* builtInShaders = i->c_str();
+        int builtInLengths = static_cast<int>(i->size());
+        if (builtInLengths <= 0)
+          continue;

-        builtInShaders[0] = (*i).c_str();
-        builtInLengths[0] = (int) (*i).size();
-
-        if (PaParseStrings(builtInShaders, builtInLengths, 1, parseContext) != 0)
+        if (PaParseStrings(&builtInShaders, &builtInLengths, 1, parseContext) != 0)
        {
            infoSink.info.message(EPrefixInternalError, "Unable to parse built-ins");
            return false;