Tweak the comma operator between VertexAttribute and unsigned

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

diff --git a/source/core/vertexformat.h b/source/core/vertexformat.h
index 93794c353cafcb24027253ac2491cf59ef6e731b..e3c1205058fe3e889e6deea55d2d401c42ab7f24 100644 (file)
--- a/source/core/vertexformat.h
+++ b/source/core/vertexformat.h
@@ -26,13 +26,19 @@ enum VertexAttribute
        COLOR4_FLOAT,
        NORMAL3 = 18,
        TANGENT3 = 26,
-       BINORMAL3 = 34,
-       // Attributes 5 and 6 reserved for vertex groups and weights
-       TEXCOORD1 = 56,
+       GROUP1 = 32,
+       GROUP2,
+       GROUP3,
+       GROUP4,
+       WEIGHT1 = 40,
+       WEIGHT2,
+       WEIGHT3,
+       WEIGHT4,
+       TEXCOORD1 = 48,
        TEXCOORD2,
        TEXCOORD3,
        TEXCOORD4,
-       GENERIC1 = 88,
+       GENERIC1 = 80,
        GENERIC2,
        GENERIC3,
        GENERIC4,
@@ -71,11 +77,11 @@ 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);
 
+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); }