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

Merge branch 'HaydnTrigg-patch-1'

Browse Source
This commit is contained in:
John Kessenich 2018-07-02 16:04:31 -06:00
commit 513cc4cf87
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Test/baseResults/constFold.frag.out
View File

@ -179,6 +179,10 @@ ERROR: node is still EOpNull!
0:83 2147483647 (const int) 0:83 2147483647 (const int)
0:84 Constant: 0:84 Constant:
0:84 +1.#INF 0:84 +1.#INF
0:84 Constant:
0:84 -1.#INF
0:84 Constant:
0:84 1.#IND
0:88 Constant: 0:88 Constant:
0:88 2 (const uint) 0:88 2 (const uint)
0:88 3 (const uint) 0:88 3 (const uint)

2
Test/constFold.frag Normal file → Executable file
View File

@ -81,7 +81,7 @@ void foo()
a[0] = s.m[1].z; // 7.0 a[0] = s.m[1].z; // 7.0
b % 0; // int b % 0; // int
b / 0; b / 0;
e / 0; e / 0; -e / 0; 0.0 / 0.0;
const uint ua = 5; const uint ua = 5;
const uvec2 ub = uvec2(6, 7); const uvec2 ub = uvec2(6, 7);
const uint uc = 8; const uint uc = 8;

2
glslang/Include/revision.h
View File

@ -1,3 +1,3 @@
// This header is generated by the make-revision script. // This header is generated by the make-revision script.
#define GLSLANG_PATCH_LEVEL 2787 #define GLSLANG_PATCH_LEVEL 2793

7
glslang/MachineIndependent/Constant.cpp
View File

@ -179,7 +179,14 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TIntermTyped* right
case EbtDouble: case EbtDouble:
case EbtFloat: case EbtFloat:
case EbtFloat16: case EbtFloat16:
if (rightUnionArray[i].getDConst() != 0.0)
newConstArray[i].setDConst(leftUnionArray[i].getDConst() / rightUnionArray[i].getDConst()); newConstArray[i].setDConst(leftUnionArray[i].getDConst() / rightUnionArray[i].getDConst());
else if (leftUnionArray[i].getDConst() > 0.0)
newConstArray[i].setDConst((double)INFINITY);
else if (leftUnionArray[i].getDConst() < 0.0)
newConstArray[i].setDConst((double)-INFINITY);
else
newConstArray[i].setDConst((double)NAN);
break; break;
case EbtInt8: case EbtInt8:
if (rightUnionArray[i] == (signed char)0) if (rightUnionArray[i] == (signed char)0)