Handle array types and some initial work on implicit conversions.

1 files changed, 10 insertions, 2 deletions

diff --git a/src/libs/glsl/glslsemantic.h b/src/libs/glsl/glslsemantic.h
index d3b0ce3214..49bfe67739 100644
--- a/src/libs/glsl/glslsemantic.h
+++ b/src/libs/glsl/glslsemantic.h
@@ -30,6 +30,7 @@
 #define GLSLSEMANTIC_H
 
 #include "glslastvisitor.h"
+#include "glsltype.h"
 
 namespace GLSL {
 
@@ -43,8 +44,15 @@ public:
         ExprResult(const Type *type = 0, bool isConstant = false)
             : type(type), isConstant(isConstant) {}
 
-        bool isValid() const { return type != 0; }
-        operator bool() const { return type != 0; }
+        bool isValid() const {
+            if (! type)
+                return false;
+            else if (type->asUndefinedType() != 0)
+                return false;
+            return true;
+        }
+
+        operator bool() const { return isValid(); }
 
         const Type *type;
         bool isConstant;