A bunch of semantic checks were missing for binary arithmetic operations.…

glslang/Include/Types.h

@@ -563,6 +563,7 @@ public:
     void setArrayInformationType(TType* t) { arrayInformationType = t; }
     TType* getArrayInformationType() { return arrayInformationType; }
     virtual bool isVector() const { return vectorSize > 1; }
+    virtual bool isScalar() const { return vectorSize == 1; }
     const char* getBasicString() const {
         return TType::getBasicString(basicType);
     }

glslang/Include/intermediate.h

@@ -360,6 +360,7 @@ public:
     virtual bool isMatrix() const { return type.isMatrix(); }
     virtual bool isArray()  const { return type.isArray(); }
     virtual bool isVector() const { return type.isVector(); }
+    virtual bool isScalar() const { return type.isScalar(); }
     TString getCompleteString() const { return type.getCompleteString(); }
 
 protected:

glslang/MachineIndependent/ParseHelper.cpp

@@ -416,7 +416,7 @@ bool TParseContext::constErrorCheck(TIntermTyped* node)
 //
 bool TParseContext::integerErrorCheck(TIntermTyped* node, const char* token)
 {
-    if ((node->getBasicType() == EbtInt || node->getBasicType() == EbtUint) && node->getVectorSize() == 1 && ! node->isArray())
+    if ((node->getBasicType() == EbtInt || node->getBasicType() == EbtUint) && node->isScalar() && ! node->isArray())
         return false;
 
     error(node->getLine(), "scalar integer expression required", token, "");

glslang/MachineIndependent/glslang.y

@@ -601,7 +601,6 @@ function_call
     }
     ;
 
-// TODO: clean up: can we eliminate function_call_or_method and function_call_generic?
 function_call_or_method
     : function_call_generic {
         $$ = $1;