commit ecd7cf354d6224a907e6350d9e93627602063fb4
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Sep 22 17:13:50 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Sep 22 17:13:50 2010 +0000
tree 0d98416144d43118220fed89015e336272e984ae
parent c5f8dea4486985697a1fe9687752c8bdc3822c43

Define vertex texture sampling intrinsics only when supported
TRAC #12245
This ensures that the shader will fail to compile when using VTF when it's not supported.
Previously an error was generated only at link time and it was not very descriptive.
Signed-off-by: Daniel Koch

Author:    Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/trunk@433 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/compiler/ShaderLang.cpp

diff --git a/src/compiler/ShaderLang.cpp b/src/compiler/ShaderLang.cpp
index 45183b0..b83e736 100644
--- a/src/compiler/ShaderLang.cpp
+++ b/src/compiler/ShaderLang.cpp
@@ -56,7 +56,7 @@
         builtInShaders[0] = (*i).c_str();
         builtInLengths[0] = (int) (*i).size();
 
-        if (PaParseStrings(const_cast<char**>(builtInShaders), builtInLengths, 1, parseContext) != 0)
+        if (builtInLengths[0] && PaParseStrings(const_cast<char**>(builtInShaders), builtInLengths, 1, parseContext) != 0)
         {
             infoSink.info.message(EPrefixInternalError, "Unable to parse built-ins");
             return false;