Load VertexFormat for Mesh as an array of VertexComponents

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

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 018d21f00e5176a322b8cbe262da5d355b762bb1..9be98160b0bb0d23ef62358d150aa6e670d254d2 100644 (file)
--- a/source/vertexformat.h
+++ b/source/vertexformat.h
@@ -6,20 +6,23 @@
 namespace Msp {
 namespace GL {
 
+/** A single vertex component.  Nvidia drivers have aliasing between the
+fixed-functions and generic vertex attributes, despite the standard not
+allowing it.  We use the same attribute indices here to avoid problems. */
 enum VertexComponent
 {
        VERTEX2 = 1,
        VERTEX3,
        VERTEX4,
-       NORMAL3 = 6,
-       COLOR4_UBYTE = 8,
-       COLOR3_FLOAT = 10,
+       NORMAL3 = 10,
+       COLOR4_UBYTE = 12,
+       COLOR3_FLOAT = 14,
        COLOR4_FLOAT,
-       TEXCOORD1 = 12,
+       TEXCOORD1 = 32,
        TEXCOORD2,
        TEXCOORD3,
        TEXCOORD4,
-       ATTRIB1 = 44,
+       ATTRIB1 = 64,
        ATTRIB2,
        ATTRIB3,
        ATTRIB4
@@ -65,7 +68,6 @@ inline unsigned get_stride(const VertexFormat &f)
 { return f.stride(); }
 
 void operator>>(const LexicalConverter &, VertexComponent &);
-void operator>>(const LexicalConverter &, VertexFormat &);
 
 } // namespace GL
 } // namespace Msp