Pass 1 at building on linux: remove compile errors from machine independent.
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@20536 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
parent
dadf945fd7
commit
54d8cda95e
24 changed files with 176 additions and 172 deletions
|
|
@ -792,7 +792,8 @@ function_identifier
|
|||
|
||||
if ($$.function == 0) {
|
||||
// error recover
|
||||
$$.function = new TFunction(&TString(""), TType(EbtVoid), EOpNull);
|
||||
TString empty("");
|
||||
$$.function = new TFunction(&empty, TType(EbtVoid), EOpNull);
|
||||
}
|
||||
}
|
||||
;
|
||||
|
|
@ -826,11 +827,11 @@ unary_expression
|
|||
if ($1.op != EOpNull) {
|
||||
$$ = parseContext.intermediate.addUnaryMath($1.op, $2, $1.line, parseContext.symbolTable);
|
||||
if ($$ == 0) {
|
||||
char* errorOp = "";
|
||||
char errorOp[2] = {0, 0};
|
||||
switch($1.op) {
|
||||
case EOpNegative: errorOp = "-"; break;
|
||||
case EOpLogicalNot: errorOp = "!"; break;
|
||||
case EOpBitwiseNot: errorOp = "~"; break;
|
||||
case EOpNegative: errorOp[0] = '-'; break;
|
||||
case EOpLogicalNot: errorOp[0] = '!'; break;
|
||||
case EOpBitwiseNot: errorOp[0] = '~'; break;
|
||||
default: break;
|
||||
}
|
||||
parseContext.unaryOpError($1.line, errorOp, $2->getCompleteString());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue