Updated the includer interface to allow relative includes.
This plumbs both the current file path and the include depth
back up to the includer. This allows the includer to properly
support relative paths.
This also replaces the string copy that was done during include
with a zero-copy method of accomplishing the same thing. This
prevents extra copies of entire files.
diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index cc59d38..6ebdb7f 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -699,8 +699,9 @@
if (Options & EOptionOutputPreprocessed) {
std::string str;
+ glslang::TShader::ForbidInclude includer;
if (shader->preprocess(&Resources, defaultVersion, ENoProfile, false, false,
- messages, &str, glslang::TShader::ForbidInclude())) {
+ messages, &str, includer)) {
PutsIfNonEmpty(str.c_str());
} else {
CompileFailed = true;