commit dd313731fd31b0d2c3c9eaea2047c83d05ba1f42
author alokp@chromium.org <alokp@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Sep 24 17:19:25 2010 +0000
committer alokp@chromium.org <alokp@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Sep 24 17:19:25 2010 +0000
tree 7c17b56beecc6d47e12b1a8b04b8122ebc7c4d04
parent 0f33d1f1801246cd6683e847fb6d605a22368a0b

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: http://angleproject.googlecode.com/svn/trunk@439 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/compiler/Compiler.cpp

diff --git a/src/compiler/Compiler.cpp b/src/compiler/Compiler.cpp
index 6008f96..c35d928 100644
--- a/src/compiler/Compiler.cpp
+++ b/src/compiler/Compiler.cpp
@@ -41,13 +41,12 @@
 
     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;