X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcore%2Fmodule.h;h=34553b44c0e239bfeccac39b873a61b4ea26333d;hb=3bc34893905a2df622894aadcb6669f27f186772;hp=2b632fab485e27fde131d83251ad6ff8519caa07;hpb=52335491d6e3b568f2b19bd0ec15c8d7b5f011da;p=libs%2Fgl.git

diff --git a/source/core/module.h b/source/core/module.h
index 2b632fab..34553b44 100644
--- a/source/core/module.h
+++ b/source/core/module.h
@@ -1,10 +1,11 @@
 #ifndef MSP_GL_MODULE_H_
 #define MSP_GL_MODULE_H_
 
+#include <map>
 #include <string>
+#include <vector>
 #include <msp/io/base.h>
 #include "datatype.h"
-#include "gl.h"
 #include "glsl/compiler.h"
 #include "glsl/sourcemap.h"
 
@@ -156,7 +157,7 @@ private:
 
 	struct Reflection
 	{
-		typedef std::vector<UInt32>::const_iterator CodeIterator;
+		typedef std::vector<std::uint32_t>::const_iterator CodeIterator;
 
 		std::map<unsigned, std::string> names;
 		std::map<unsigned, Constant> constants;
@@ -165,11 +166,11 @@ private:
 		std::map<unsigned, Structure> structs;
 		std::map<unsigned, Variable> variables;
 
-		static UInt32 get_opcode(UInt32);
+		static std::uint32_t get_opcode(std::uint32_t);
 		static CodeIterator get_op_end(const CodeIterator &);
 		static std::string read_string(CodeIterator &, const CodeIterator &);
 
-		void reflect_code(const std::vector<UInt32> &);
+		void reflect_code(const std::vector<std::uint32_t> &);
 		void reflect_name(CodeIterator);
 		void reflect_member_name(CodeIterator);
 		void reflect_entry_point(CodeIterator);
@@ -190,7 +191,7 @@ private:
 		void reflect_member_decorate(CodeIterator);
 	};
 
-	std::vector<UInt32> code;
+	std::vector<std::uint32_t> code;
 	std::vector<EntryPoint> entry_points;
 	std::vector<Structure> structs;
 	std::vector<Variable> variables;
@@ -212,7 +213,7 @@ private:
 	void reflect();
 
 public:
-	const std::vector<UInt32> &get_code() const { return code; }
+	const std::vector<std::uint32_t> &get_code() const { return code; }
 	const std::vector<EntryPoint> &get_entry_points() const { return entry_points; }
 	const std::vector<Variable> &get_variables() const { return variables; }
 	const std::vector<Constant> &get_spec_constants() const { return spec_constants; }