diff --git a/Test/100.frag b/Test/100.frag
index a4dc7982235a6b5ad2d1081611b411eca6b0639e..cb78f8bf023bc40975de87ef6052e8d72be0ba53 100644
--- a/Test/100.frag
+++ b/Test/100.frag
@@ -133,8 +133,17 @@ void foo246()
texture2DProj(highExt, v[2]);
texture3D(sExt, vec3(f13)); // ERROR
texture2DProjLod(sExt, vec3(f13), f13); // ERROR
+ int a;
+ ~a; // ERROR
+ a | a; // ERROR
+ a & a; // ERROR
}
#extension GL_OES_EGL_image_external : disable
+int foo203940(int a, float b, float a) // ERROR, a redefined
+{
+ return a;
+}
+
uniform samplerExternalOES badExt; // syntax ERROR
diff --git a/Test/array100.frag b/Test/array100.frag
index 596e41b958f6691a91f7606054de50c81eb6cbe9..beedfeca94b67dc65f7d98cf6582333a0b063fd2 100644
--- a/Test/array100.frag
+++ b/Test/array100.frag
@@ -39,3 +39,31 @@ void main()
gl_FragData[-1] = vec4(1.0); // ERROR
gl_FragData[3] = vec4(1.0);
}
+
+struct SA {
+ vec3 v3;
+ vec2 v2[4];
+};
+
+struct SB {
+ vec4 v4;
+ SA sa;
+};
+
+SB bar9()
+{
+ SB s;
+ return s; // ERROR
+}
+
+void bar10(SB s) // okay
+{
+}
+
+void bar11()
+{
+ SB s1, s2;
+ s1 = s2; // ERROR
+ bar10(s1);
+ s2 = bar9(); // ERROR
+}
diff --git a/Test/baseResults/100.frag.out b/Test/baseResults/100.frag.out
index 49a0847d177b1d48be852f20fd7c02e9d4ff51a2..2507e06fd13af0e66fff4d8552fbecc184ad5e4a 100644
--- a/Test/baseResults/100.frag.out
+++ b/Test/baseResults/100.frag.out
@@ -53,8 +53,12 @@ ERROR: 0:104: 'gl_FragDepthEXT' : required extension not requested: GL_EXT_frag_
ERROR: 0:111: 'gl_FragDepth' : undeclared identifier
ERROR: 0:134: 'texture3D' : no matching overloaded function found
ERROR: 0:135: 'texture2DProjLod' : no matching overloaded function found
-ERROR: 0:140: '' : syntax error
-ERROR: 49 compilation errors. No code generated.
+ERROR: 0:137: 'bitwise not' : not supported for this version or the enabled extensions
+ERROR: 0:138: 'bitwise inclusive or' : not supported for this version or the enabled extensions
+ERROR: 0:139: 'bitwise and' : not supported for this version or the enabled extensions
+ERROR: 0:144: 'a' : redefinition
+ERROR: 0:149: '' : syntax error
+ERROR: 53 compilation errors. No code generated.
ERROR: node is still EOpNull!
0:3 Sequence
@@ -226,6 +230,21 @@ ERROR: node is still EOpNull!
0:134 0.000000
0:135 Constant:
0:135 0.000000
+0:137 Bitwise not (mediump int)
+0:137 'a' (mediump int)
+0:138 inclusive-or (mediump int)
+0:138 'a' (mediump int)
+0:138 'a' (mediump int)
+0:139 bitwise and (mediump int)
+0:139 'a' (mediump int)
+0:139 'a' (mediump int)
+0:144 Function Definition: foo203940(i1;f1;f1; (mediump int)
+0:144 Function Parameters:
+0:144 'a' (in mediump int)
+0:144 'b' (in mediump float)
+0:146 Sequence
+0:146 Branch: Return with expression
+0:146 'a' (in mediump int)
0:? Linker Objects
0:? 'a' (3-element array of mediump int)
0:? 'uint' (mediump int)
diff --git a/Test/baseResults/array100.frag.out b/Test/baseResults/array100.frag.out
index a7e0c5b519e1410b4ff4d40c5a88dc8e0eba5822..5302806a668baadfdd01d394d9af1ec84c5b4c2b 100644
--- a/Test/baseResults/array100.frag.out
+++ b/Test/baseResults/array100.frag.out
@@ -2,6 +2,7 @@ ERROR: 0:3: 'float' : type requires declaration of default precision qualifier
ERROR: 0:3: '' : array size required
ERROR: 0:9: 'arrayed type' : not supported for this version or the enabled extensions
ERROR: 0:9: 'arrayed type' : not supported for this version or the enabled extensions
+ERROR: 0:9: 'array in function return type' : not supported for this version or the enabled extensions
ERROR: 0:11: 'arrayed constructor' : not supported for this version or the enabled extensions
ERROR: 0:21: '[' : array index out of range '2'
ERROR: 0:24: 'array assignment' : not supported for this version or the enabled extensions
@@ -15,7 +16,10 @@ ERROR: 0:31: 'array comparison' : not supported for this version or the enabled
ERROR: 0:35: '[' : array index out of range '5'
ERROR: 0:38: '[' : array index out of range '1000'
ERROR: 0:39: '[' : index out of range '-1'
-ERROR: 17 compilation errors. No code generated.
+ERROR: 0:53: 'array in function return type' : not supported for this version or the enabled extensions
+ERROR: 0:66: 'array assignment' : not supported for this version or the enabled extensions
+ERROR: 0:68: 'array assignment' : not supported for this version or the enabled extensions
+ERROR: 21 compilation errors. No code generated.
ERROR: node is still EOpNull!
0:9 Function Definition: foo(f1[5]; (4-element array of mediump float)
@@ -120,6 +124,25 @@ ERROR: node is still EOpNull!
0:40 1.000000
0:40 1.000000
0:40 1.000000
+0:53 Function Definition: bar9( (structure{v4,sa})
+0:53 Function Parameters:
+0:? Sequence
+0:56 Branch: Return with expression
+0:56 's' (structure{v4,sa})
+0:59 Function Definition: bar10(struct-SB-vf4-struct-SA-vf3-vf2[4]11; (void)
+0:59 Function Parameters:
+0:59 's' (in structure{v4,sa})
+0:63 Function Definition: bar11( (void)
+0:63 Function Parameters:
+0:? Sequence
+0:66 move second child to first child (structure{v4,sa})
+0:66 's1' (structure{v4,sa})
+0:66 's2' (structure{v4,sa})
+0:67 Function Call: bar10(struct-SB-vf4-struct-SA-vf3-vf2[4]11; (void)
+0:67 's1' (structure{v4,sa})
+0:68 move second child to first child (structure{v4,sa})
+0:68 's2' (structure{v4,sa})
+0:68 Function Call: bar9( (structure{v4,sa})
0:? Linker Objects
0:? 'gu' (unsized array of mediump float)
0:? 'g4' (4-element array of mediump float)
diff --git a/Test/baseResults/constFold.frag.out b/Test/baseResults/constFold.frag.out
index ba751b362b95984d0455f3ece7f6ce356b63456c..0147f7c1c528ace175b916ab5c5043f9ebda6c93 100644
--- a/Test/baseResults/constFold.frag.out
+++ b/Test/baseResults/constFold.frag.out
@@ -216,6 +216,18 @@ ERROR: node is still EOpNull!
0:113 0.000000
0:114 Constant:
0:114 0.000000
+0:116 move second child to first child (int)
+0:116 'p' (int)
+0:116 Constant:
+0:116 2147483647 (const int)
+0:117 move second child to first child (int)
+0:117 'p' (int)
+0:117 Constant:
+0:117 -2147483648 (const int)
+0:118 move second child to first child (int)
+0:118 'p' (int)
+0:118 Constant:
+0:118 -2147483647 (const int)
0:? Linker Objects
0:? 'a' (const int)
0:? 1 (const int)
diff --git a/Test/constFold.frag b/Test/constFold.frag
index 824d6302205cb6a6ba385fa3d61d48949f5918c0..aa8a94beaa7013093daf27608b0317233cb99ecc 100644
--- a/Test/constFold.frag
+++ b/Test/constFold.frag
@@ -112,4 +112,8 @@ void foo2()
m2[-1][1]; // ERROR
m3[1][3]; // ERROR
m3[3][1]; // ERROR
-}
\ No newline at end of file
+ int p;
+ p = -2147483647 / -1;
+ p = -2147483648 / -1;
+ p = 2147483647 / -1;
+}
diff --git a/glslang/MachineIndependent/Constant.cpp b/glslang/MachineIndependent/Constant.cpp
index 106534589d72bb89dae317f7920a5d55b5697a8d..8662d32ede6b9d30101a4443111568a52b7bb792 100644
--- a/glslang/MachineIndependent/Constant.cpp
+++ b/glslang/MachineIndependent/Constant.cpp
@@ -165,9 +165,11 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, TIntermTyped* constantNod
break;
case EbtInt:
- if (rightUnionArray[i] == 0) {
+ if (rightUnionArray[i] == 0)
newConstArray[i].setIConst(0x7FFFFFFF);
- } else
+ else if (rightUnionArray[i].getIConst() == -1 && unionArray[i].getIConst() == 0x80000000)
+ newConstArray[i].setIConst(0x80000000);
+ else
newConstArray[i].setIConst(unionArray[i].getIConst() / rightUnionArray[i].getIConst());
break;
diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp
index 29c21129f77b87e1a250876b5bbb65f3ac7e0288..12fb3eb49d8e6a5700f73e98249c9e9c65a31606 100644
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -758,6 +758,8 @@ TFunction* TParseContext::handleFunctionDeclarator(TSourceLoc loc, TFunction& fu
}
}
+ arrayObjectCheck(loc, function.getType(), "array in function return type");
+
// All built-in functions are defined, even though they don't have a body.
if (symbolTable.atBuiltInLevel())
function.setDefined();
@@ -831,26 +833,22 @@ TIntermAggregate* TParseContext::handleFunctionDefinition(TSourceLoc loc, TFunct
TParameter& param = function[i];
if (param.name != 0) {
TVariable *variable = new TVariable(param.name, *param.type);
- //
+
// Insert the parameters with name in the symbol table.
- //
if (! symbolTable.insert(*variable)) {
error(loc, "redefinition", variable->getName().c_str(), "");
delete variable;
+ } else {
+ // Transfer ownership of name pointer to symbol table.
+ param.name = 0;
+
+ // Add the parameter to the HIL
+ paramNodes = intermediate.growAggregate(paramNodes,
+ intermediate.addSymbol(variable->getUniqueId(),
+ variable->getName(),
+ variable->getType(), loc),
+ loc);
}
- //
- // Transfer ownership of name pointer to symbol table.
- //
- param.name = 0;
-
- //
- // Add the parameter to the HIL
- //
- paramNodes = intermediate.growAggregate(paramNodes,
- intermediate.addSymbol(variable->getUniqueId(),
- variable->getName(),
- variable->getType(), loc),
- loc);
} else
paramNodes = intermediate.growAggregate(paramNodes, intermediate.addSymbol(0, "", *param.type, loc), loc);
}
diff --git a/glslang/MachineIndependent/glslang.y b/glslang/MachineIndependent/glslang.y
index 1e9cef2da248ba415b4a7546ae3c48edf16b062c..6767dd9de416a3f108405099e2b9dbec5fa16078 100644
--- a/glslang/MachineIndependent/glslang.y
+++ b/glslang/MachineIndependent/glslang.y
@@ -441,7 +441,8 @@ unary_operator
: PLUS { $$.loc = $1.loc; $$.op = EOpNull; }
| DASH { $$.loc = $1.loc; $$.op = EOpNegative; }
| BANG { $$.loc = $1.loc; $$.op = EOpLogicalNot; }
- | TILDE { $$.loc = $1.loc; $$.op = EOpBitwiseNot; }
+ | TILDE { $$.loc = $1.loc; $$.op = EOpBitwiseNot;
+ parseContext.fullIntegerCheck($1.loc, "bitwise not"); }
;
// Grammar Note: No '*' or '&' unary ops. Pointers are not supported.