X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fdatatype.h;h=a03b6bda99162f3dd6a59a8facd52c0886b59775;hb=be6ffe96ecb4707599fe1a6f620c348760213d46;hp=a911561358c2c845d529f44e67aa090e49639f77;hpb=4e20afbda6adb0008e286bf7fb947438aeb7a97e;p=libs%2Fgl.git

diff --git a/source/core/datatype.h b/source/core/datatype.h
index a9115613..a03b6bda 100644
--- a/source/core/datatype.h
+++ b/source/core/datatype.h
@@ -3,7 +3,6 @@
 
 #include <msp/linal/matrix.h>
 #include <msp/linal/vector.h>
-#include "gl.h"
 
 namespace Msp {
 namespace GL {
@@ -92,7 +91,7 @@ enum DataType
 	SAMPLER_CUBE_ARRAY_SHADOW = 0x3C0304
 };
 
-inline unsigned get_type_size(DataType t) { return t&0xFF; }
+inline std::size_t get_type_size(DataType t) { return t&0xFF; }
 inline bool is_float(DataType t) { return t&0x200; }
 inline bool is_matrix(DataType t) { return t&0xC000; }
 inline bool is_vector(DataType t) { return !is_matrix(t) && (t&0x3000); }
@@ -133,9 +132,6 @@ struct TypeTraits<LinAl::Matrix<T, N, M>>
 	static const DataType type = static_cast<DataType>((TypeTraits<T>::type&0xF00) | ((TypeTraits<T>::type&0xFF)*N*M) | ((N-1)<<12) | ((M-1)<<14));
 };
 
-GLenum get_gl_type(DataType);
-DataType from_gl_type(GLenum);
-
 void require_type(DataType);
 
 } // namespace GL