Remove deprecated things related to vertex formats and arrays

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

diff --git a/source/core/vertexformat.h b/source/core/vertexformat.h
index 0dbde9f9a9be825247a366cb2246fae612d8c1b3..4c485b0423b9568a89b07b5ba164586b94dfa1fc 100644 (file)
--- a/source/core/vertexformat.h
+++ b/source/core/vertexformat.h
@@ -1,7 +1,6 @@
 #ifndef MSP_GL_VERTEXFORMAT_H_
 #define MSP_GL_VERTEXFORMAT_H_
 
-#include <msp/core/attributes.h>
 #include <msp/strings/lexicalcast.h>
 
 namespace Msp {
@@ -26,20 +25,19 @@ enum VertexAttribute
        COLOR4_FLOAT,
        NORMAL3 = 18,
        TANGENT3 = 26,
-       BINORMAL3 = 34,
-       GROUP1 = 40,
+       GROUP1 = 32,
        GROUP2,
        GROUP3,
        GROUP4,
-       WEIGHT1 = 48,
+       WEIGHT1 = 40,
        WEIGHT2,
        WEIGHT3,
        WEIGHT4,
-       TEXCOORD1 = 56,
+       TEXCOORD1 = 48,
        TEXCOORD2,
        TEXCOORD3,
        TEXCOORD4,
-       GENERIC1 = 88,
+       GENERIC1 = 80,
        GENERIC2,
        GENERIC3,
        GENERIC4,
@@ -49,8 +47,6 @@ enum VertexAttribute
        RAW_ATTRIB4
 };
 
-DEPRECATED typedef VertexAttribute VertexComponent;
-
 class VertexFormat
 {
 private:
@@ -78,12 +74,9 @@ public:
 inline VertexFormat operator,(VertexAttribute a1, VertexAttribute a2)
 { return (VertexFormat(a1), a2); }
 
-inline VertexFormat operator,(VertexAttribute a, unsigned i)
-{ return (VertexFormat(a), i); }
-
 VertexAttribute make_indexed_attribute(VertexAttribute, unsigned);
 
-DEPRECATED inline VertexAttribute make_indexed_component(VertexAttribute a, unsigned i)
+inline VertexAttribute operator,(VertexAttribute a, unsigned i)
 { return make_indexed_attribute(a, i); }
 
 inline unsigned get_attribute_semantic(unsigned char a)
@@ -92,15 +85,6 @@ inline unsigned get_attribute_semantic(unsigned char a)
 inline unsigned get_attribute_size(unsigned char a)
 { return (a&3)+1; }
 
-DEPRECATED inline unsigned get_component_type(unsigned char c)
-{ return get_attribute_semantic(c); }
-
-DEPRECATED inline unsigned get_component_size(unsigned char c)
-{ return get_attribute_size(c); }
-
-DEPRECATED inline unsigned get_stride(const VertexFormat &f)
-{ return f.stride(); }
-
 void operator>>(const LexicalConverter &, VertexAttribute &);
 
 } // namespace GL