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

Fixes to 8f1684b7bb, merge pull request 52.

Browse source
This commit is contained in:
John Kessenich 2015-08-06 22:02:24 -06:00
parent 8f1684b7bb
commit 306695360d
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
glslang/Include/revision.h
View file

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "2.2.687"
#define GLSLANG_DATE "03-Aug-2015"
#define GLSLANG_REVISION "2.2.699"
#define GLSLANG_DATE "06-Aug-2015"

2
glslang/MachineIndependent/Constant.cpp
View file

@ -172,7 +172,7 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TIntermTyped* const
case EbtInt:
if (rightUnionArray[i] == 0)
newConstArray[i].setIConst(0x7FFFFFFF);
else if (rightUnionArray[i].getIConst() == -1 && (unsigned int)unionArray[i].getIConst() == 0x80000000)
else if (rightUnionArray[i].getIConst() == -1 && unionArray[i].getIConst() == 0x80000000)
newConstArray[i].setIConst(0x80000000);
else
newConstArray[i].setIConst(unionArray[i].getIConst() / rightUnionArray[i].getIConst());

2
glslang/MachineIndependent/Scan.h
View file

@ -172,7 +172,7 @@ protected:
void advance()
{
++currentChar;
if (currentChar >= static_cast<size_t>(lengths[currentSource])) {
if (currentChar >= lengths[currentSource]) {
++currentSource;
if (currentSource < numSources) {
loc[currentSource].string = loc[currentSource - 1].string + 1;