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

Non-functional: Make whitespace/braces consistent for a recent commit.

Browse Source
This commit is contained in:
John Kessenich 2019-08-30 09:51:06 -06:00
parent 796df2d74e
commit 7de044c062
2 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -7083,7 +7083,6 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
assert(0); assert(0);
break; break;
case EbtInt: case EbtInt:
{
switch (node->getType().getBasicType()) { switch (node->getType().getBasicType()) {
case EbtFloat: op = EOpConvFloatToInt; break; case EbtFloat: op = EOpConvFloatToInt; break;
case EbtFloat16: op = EOpConvFloat16ToInt; break; case EbtFloat16: op = EOpConvFloat16ToInt; break;
@ -7092,26 +7091,19 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
case EbtUint: op = EOpConvUintToInt; break; case EbtUint: op = EOpConvUintToInt; break;
default: assert(0); default: assert(0);
} }
}
break; break;
case EbtUint: case EbtUint:
{
switch (node->getType().getBasicType()) { switch (node->getType().getBasicType()) {
case EbtFloat: op = EOpConvFloatToUint; break; case EbtFloat: op = EOpConvFloatToUint; break;
case EbtFloat16: op = EOpConvFloat16ToUint; break; case EbtFloat16: op = EOpConvFloat16ToUint; break;
case EbtUint8: op = EOpConvUint8ToUint; break; case EbtUint8: op = EOpConvUint8ToUint; break;
case EbtInt8: op = EOpConvInt8ToUint; break; case EbtInt8: op = EOpConvInt8ToUint; break;
case EbtInt: op = EOpConvIntToUint; break; case EbtInt: op = EOpConvIntToUint; break;
case EbtUint: op = EOpConvUintToInt8; break; case EbtUint: op = EOpConvUintToInt8; break;
default: assert(0); default: assert(0);
} }
}
break; break;
case EbtInt8: case EbtInt8:
{
switch (node->getType().getBasicType()) { switch (node->getType().getBasicType()) {
case EbtFloat: op = EOpConvFloatToInt8; break; case EbtFloat: op = EOpConvFloatToInt8; break;
case EbtFloat16: op = EOpConvFloat16ToInt8; break; case EbtFloat16: op = EOpConvFloat16ToInt8; break;
@ -7120,10 +7112,8 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
case EbtUint: op = EOpConvUintToInt8; break; case EbtUint: op = EOpConvUintToInt8; break;
default: assert(0); default: assert(0);
} }
}
break; break;
case EbtUint8: { case EbtUint8:
switch (node->getType().getBasicType()) { switch (node->getType().getBasicType()) {
case EbtFloat: op = EOpConvFloatToUint8; break; case EbtFloat: op = EOpConvFloatToUint8; break;
case EbtFloat16: op = EOpConvFloat16ToUint8; break; case EbtFloat16: op = EOpConvFloat16ToUint8; break;
@ -7132,10 +7122,8 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
case EbtUint: op = EOpConvUintToUint8; break; case EbtUint: op = EOpConvUintToUint8; break;
default: assert(0); default: assert(0);
} }
}
break; break;
case EbtFloat: case EbtFloat:
{
switch (node->getType().getBasicType()) { switch (node->getType().getBasicType()) {
case EbtFloat16: op = EOpConvFloat16ToFloat; break; case EbtFloat16: op = EOpConvFloat16ToFloat; break;
case EbtInt8: op = EOpConvInt8ToFloat; break; case EbtInt8: op = EOpConvInt8ToFloat; break;
@ -7144,10 +7132,8 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
case EbtUint: op = EOpConvUintToFloat; break; case EbtUint: op = EOpConvUintToFloat; break;
default: assert(0); default: assert(0);
} }
}
break; break;
case EbtFloat16: case EbtFloat16:
{
switch (node->getType().getBasicType()) { switch (node->getType().getBasicType()) {
case EbtFloat: op = EOpConvFloatToFloat16; break; case EbtFloat: op = EOpConvFloatToFloat16; break;
case EbtInt8: op = EOpConvInt8ToFloat16; break; case EbtInt8: op = EOpConvInt8ToFloat16; break;
@ -7156,7 +7142,6 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
case EbtUint: op = EOpConvUintToFloat16; break; case EbtUint: op = EOpConvUintToFloat16; break;
default: assert(0); default: assert(0);
} }
}
break; break;
} }

24
glslang/MachineIndependent/glslang.m4
View File

@ -3183,18 +3183,18 @@ GLSLANG_WEB_EXCLUDE_ON
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.coopmat = true; $$.coopmat = true;
} }
| ICOOPMATNV { | ICOOPMATNV {
parseContext.intcoopmatCheck($1.loc, "icoopmatNV", parseContext.symbolTable.atBuiltInLevel()); parseContext.intcoopmatCheck($1.loc, "icoopmatNV", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtInt; $$.basicType = EbtInt;
$$.coopmat = true; $$.coopmat = true;
} }
| UCOOPMATNV { | UCOOPMATNV {
parseContext.intcoopmatCheck($1.loc, "ucoopmatNV", parseContext.symbolTable.atBuiltInLevel()); parseContext.intcoopmatCheck($1.loc, "ucoopmatNV", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtUint; $$.basicType = EbtUint;
$$.coopmat = true; $$.coopmat = true;
} }
GLSLANG_WEB_EXCLUDE_OFF GLSLANG_WEB_EXCLUDE_OFF
| struct_specifier { | struct_specifier {
$$ = $1; $$ = $1;