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

Re-allow non-language characters in ES 100 comments, including '\', except for '\' just before a new line.

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24331 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-12-04 17:23:03 +00:00
parent 34bd4fbef7
commit e1f0f5b31f
11 changed files with 56 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

2
glslang/MachineIndependent/preprocessor/Pp.cpp
View file

@ -188,7 +188,7 @@ int TPpContext::CPPdefine(TPpToken* ppToken)
if (token == '\\') {
parseContext.lineContinuationCheck(ppToken->loc);
token = currentInput->scan(this, currentInput, ppToken);
if (token == '\n')
if (token == '\n' || token == '\r')
token = currentInput->scan(this, currentInput, ppToken);
}
RecordToken(mac.body, token, ppToken);