X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexformat.h;h=95e9b2c5bc42fd299283201ffa6a8c725697fb57;hp=018d21f00e5176a322b8cbe262da5d355b762bb1;hb=40c364b04084d11573a9ff9f7be6f1c4cc521f4b;hpb=c4fa55619539de9045167250d5b1c13d1827cf7a diff --git a/source/vertexformat.h b/source/vertexformat.h index 018d21f0..95e9b2c5 100644 --- 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