X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fvertexformat.h;h=4c485b0423b9568a89b07b5ba164586b94dfa1fc;hp=e3c1205058fe3e889e6deea55d2d401c42ab7f24;hb=a3cc9f4469153396c7ad0868f3cbb2d2f698d710;hpb=a04e4054b3001d24a540a0e7b088d270f3e07c07 diff --git a/source/core/vertexformat.h b/source/core/vertexformat.h index e3c12050..4c485b04 100644 --- 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 #include namespace Msp { @@ -48,8 +47,6 @@ enum VertexAttribute RAW_ATTRIB4 }; -DEPRECATED typedef VertexAttribute VertexComponent; - class VertexFormat { private: @@ -82,24 +79,12 @@ VertexAttribute make_indexed_attribute(VertexAttribute, unsigned); inline VertexAttribute operator,(VertexAttribute a, unsigned i) { return make_indexed_attribute(a, i); } -DEPRECATED inline VertexAttribute make_indexed_component(VertexAttribute a, unsigned i) -{ return make_indexed_attribute(a, i); } - inline unsigned get_attribute_semantic(unsigned char a) { return a>>3; } 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