X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexformat.h;h=4c343c99e60f2def0d13571213d71da5ddef132b;hb=79c49c6b6155857ed0ebe85eb07a996788a6190b;hp=018d21f00e5176a322b8cbe262da5d355b762bb1;hpb=c4fa55619539de9045167250d5b1c13d1827cf7a;p=libs%2Fgl.git

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 018d21f0..4c343c99 100644
--- a/source/vertexformat.h
+++ b/source/vertexformat.h
@@ -6,20 +6,25 @@
 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,
+	TANGENT3 = 18,
+	BINORMAL3 = 22,
+	TEXCOORD1 = 32,
 	TEXCOORD2,
 	TEXCOORD3,
 	TEXCOORD4,
-	ATTRIB1 = 44,
+	ATTRIB1 = 64,
 	ATTRIB2,
 	ATTRIB3,
 	ATTRIB4
@@ -65,7 +70,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