Merge pull request #46 from google/include-directive
#include directive support
This commit is contained in:
commit
d618070ab0
19 changed files with 249 additions and 31 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue