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

Scanner: Many int64 fixes, including performance.

Browse Source 
- partially addresses #1209 and #1187
- only query 64-bit extension on seeing use of a 64-bit literal
  (was doing it for every single token)
- correct HLSL acceptance of 64-bit literal syntax (still an int though)
- error on overflow of 32-bit literal type
This commit is contained in:
John Kessenich
2018-01-08 11:48:50 -07:00
parent adc33b23cc
commit c043aadd25
6 changed files with 61 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Test/baseResults/numeral.frag.out
View File

@@ -85,12 +85,12 @@ ERROR: node is still EOpNull!
0:17 move second child to first child ( temp int)
0:17 'obig' ( temp int)
0:17 Constant:
0:17 995208915 (const int)
0:17 -1662398820 (const int)
0:18 Sequence
0:18 move second child to first child ( temp int)
0:18 'omax1' ( temp int)
0:18 Constant:
0:18 536870912 (const int)
0:18 0 (const int)
0:20 Sequence
0:20 move second child to first child ( temp uint)
0:20 'uo5' ( temp uint)
@@ -225,7 +225,7 @@ ERROR: node is still EOpNull!
0:50 move second child to first child ( temp int)
0:50 'hbig' ( temp int)
0:50 Constant:
0:50 -1 (const int)
0:50 -15 (const int)
0:52 Sequence
0:52 move second child to first child ( temp float)
0:52 'f1' ( temp float)
@@ -494,12 +494,12 @@ ERROR: node is still EOpNull!
0:17 move second child to first child ( temp int)
0:17 'obig' ( temp int)
0:17 Constant:
0:17 995208915 (const int)
0:17 -1662398820 (const int)
0:18 Sequence
0:18 move second child to first child ( temp int)
0:18 'omax1' ( temp int)
0:18 Constant:
0:18 536870912 (const int)
0:18 0 (const int)
0:20 Sequence
0:20 move second child to first child ( temp uint)
0:20 'uo5' ( temp uint)
@@ -634,7 +634,7 @@ ERROR: node is still EOpNull!
0:50 move second child to first child ( temp int)
0:50 'hbig' ( temp int)
0:50 Constant:
0:50 -1 (const int)
0:50 -15 (const int)
0:52 Sequence
0:52 move second child to first child ( temp float)
0:52 'f1' ( temp float)

2
Test/baseResults/preprocessor.simple.vert.out
View File

@@ -25,6 +25,6 @@ int main(){
== !=
& ^ | && ^^ || ? :
+= -= *= /= %= <<= >>= &= |= ^=
1.2 2E10 5u - 5 lf
1.2 2E10 5u - 5l f
}

2
Test/baseResults/spv.atomicInt64.comp.out
View File

@@ -50,7 +50,7 @@ spv.atomicInt64.comp
24: 22(int) Constant 0
28: 17(int) Constant 1
29: TypePointer Uniform 10(int)
31: 10(int) Constant 15 0
31: 10(int) Constant 15 240
84(Struct): TypeStruct 6(int) 10(int)
85: TypePointer Workgroup 84(Struct)
86(s): 85(ptr) Variable Workgroup

8
Test/baseResults/tokenLength.vert.out
View File

@@ -51,7 +51,7 @@ ERROR: node is still EOpNull!
0:13 move second child to first child ( temp highp int)
0:13 'OE' ( global highp int)
0:13 Constant:
0:13 1073741823 (const int)
0:13 -1 (const int)
0:14 Sequence
0:14 move second child to first child ( temp highp int)
0:14 'HE' ( global highp int)
@@ -92,7 +92,7 @@ ERROR: node is still EOpNull!
0:34 move second child to first child ( temp highp int)
0:34 'superO' ( global highp int)
0:34 Constant:
0:34 1073741823 (const int)
0:34 -1 (const int)
0:35 Sequence
0:35 move second child to first child ( temp highp int)
0:35 'superI' ( global highp int)
@@ -147,7 +147,7 @@ ERROR: node is still EOpNull!
0:13 move second child to first child ( temp highp int)
0:13 'OE' ( global highp int)
0:13 Constant:
0:13 1073741823 (const int)
0:13 -1 (const int)
0:14 Sequence
0:14 move second child to first child ( temp highp int)
0:14 'HE' ( global highp int)
@@ -188,7 +188,7 @@ ERROR: node is still EOpNull!
0:34 move second child to first child ( temp highp int)
0:34 'superO' ( global highp int)
0:34 Constant:
0:34 1073741823 (const int)
0:34 -1 (const int)
0:35 Sequence
0:35 move second child to first child ( temp highp int)
0:35 'superI' ( global highp int)

2
Test/spv.atomicInt64.comp
View File

@@ -22,7 +22,7 @@ shared Struct s;
void main()
{
const int64_t i64c = -24;
const uint64_t u64c = 0xF00000000F;
const uint64_t u64c = 0xF00000000Ful;
// Test shader storage block
int64_t i64 = 0;