diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 13:44:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 13:44:26 +0100 |
| commit | 245acbf6e81518958228d295bdb6a64298b09351 (patch) | |
| tree | 10a78831737274c2c55480437e60c74c884fde4d /src/3rdparty/angle/src/compiler/translator/DirectiveHandler.h | |
| parent | eb466b636b97251d273aedddfe66b15fe994d375 (diff) | |
| parent | 087aa1f3cb5975ef55e42db54487f737c93a4f0f (diff) | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I95f235a66ce2e9b1fa435c0f911c6f7e811755f0
Diffstat (limited to 'src/3rdparty/angle/src/compiler/translator/DirectiveHandler.h')
| -rw-r--r-- | src/3rdparty/angle/src/compiler/translator/DirectiveHandler.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/compiler/translator/DirectiveHandler.h b/src/3rdparty/angle/src/compiler/translator/DirectiveHandler.h index 69418c277a..0433c3bf89 100644 --- a/src/3rdparty/angle/src/compiler/translator/DirectiveHandler.h +++ b/src/3rdparty/angle/src/compiler/translator/DirectiveHandler.h @@ -29,7 +29,8 @@ class TDirectiveHandler : public pp::DirectiveHandler virtual void handlePragma(const pp::SourceLocation& loc, const std::string& name, - const std::string& value); + const std::string& value, + bool stdgl); virtual void handleExtension(const pp::SourceLocation& loc, const std::string& name, |