commit 3494b4da9bb98b99f83499e440593dbc3448e5c5
author John Kessenich <cepheus@frii.com> Mon May 22 15:00:42 2017 -0600
committer John Kessenich <cepheus@frii.com> Thu Jun 01 11:16:32 2017 -0600
tree d0ba8451fac6a19903e2549145648294d2b3660e
parent 44d2728e3d45bd064a4e6bf23d9c1793dc0da839

HLSL: Add an Includer to handle #include.

StandAlone/StandAlone.cpp

diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index ef47662..40110e3 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -41,6 +41,7 @@
 
 #include "ResourceLimits.h"
 #include "Worklist.h"
+#include "DirStackFileIncluder.h"
 #include "./../glslang/Include/ShHandle.h"
 #include "./../glslang/Include/revision.h"
 #include "./../glslang/Public/ShaderLang.h"
@@ -48,6 +49,7 @@
 #include "../SPIRV/GLSL.std.450.h"
 #include "../SPIRV/doc.h"
 #include "../SPIRV/disassemble.h"
+
 #include <cstring>
 #include <cstdlib>
 #include <cctype>
@@ -665,9 +667,9 @@
 
         const int defaultVersion = Options & EOptionDefaultDesktop? 110: 100;
 
+        DirStackFileIncluder includer;
         if (Options & EOptionOutputPreprocessed) {
             std::string str;
-            glslang::TShader::ForbidIncluder includer;
             if (shader->preprocess(&Resources, defaultVersion, ENoProfile, false, false,
                                    messages, &str, includer)) {
                 PutsIfNonEmpty(str.c_str());
@@ -678,7 +680,7 @@
             StderrIfNonEmpty(shader->getInfoDebugLog());
             continue;
         }
-        if (! shader->parse(&Resources, defaultVersion, false, messages))
+        if (! shader->parse(&Resources, defaultVersion, false, messages, includer))
             CompileFailed = true;
 
         program.addShader(shader);