Add support for uint types in GLSL

[libs/gl.git] / source / glsl / reflect.cpp

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index c2a913f982acfcb61c6ca7a0289f3233f3d434e9..8c10acccd697c265063d481a8f1a8b055ac492bb 100644 (file)
--- a/source/glsl/reflect.cpp
+++ b/source/glsl/reflect.cpp
@@ -33,6 +33,8 @@ bool can_convert(const BasicTypeDeclaration &from, const BasicTypeDeclaration &t
                return from.size<=to.size;
        else if(from.kind!=to.kind)
                return false;
+       else if(from.kind==BasicTypeDeclaration::INT && from.sign!=to.sign)
+               return from.sign && from.size<=to.size;
        else if(is_vector_or_matrix(from) && from.size==to.size)
        {
                BasicTypeDeclaration *from_base = dynamic_cast<BasicTypeDeclaration *>(from.base_type);
@@ -123,7 +125,7 @@ void TypeComparer::visit(BasicTypeDeclaration &basic)
 {
        if(BasicTypeDeclaration *basic1 = multi_visit(basic))
        {
-               if(basic1->kind!=basic.kind || basic1->size!=basic.size)
+               if(basic1->kind!=basic.kind || basic1->size!=basic.size || basic1->sign!=basic.sign)
                        r_result = false;
                else if(basic1->base_type && basic.base_type)
                        compare(*basic1->base_type, *basic.base_type);