tnl: Push down the gl_vertex_array inputs into tnl drivers.

[mesa.git] / src / mesa / tnl / tnl.h

diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h
index d67a3a71dfed34bff85bcd783b3f7fac683e54ae..14e590501efe06a6b075a531bd1e3b1615337221 100644 (file)
--- a/src/mesa/tnl/tnl.h
+++ b/src/mesa/tnl/tnl.h
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
  *
  * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
@@ -23,7 +22,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Keith Whitwell <keithw@vmware.com>
  */
 
 #ifndef _TNL_H
@@ -31,7 +30,7 @@
 
 #include "main/glheader.h"
 
-struct gl_client_array;
+struct gl_vertex_array;
 struct gl_context;
 struct gl_program;
 
@@ -49,6 +48,9 @@ _tnl_DestroyContext( struct gl_context *ctx );
 extern void
 _tnl_InvalidateState( struct gl_context *ctx, GLuint new_state );
 
+extern void
+_tnl_init_driver_draw_function(struct dd_function_table *functions);
+
 /* Functions to revive the tnl module after being unhooked from
  * dispatch and/or driver callbacks.
  */
@@ -61,6 +63,9 @@ _tnl_wakeup( struct gl_context *ctx );
 extern void
 _tnl_need_projected_coords( struct gl_context *ctx, GLboolean flag );
 
+extern void
+_tnl_bind_inputs( struct gl_context *ctx );
+
 
 /* Control whether T&L does per-vertex fog
  */
@@ -77,23 +82,24 @@ struct _mesa_prim;
 struct _mesa_index_buffer;
 
 void
-_tnl_draw_prims( struct gl_context *ctx,
-                const struct gl_client_array *arrays[],
-                const struct _mesa_prim *prim,
-                GLuint nr_prims,
-                const struct _mesa_index_buffer *ib,
-                GLuint min_index,
-                GLuint max_index);
-
-void
-_tnl_vbo_draw_prims( struct gl_context *ctx,
+_tnl_draw_prims(struct gl_context *ctx,
                     const struct _mesa_prim *prim,
                     GLuint nr_prims,
                     const struct _mesa_index_buffer *ib,
                     GLboolean index_bounds_valid,
                     GLuint min_index,
                     GLuint max_index,
-                    struct gl_transform_feedback_object *tfb_vertcount );
+                    struct gl_transform_feedback_object *tfb_vertcount,
+                     unsigned stream,
+                    struct gl_buffer_object *indirect );
+
+void
+_tnl_draw(struct gl_context *ctx,
+          const struct _mesa_prim *prim, GLuint nr_prims,
+          const struct _mesa_index_buffer *ib,
+          GLboolean index_bounds_valid, GLuint min_index, GLuint max_index,
+          struct gl_transform_feedback_object *tfb_vertcount, unsigned stream,
+          struct gl_buffer_object *indirect);
 
 extern void
 _tnl_RasterPos(struct gl_context *ctx, const GLfloat vObj[4]);