Use DataType instead of GLenum for Program variable types

[libs/gl.git] / source / core / program.h

diff --git a/source/core/program.h b/source/core/program.h
index 9fa757479eacf11d09ca7880bbab83daeb74c6db..40c1d320f861e81d662ec2aa8e118e3191a5c602 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -5,6 +5,7 @@
 #include <vector>
 #include <msp/datafile/objectloader.h>
 #include "bindable.h"
+#include "datatype.h"
 #include "gl.h"
 #include "vertexformat.h"
 
@@ -67,7 +68,7 @@ public:
                unsigned size;
                unsigned array_stride;
                unsigned matrix_stride;
-               GLenum type;
+               DataType type;
        };
 
        struct UniformBlockInfo
@@ -84,7 +85,7 @@ public:
                std::string name;
                unsigned location;
                unsigned size;
-               GLenum type;
+               DataType type;
        };
 
        typedef std::map<std::string, UniformInfo> UniformMap;
@@ -137,7 +138,6 @@ public:
 
        void link();
 private:
-       static void require_type(GLenum);
        void query_uniforms();
        void query_uniform_blocks(const std::vector<UniformInfo *> &);
        void query_attributes();