X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Ftnl%2Ftnl.h;h=14e590501efe06a6b075a531bd1e3b1615337221;hb=784fdef4e7d6055eafe8a3e8e149a64d3ca5e5f6;hp=434bd7fcd95e9b5a1155a35a1acc8887fe01177d;hpb=ba1d921bdf7a15fcc4a4e3162ea6fe9810f233d6;p=mesa.git

diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h
index 434bd7fcd95..14e590501ef 100644
--- 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.
  *
@@ -17,12 +16,13 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * 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.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN 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.
  *
  * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Keith Whitwell <keithw@vmware.com>
  */
 
 #ifndef _TNL_H
@@ -30,7 +30,7 @@
 
 #include "main/glheader.h"
 
-struct gl_client_array;
+struct gl_vertex_array;
 struct gl_context;
 struct gl_program;
 
@@ -48,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.
  */
@@ -60,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
  */
@@ -76,27 +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,
-		     const struct gl_client_array *arrays[],
+_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 );
 
-extern void
-_mesa_load_tracked_matrices(struct gl_context *ctx);
+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]);