Changes for new vbo-building module.

	- Removed all the old immediate, array and display list code.
	- Remove references to the old array_cache module.
	- Added a _tnl_draw_prims() entrypoint.
	- Added a simplified data import facility for converting
non-floating point data as required.

Checkpoint commit - trivial/tri works.

1 files changed, 13 insertions, 17 deletions

diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h
index dab422429a1..17cb30adc76 100644
--- a/src/mesa/tnl/tnl.h
+++ b/src/mesa/tnl/tnl.h
@@ -50,30 +50,14 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state );
  * dispatch and/or driver callbacks.
  */
 
-/* Restore just the ctx->Exec table:
- */
-extern void
-_tnl_wakeup_exec( GLcontext *ctx );
-
-/* Restore both ctx->Exec and ctx->Save:
- */
 extern void
-_tnl_wakeup_save_exec( GLcontext *ctx );
+_tnl_wakeup( GLcontext *ctx );
 
 /* Driver configuration options:
  */
 extern void
 _tnl_need_projected_coords( GLcontext *ctx, GLboolean flag );
 
-extern void
-_tnl_need_dlist_loopback( GLcontext *ctx, GLboolean flag );
-
-extern void
-_tnl_need_dlist_norm_lengths( GLcontext *ctx, GLboolean flag );
-
-extern void
-_tnl_isolate_materials( GLcontext *ctx, GLboolean flag );
-
 
 /* Control whether T&L does per-vertex fog
  */
@@ -86,4 +70,16 @@ _tnl_allow_pixel_fog( GLcontext *ctx, GLboolean value );
 extern void
 _tnl_program_string(GLcontext *ctx, GLenum target, struct gl_program *program);
 
+struct _mesa_prim;
+struct _mesa_index_buffer;
+
+void
+_tnl_draw_prims( GLcontext *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);
+
 #endif