Fixed MAXFIFO_S4. Removed WAIT_IDLE_EMPTY from savage_BCI_swap which resulted

[mesa.git] / src / mesa / array_cache / ac_context.h

diff --git a/src/mesa/array_cache/ac_context.h b/src/mesa/array_cache/ac_context.h
index 986c9b8e234d5e65d9f7b5cfaa3cd49cb3a86c42..36aded3152c4e55b05baa4493c6d41e9623aa4e0 100644 (file)
--- a/src/mesa/array_cache/ac_context.h
+++ b/src/mesa/array_cache/ac_context.h
@@ -1,11 +1,9 @@
 
-/* $Id: ac_context.h,v 1.2 2001/02/04 00:47:28 keithw Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  5.1
  *
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +22,8 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * Author:
- *    Keith Whitwell <keithw@valinux.com>
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
 #ifndef _AC_CONTEXT_H
@@ -46,8 +44,9 @@ struct ac_arrays {
    struct gl_client_array SecondaryColor;
    struct gl_client_array FogCoord;
    struct gl_client_array Index;
-   struct gl_client_array TexCoord[MAX_TEXTURE_UNITS];
+   struct gl_client_array TexCoord[MAX_TEXTURE_COORD_UNITS];
    struct gl_client_array EdgeFlag;
+   struct gl_client_array Attrib[VERT_ATTRIB_MAX];  /* GL_NV_vertex_program */
 };
 
 struct ac_array_pointers {
@@ -57,8 +56,9 @@ struct ac_array_pointers {
    struct gl_client_array *SecondaryColor;
    struct gl_client_array *FogCoord;
    struct gl_client_array *Index;
-   struct gl_client_array *TexCoord[MAX_TEXTURE_UNITS];
+   struct gl_client_array *TexCoord[MAX_TEXTURE_COORD_UNITS];
    struct gl_client_array *EdgeFlag;
+   struct gl_client_array *Attrib[VERT_ATTRIB_MAX];  /* GL_NV_vertex_program */
 };
 
 struct ac_array_flags {
@@ -68,8 +68,9 @@ struct ac_array_flags {
    GLboolean SecondaryColor;
    GLboolean FogCoord;
    GLboolean Index;
-   GLboolean TexCoord[MAX_TEXTURE_UNITS];
+   GLboolean TexCoord[MAX_TEXTURE_COORD_UNITS];
    GLboolean EdgeFlag;
+   GLboolean Attrib[VERT_ATTRIB_MAX];  /* GL_NV_vertex_program */
 };
 
 
@@ -85,7 +86,7 @@ typedef struct {
    struct ac_array_flags IsCached;
    GLuint start;
    GLuint count;
-   
+
    /* Facility for importing element lists:
     */
    GLuint *Elts;