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

Get a clean g++/gcc build. Runs and gets correct results on linux.

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@20820 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-03-09 19:50:19 +00:00
parent cfd643e447
commit 20169715df
11 changed files with 33 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

26
glslang/MachineIndependent/ShaderLang.cpp
View file

@ -212,42 +212,42 @@ bool ConsumeWhitespaceComment(const char*& s)
const char* startPoint = s;
// first, skip white space
while (*s == ' ' || *s == '\t' || *s == '\n' || *s == '\r') {
while (*s == ' ' || *s == '\t' || *s == '\r' || *s == '\n') {
++s;
}
// then, check for a comment
if (*s == '/') {
if (*(s+1) == '/') {
// a '//' style comment
s += 2;
do {
while (*s && *s != '\\' && *s != '\n')
while (*s && *s != '\\' && *s != '\r' && *s != '\n')
++s;
if (*s == '\n' || *s == 0) {
if (*s == '\n') {
if (*s == '\r' || *s == '\n' || *s == 0) {
while (*s == '\r' || *s == '\n')
++s;
if (*s == '\r')
++s;
} // else it's 0, end of string
// we reached the end of the comment
break;
} else {
// it's a '\', so we need to keep going, after skipping what's escaped
++s;
if (*s == '\n') {
++s;
if (*s == '\r')
++s;
} else {
if (*s == '\r' && *(s+1) == '\n')
s += 2;
else {
// skip the escaped character
if (*s)
++s;
}
}
} while (true);
} else if (*(s+1) == '*') {
// a '/*' style comment
s += 2;
do {
while (*s && *s != '*')
@ -318,7 +318,7 @@ void ScanVersion(const char* const shaderStrings[], int numStrings, int& version
// profile
const char* end = s;
while (*end != ' ' && *end != '\t' && *end != '\n') {
while (*end != ' ' && *end != '\t' && *end != '\n' && *end != '\r') {
if (*end == 0)
return;
++end;