X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fvbo%2Fvbo.h;h=0007029996c5bfd5e2e91a91e8d1b35e803c7577;hb=a83f7e119cac2020100035d426927629ab666257;hp=c1c3e0ea84c31c0e4d55cf91da440d7bc00e24c5;hpb=a152cb7492b6ff2bc56f8c82879d703c8b99a880;p=mesa.git

diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h
index c1c3e0ea84c..0007029996c 100644
--- a/src/mesa/vbo/vbo.h
+++ b/src/mesa/vbo/vbo.h
@@ -23,8 +23,7 @@
  */
 
 /**
- * \file vbo_context.h
- * \brief VBO builder module datatypes and definitions.
+ * \brief Public interface to the VBO module
  * \author Keith Whitwell
  */
 
@@ -80,6 +79,12 @@ GLboolean _vbo_CreateContext( struct gl_context *ctx );
 void _vbo_DestroyContext( struct gl_context *ctx );
 
 
+void
+vbo_exec_invalidate_state(struct gl_context *ctx);
+
+void
+_vbo_install_exec_vtxfmt(struct gl_context *ctx);
+
 void
 vbo_initialize_exec_dispatch(const struct gl_context *ctx,
                              struct _glapi_table *exec);
@@ -148,10 +153,7 @@ void vbo_split_prims( struct gl_context *ctx,
 		      const struct split_limits *limits );
 
 
-/* Helpers for dealing translating away non-zero min_index.
- */
 GLboolean vbo_all_varyings_in_vbos( const struct gl_vertex_array *arrays[] );
-GLboolean vbo_any_varyings_in_vbos( const struct gl_vertex_array *arrays[] );
 
 void vbo_rebase_prims( struct gl_context *ctx,
 		       const struct gl_vertex_array *arrays[],
@@ -162,22 +164,6 @@ void vbo_rebase_prims( struct gl_context *ctx,
 		       GLuint max_index,
 		       vbo_draw_func draw );
 
-static inline int
-vbo_sizeof_ib_type(GLenum type)
-{
-   switch (type) {
-   case GL_UNSIGNED_INT:
-      return sizeof(GLuint);
-   case GL_UNSIGNED_SHORT:
-      return sizeof(GLushort);
-   case GL_UNSIGNED_BYTE:
-      return sizeof(GLubyte);
-   default:
-      assert(!"unsupported index data type");
-      /* In case assert is turned off */
-      return 0;
-   }
-}
 
 void
 vbo_delete_minmax_cache(struct gl_buffer_object *bufferObj);
@@ -196,15 +182,6 @@ void vbo_set_draw_func(struct gl_context *ctx, vbo_draw_func func);
 void vbo_set_indirect_draw_func(struct gl_context *ctx,
                                 vbo_indirect_draw_func func);
 
-void
-vbo_try_prim_conversion(struct _mesa_prim *p);
-
-bool
-vbo_can_merge_prims(const struct _mesa_prim *p0, const struct _mesa_prim *p1);
-
-void
-vbo_merge_prims(struct _mesa_prim *p0, const struct _mesa_prim *p1);
-
 void
 vbo_sw_primitive_restart(struct gl_context *ctx,
                          const struct _mesa_prim *prim,