Rename size to array_size in Program variable info structs

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

diff --git a/source/core/program.h b/source/core/program.h
index 9fa757479eacf11d09ca7880bbab83daeb74c6db..33413eb01da23eb035fa0fc04e1fc5c488d7c323 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"
 
@@ -64,10 +65,10 @@ public:
                std::string name;
                const UniformBlockInfo *block;
                unsigned location;
-               unsigned size;
+               unsigned array_size;
                unsigned array_stride;
                unsigned matrix_stride;
-               GLenum type;
+               DataType type;
        };
 
        struct UniformBlockInfo
@@ -83,8 +84,8 @@ public:
        {
                std::string name;
                unsigned location;
-               unsigned size;
-               GLenum type;
+               unsigned array_size;
+               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();