X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmesa%2Fvbo%2Fvbo_attrib.h;h=7b7d87af5e4059f39826be5cb17ff29a401fd8ff;hb=ab2b6317037cbe6746a3653d37562169e30c13da;hp=caedbd5ea69d5536cc1653653b5141752458b848;hpb=fd12b37dbada6f945a94b93ecf332d0b6a8eef06;p=mesa.git

diff --git a/src/mesa/vbo/vbo_attrib.h b/src/mesa/vbo/vbo_attrib.h
index caedbd5ea69..7b7d87af5e4 100644
--- a/src/mesa/vbo/vbo_attrib.h
+++ b/src/mesa/vbo/vbo_attrib.h
@@ -1,6 +1,6 @@
 /*
  Copyright (C) Intel Corp.  2006.  All Rights Reserved.
- Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
+ Intel funded Tungsten Graphics to
  develop this 3D driver.
  
  Permission is hereby granted, free of charge, to any person obtaining
@@ -26,7 +26,7 @@
  **********************************************************************/
  /*
   * Authors:
-  *   Keith Whitwell <keith@tungstengraphics.com>
+  *   Keith Whitwell <keithw@vmware.com>
   */
 
 #ifndef VBO_ATTRIB_H
@@ -60,72 +60,49 @@ 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
+#define VBO_ATTRIB_LAST_MATERIAL VBO_ATTRIB_MAT_BACK_INDEXES
 
 #define VBO_MAX_COPIED_VERTS 3
 
-struct _mesa_prim {
-   GLuint mode:8;
-   GLuint indexed:1;
-   GLuint begin:1;
-   GLuint end:1;
-   GLuint weak:1;
-   GLuint pad:20;
-
-   GLuint start;
-   GLuint count;
-};
-
-/* Would like to call this a "vbo_index_buffer", but this would be
- * confusing as the indices are not neccessarily yet in a non-null
- * buffer object.
- */
-struct _mesa_index_buffer {
-   GLuint count;
-   GLenum type;
-   struct gl_buffer_object *obj;
-   const void *ptr;
-   GLuint rebase;
-};
-
-
 #endif