Add support for uint types in GLSL

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

diff --git a/source/glsl/builtin.cpp b/source/glsl/builtin.cpp
index 670cfc2d9f4878b1d55abca1cf453adf8c628816..12602707db80ca5043b6582f5b6917422cb2f477 100644 (file)
--- a/source/glsl/builtin.cpp
+++ b/source/glsl/builtin.cpp
@@ -1,7 +1,6 @@
 #include <msp/gl/resources.h>
 #include <msp/io/seekable.h>
 #include "builtin.h"
-#include "generate.h"
 #include "parser.h"
 
 using namespace std;
@@ -10,6 +9,13 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
+void populate_types(Stage &stage)
+{
+       for(NodeList<Statement>::const_iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
+               if(TypeDeclaration *type = dynamic_cast<TypeDeclaration *>(i->get()))
+                       stage.types[type->name] = type;
+}
+
 Module *get_builtins_module()
 {
        static RefPtr<Module> builtins_module;
@@ -26,36 +32,46 @@ Module *get_builtins_module()
                Module *module = new Module(parser.parse(*io, "<builtin>", BUILTIN_SOURCE));
 
                NodeList<Statement> &shared_body = module->shared.content.body;
+               NodeList<Statement>::iterator insert_point = shared_body.begin();
 
                RefPtr<BasicTypeDeclaration> type = new BasicTypeDeclaration;
                type->source = BUILTIN_SOURCE;
                type->name = "void";
                type->kind = BasicTypeDeclaration::VOID;
-               shared_body.insert(shared_body.begin(), type);
+               shared_body.insert(insert_point, type);
 
                type = new BasicTypeDeclaration;
                type->source = BUILTIN_SOURCE;
                type->name = "bool";
+               type->size = 1;
                type->kind = BasicTypeDeclaration::BOOL;
-               shared_body.insert(shared_body.begin(), type);
+               shared_body.insert(insert_point, type);
 
                type = new BasicTypeDeclaration;
                type->source = BUILTIN_SOURCE;
                type->name = "int";
                type->size = 32;
                type->kind = BasicTypeDeclaration::INT;
-               shared_body.insert(shared_body.begin(), type);
+               shared_body.insert(insert_point, type);
+
+               type = new BasicTypeDeclaration;
+               type->source = BUILTIN_SOURCE;
+               type->name = "uint";
+               type->size = 32;
+               type->sign = false;
+               type->kind = BasicTypeDeclaration::INT;
+               shared_body.insert(insert_point, type);
 
                type = new BasicTypeDeclaration;
                type->source = BUILTIN_SOURCE;
                type->name = "float";
                type->size = 32;
                type->kind = BasicTypeDeclaration::FLOAT;
-               shared_body.insert(shared_body.begin(), type);
+               shared_body.insert(insert_point, type);
 
-               TypeResolver().apply(module->shared);
+               populate_types(module->shared);
                for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
-                       TypeResolver().apply(*i);
+                       populate_types(*i);
 
                builtins_module = module;
        }