X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=33413eb01da23eb035fa0fc04e1fc5c488d7c323;hb=7c069241318b7133ac2df65ee13cb1d2968c5974;hp=9fa757479eacf11d09ca7880bbab83daeb74c6db;hpb=c93e0613e96ec6817e26b533e90dc49d45787941;p=libs%2Fgl.git

diff --git a/source/core/program.h b/source/core/program.h
index 9fa75747..33413eb0 100644
--- 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();