Merge pull request #46 from google/include-directive

#include directive support
2015-08-05 10:29:23 -06:00
parent 61d7d7ad73 484bb12703
commit d618070ab0
19 changed files with 249 additions and 31 deletions
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -701,8 +701,8 @@ void CompileAndLinkShaders()
        shader->setStrings(shaderStrings, 1);
        if (Options & EOptionOutputPreprocessed) {
            std::string str;
-            if (shader->preprocess(&Resources, defaultVersion, ENoProfile,
-                                   false, false, messages, &str)) {
+            if (shader->preprocess(&Resources, defaultVersion, ENoProfile, false, false,
+                                   messages, &str, glslang::TShader::ForbidInclude())) {
                PutsIfNonEmpty(str.c_str());
            } else {
                CompileFailed = true;