X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fdatatype.h;h=1620dc58933d7fe1b5f9ae130ab7bff7fa104c11;hb=052b85720688900bc36f8844a94269cb1c0cdd52;hp=6bc085276c05f3b05c83708df45a4be74b01ffa0;hpb=096481bcb88844ec28fd33147ed5010bfe2e15d9;p=libs%2Fgl.git

diff --git a/source/core/datatype.h b/source/core/datatype.h
index 6bc08527..1620dc58 100644
--- a/source/core/datatype.h
+++ b/source/core/datatype.h
@@ -1,7 +1,8 @@
 #ifndef MSP_GL_DATATYPE_H_
 #define MSP_GL_DATATYPE_H_
 
-#include "gl.h"
+#include <msp/linal/matrix.h>
+#include <msp/linal/vector.h>
 
 namespace Msp {
 namespace GL {
@@ -91,11 +92,48 @@ enum DataType
 };
 
 inline unsigned get_type_size(DataType t) { return t&0xFF; }
-inline bool is_matrix(DataType t) { return (t>>14)&3; }
-inline bool is_vector(DataType t) { return !is_matrix(t) && ((t>>12)&3); }
+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); }
+inline bool is_image(DataType t) { return t&0x70000; }
 
-GLenum get_gl_type(DataType);
-DataType from_gl_type(GLenum);
+inline DataType get_matrix_column_type(DataType t)
+{
+	unsigned cols = ((t&0xC000)>>14)+1;
+	return static_cast<DataType>((t&~0xC0FF) | (get_type_size(t)/cols));
+}
+
+inline DataType get_element_type(DataType t)
+{
+	unsigned elems = (((t&0xC000)>>14)+1)*(((t&0x3000)>>12)+1);
+	return static_cast<DataType>((t&~0xC0FF) | (get_type_size(t)/elems));
+}
+
+template<typename T> struct TypeTraits;
+template<> struct TypeTraits<bool> { static const DataType type = BOOL; };
+template<> struct TypeTraits<char> { static const DataType type = BYTE; };
+template<> struct TypeTraits<unsigned char> { static const DataType type = UNSIGNED_BYTE; };
+template<> struct TypeTraits<short> { static const DataType type = SHORT; };
+template<> struct TypeTraits<unsigned short> { static const DataType type = UNSIGNED_SHORT; };
+template<> struct TypeTraits<int> { static const DataType type = INT; };
+template<> struct TypeTraits<unsigned> { static const DataType type = UNSIGNED_INT; };
+template<> struct TypeTraits<float> { static const DataType type = FLOAT; };
+template<> struct TypeTraits<double> { static const DataType type = DOUBLE; };
+
+template<typename T, unsigned N>
+struct TypeTraits<LinAl::Vector<T, N>>
+{
+	static const DataType type = static_cast<DataType>((TypeTraits<T>::type&0xF00) | ((TypeTraits<T>::type&0xFF)*N) | ((N-1)<<12));
+};
+
+template<typename T, unsigned N, unsigned M>
+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));
+};
+
+unsigned get_gl_type(DataType);
+DataType from_gl_type(unsigned);
 
 void require_type(DataType);