mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix public bug 1277: #line L sets the next line to L+1 or just L, based on the version of the language.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@29277 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2014-12-20 07:03:18 +00:00
parent 560df75970
commit 2b20dcb64d
9 changed files with 91 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Test/cppSimple.vert
View File

@@ -242,19 +242,19 @@ double f = f1;
#directive directive was expanded
#line 12000
#error line should be 12001
#error line should be 12000
#line 13000 7
#error line should be 13001, string 7
#error line should be 13000, string 7
#define L1 14000
#define L2 13
#define F1 5
#define F2 7
#line L1 + L2
#error line should be 14014, string 7
#error line should be 14013, string 7
#line L1 + L2 F1 + F2 // antoeuh sat comment
#error line should be 14014, string 12
#error line should be 14013, string 12
#line L1 + L2 + F1 + F2
#error line should be 14026, string 12
#error line should be 14025, string 12
#line 1234 F1 + F2 extra
#define empty_extra
#line 1235 F1 + F2 empty_extra
@@ -264,11 +264,11 @@ double f = f1;
#line 1238 F1 + F2 moreEmpty empty_extra
#line 1239 empty_extra F1 empty_extra + empty_extra F2 empty_extra moreEmpty empty_extra
#line (20000)
#error line should be 20001
#error line should be 20000
#line (20000+10)
#error line should be 20011
#error line should be 20010
#line +20020
#error line should be 20021
#error line should be 20020
#define VAL1 1.0
#define VAL2 2.0