Improve preprocessor by using GLSL scanner, allowing read-only strings to be compiled, unifying of line # tracking, and correct detection that ES #version appeared after a comment.
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23721 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
parent
9497485e14
commit
ea869fb403
20 changed files with 285 additions and 300 deletions
|
|
@ -270,7 +270,7 @@ class TShader {
|
|||
public:
|
||||
explicit TShader(EShLanguage);
|
||||
virtual ~TShader();
|
||||
void setStrings(char** s, int n) { strings = s; numStrings = n; }
|
||||
void setStrings(const char* const* s, int n) { strings = s; numStrings = n; }
|
||||
bool parse(const TBuiltInResource*, int defaultVersion, bool forwardCompatible, EShMessages);
|
||||
const char* getInfoLog();
|
||||
const char* getInfoDebugLog();
|
||||
|
|
@ -280,7 +280,7 @@ protected:
|
|||
TCompiler* compiler;
|
||||
TIntermediate* intermediate;
|
||||
TInfoSink* infoSink;
|
||||
char** strings;
|
||||
const char* const* strings;
|
||||
int numStrings;
|
||||
|
||||
friend class TProgram;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue