From 2cfebffb491807a465a8e5f7daca582d8aefb829 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 29 Nov 2011 12:25:28 +0100 Subject: mesa git update 29 nov 2011 --- mesalib/src/mesa/vbo/vbo_attrib.h | 59 ++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 29 deletions(-) (limited to 'mesalib/src/mesa/vbo/vbo_attrib.h') diff --git a/mesalib/src/mesa/vbo/vbo_attrib.h b/mesalib/src/mesa/vbo/vbo_attrib.h index 0ae928f2a..c2f4e6ec8 100644 --- a/mesalib/src/mesa/vbo/vbo_attrib.h +++ b/mesalib/src/mesa/vbo/vbo_attrib.h @@ -60,43 +60,44 @@ enum { VBO_ATTRIB_TEX5 = 13, VBO_ATTRIB_TEX6 = 14, VBO_ATTRIB_TEX7 = 15, + VBO_ATTRIB_POINT_SIZE = 16, - VBO_ATTRIB_GENERIC0 = 16, /* Not used? */ - VBO_ATTRIB_GENERIC1 = 17, - VBO_ATTRIB_GENERIC2 = 18, - VBO_ATTRIB_GENERIC3 = 19, - VBO_ATTRIB_GENERIC4 = 20, - VBO_ATTRIB_GENERIC5 = 21, - VBO_ATTRIB_GENERIC6 = 22, - VBO_ATTRIB_GENERIC7 = 23, - VBO_ATTRIB_GENERIC8 = 24, - VBO_ATTRIB_GENERIC9 = 25, - VBO_ATTRIB_GENERIC10 = 26, - VBO_ATTRIB_GENERIC11 = 27, - VBO_ATTRIB_GENERIC12 = 28, - VBO_ATTRIB_GENERIC13 = 29, - VBO_ATTRIB_GENERIC14 = 30, - VBO_ATTRIB_GENERIC15 = 31, + VBO_ATTRIB_GENERIC0 = 17, /* Not used? */ + VBO_ATTRIB_GENERIC1 = 18, + VBO_ATTRIB_GENERIC2 = 19, + VBO_ATTRIB_GENERIC3 = 20, + VBO_ATTRIB_GENERIC4 = 21, + VBO_ATTRIB_GENERIC5 = 22, + VBO_ATTRIB_GENERIC6 = 23, + VBO_ATTRIB_GENERIC7 = 24, + VBO_ATTRIB_GENERIC8 = 25, + VBO_ATTRIB_GENERIC9 = 26, + VBO_ATTRIB_GENERIC10 = 27, + VBO_ATTRIB_GENERIC11 = 28, + VBO_ATTRIB_GENERIC12 = 29, + VBO_ATTRIB_GENERIC13 = 30, + VBO_ATTRIB_GENERIC14 = 31, + VBO_ATTRIB_GENERIC15 = 32, /* XXX: in the vertex program InputsRead flag, we alias * materials and generics and use knowledge about the program * (whether it is a fixed-function emulation) to * differentiate. Here we must keep them apart instead. */ - VBO_ATTRIB_MAT_FRONT_AMBIENT = 32, - VBO_ATTRIB_MAT_BACK_AMBIENT = 33, - VBO_ATTRIB_MAT_FRONT_DIFFUSE = 34, - VBO_ATTRIB_MAT_BACK_DIFFUSE = 35, - VBO_ATTRIB_MAT_FRONT_SPECULAR = 36, - VBO_ATTRIB_MAT_BACK_SPECULAR = 37, - VBO_ATTRIB_MAT_FRONT_EMISSION = 38, - VBO_ATTRIB_MAT_BACK_EMISSION = 39, - VBO_ATTRIB_MAT_FRONT_SHININESS = 40, - VBO_ATTRIB_MAT_BACK_SHININESS = 41, - VBO_ATTRIB_MAT_FRONT_INDEXES = 42, - VBO_ATTRIB_MAT_BACK_INDEXES = 43, + VBO_ATTRIB_MAT_FRONT_AMBIENT = 33, + VBO_ATTRIB_MAT_BACK_AMBIENT = 34, + VBO_ATTRIB_MAT_FRONT_DIFFUSE = 35, + VBO_ATTRIB_MAT_BACK_DIFFUSE = 36, + VBO_ATTRIB_MAT_FRONT_SPECULAR = 37, + VBO_ATTRIB_MAT_BACK_SPECULAR = 38, + VBO_ATTRIB_MAT_FRONT_EMISSION = 39, + VBO_ATTRIB_MAT_BACK_EMISSION = 40, + VBO_ATTRIB_MAT_FRONT_SHININESS = 41, + VBO_ATTRIB_MAT_BACK_SHININESS = 42, + VBO_ATTRIB_MAT_FRONT_INDEXES = 43, + VBO_ATTRIB_MAT_BACK_INDEXES = 44, - VBO_ATTRIB_MAX = 44 + VBO_ATTRIB_MAX = 45 }; #define VBO_ATTRIB_FIRST_MATERIAL VBO_ATTRIB_MAT_FRONT_AMBIENT -- cgit v1.2.3