BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Output wrapping #line directives for included content.

Browse source 
Also changed the includer interface to let it return the actual
full path of the included file.
This commit is contained in:
Lei Zhang 2015-07-06 10:32:46 -04:00
parent 2b4ebbb1e1
commit 1eed969b2d
4 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
glslang/Public/ShaderLang.h
View file

@ -293,17 +293,18 @@ public:
// Interface to #include handlers.
class Includer {
public:
// On success, returns true and the content that replaces "#include
// filename". On failure, returns false and an arbitrary string.
virtual std::pair<bool, std::string> include(const char* filename) const = 0;
// On success, returns the full path and content of the file with the given
// filename that replaces "#include filename". On failure, returns an empty
// string and an error message.
virtual std::pair<std::string, std::string> include(const char* filename) const = 0;
};
// Generates #error as #include content.
// Returns an error message for any #include directive.
class ForbidInclude : public Includer {
public:
std::pair<bool, std::string> include(const char* filename) const override
std::pair<std::string, std::string> include(const char* filename) const override
{
return std::make_pair<bool, std::string>(true, "#error unexpected include directive\n");
return std::make_pair<std::string, std::string>("", "unexpected include directive");
}
};