X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fvertexformat.h;h=85d525f9571e90d276cff19e9928c9bfb9d1cc3e;hp=93794c353cafcb24027253ac2491cf59ef6e731b;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=68b74ce23dd20822b07d79dc25aa0a0a19ef27a5

diff --git a/source/core/vertexformat.h b/source/core/vertexformat.h
index 93794c35..85d525f9 100644
--- a/source/core/vertexformat.h
+++ b/source/core/vertexformat.h
@@ -1,8 +1,9 @@
 #ifndef MSP_GL_VERTEXFORMAT_H_
 #define MSP_GL_VERTEXFORMAT_H_
 
-#include <msp/core/attributes.h>
+#include <cstdint>
 #include <msp/strings/lexicalcast.h>
+#include "datatype.h"
 
 namespace Msp {
 namespace GL {
@@ -15,55 +16,81 @@ depends on implementation limits, but is at least five.
 
 RAW_ATTRIB is handled in a special way; creating an indexed attribute based on
 it uses the index as raw attribute number.  Only use it if you know what you
-are doing. */
+are doing.
+
+The values are bitfields laid as follows:
+
+nnnn nn_f gsss iccc
+      │ │ │  │ │  └╴Number of components
+      │ │ │  │ └───╴Integer attribute flag
+      │ │ │  └─────╴Size of one component
+      │ │ └────────╴Signed flag
+      │ └──────────╴Floating-point flag
+      └────────────╴Attribute index (semantic)
+
+This information is presented for internal documentation purposes only; it is
+inadvisable for programs to rely on it.
+*/
 enum VertexAttribute
 {
-	VERTEX2 = 1,
-	VERTEX3,
-	VERTEX4,
-	COLOR4_UBYTE = 8,
-	COLOR3_FLOAT = 10,
-	COLOR4_FLOAT,
-	NORMAL3 = 18,
-	TANGENT3 = 26,
-	BINORMAL3 = 34,
-	// Attributes 5 and 6 reserved for vertex groups and weights
-	TEXCOORD1 = 56,
-	TEXCOORD2,
-	TEXCOORD3,
-	TEXCOORD4,
-	GENERIC1 = 88,
-	GENERIC2,
-	GENERIC3,
-	GENERIC4,
-	RAW_ATTRIB1 = 248,
-	RAW_ATTRIB2,
-	RAW_ATTRIB3,
-	RAW_ATTRIB4
+	VERTEX2 = 0x01C2,
+	VERTEX3 = 0x01C3,
+	VERTEX4 = 0x01C4,
+	COLOR3 = 0x05C3,
+	COLOR4 = 0x05C4,
+	NORMAL3 = 0x09C3,
+	TANGENT3 = 0x0DC3,
+	GROUP1 = 0x10C9,
+	GROUP2 = 0x10CA,
+	GROUP3 = 0x10CB,
+	GROUP4 = 0x10CC,
+	WEIGHT1 = 0x15C1,
+	WEIGHT2 = 0x15C2,
+	WEIGHT3 = 0x15C3,
+	WEIGHT4 = 0x15C4,
+	TEXCOORD1 = 0x19C1,
+	TEXCOORD2 = 0x19C2,
+	TEXCOORD3 = 0x19C3,
+	TEXCOORD4 = 0x19C4,
+	GENERIC1 = 0x29C1,
+	GENERIC2 = 0x29C2,
+	GENERIC3 = 0x29C3,
+	GENERIC4 = 0x29C4,
+	GENERIC_I1 = 0x28C9,
+	GENERIC_I2 = 0x28CA,
+	GENERIC_I3 = 0x28CB,
+	GENERIC_I4 = 0x28CC,
+	RAW_ATTRIB1 = 0xFDC1,
+	RAW_ATTRIB2 = 0xFDC2,
+	RAW_ATTRIB3 = 0xFDC3,
+	RAW_ATTRIB4 = 0xFDC4,
+	RAW_ATTRIB_I1 = 0xFCC9,
+	RAW_ATTRIB_I2 = 0xFCCA,
+	RAW_ATTRIB_I3 = 0xFCCB,
+	RAW_ATTRIB_I4 = 0xFCCC
 };
 
-DEPRECATED typedef VertexAttribute VertexComponent;
-
 class VertexFormat
 {
 private:
 	enum { MAX_ATTRIBUTES = 15 };
 
-	unsigned char count;
-	unsigned char attributes[MAX_ATTRIBUTES];
+	std::uint8_t count;
+	std::uint16_t attributes[MAX_ATTRIBUTES];
 
 public:
 	VertexFormat();
 	VertexFormat(VertexAttribute);
 
 	VertexFormat operator,(VertexAttribute) const;
+	VertexFormat operator,(DataType) const;
 	VertexFormat operator,(unsigned) const;
 	bool operator==(const VertexFormat &) const;
 	bool operator!=(const VertexFormat &other) const { return !(*this==other); }
 
 	bool empty() const { return !count; }
-	const unsigned char *begin() const { return attributes; }
-	const unsigned char *end() const { return attributes+count; }
+	const std::uint16_t *begin() const { return attributes; }
+	const std::uint16_t *end() const { return attributes+count; }
 	unsigned stride() const;
 	int offset(VertexAttribute) const;
 };
@@ -71,28 +98,30 @@ 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_typed_attribute(VertexAttribute, DataType);
+
+inline VertexAttribute operator,(VertexAttribute a, DataType t)
+{ return make_typed_attribute(a, t); }
 
 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)
-{ return a>>3; }
+inline unsigned get_attribute_semantic(std::uint16_t a)
+{ return a>>10; }
 
-inline unsigned get_attribute_size(unsigned char a)
-{ return (a&3)+1; }
+inline DataType get_attribute_source_type(std::uint16_t a)
+{ return static_cast<DataType>((a&0x70)>>4 | (a&0x180)<<1); }
 
-DEPRECATED inline unsigned get_component_type(unsigned char c)
-{ return get_attribute_semantic(c); }
+inline unsigned get_attribute_component_count(std::uint16_t a)
+{ return a&7; }
 
-DEPRECATED inline unsigned get_component_size(unsigned char c)
-{ return get_attribute_size(c); }
+inline unsigned get_attribute_size(std::uint16_t a)
+{ return get_attribute_component_count(a)*get_type_size(get_attribute_source_type(a)); }
 
-DEPRECATED inline unsigned get_stride(const VertexFormat &f)
-{ return f.stride(); }
+inline bool is_integer_attribute(std::uint16_t a)
+{ return a&8; }
 
 void operator>>(const LexicalConverter &, VertexAttribute &);