vbo: remove dead code in vbo_can_merge_prims

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

diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h
index 164477f3ac6fbaecc8bc94dfbce31c6d7f1e8061..17d668e386f8418423dc05fbe5bd1124f36ba9dd 100644 (file)
--- a/src/mesa/vbo/vbo.h
+++ b/src/mesa/vbo/vbo.h
@@ -33,52 +33,16 @@
 
 #include <stdbool.h>
 #include "main/glheader.h"
+#include "main/draw.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct gl_vertex_array;
 struct gl_context;
-struct gl_transform_feedback_object;
-
-struct _mesa_prim
-{
-   GLuint mode:8;    /**< GL_POINTS, GL_LINES, GL_QUAD_STRIP, etc */
-   GLuint indexed:1;
-   GLuint begin:1;
-   GLuint end:1;
-   GLuint weak:1;
-   GLuint no_current_update:1;
-   GLuint is_indirect:1;
-   GLuint pad:18;
-
-   GLuint start;
-   GLuint count;
-   GLint basevertex;
-   GLuint num_instances;
-   GLuint base_instance;
-   GLuint draw_id;
-
-   GLsizeiptr indirect_offset;
-};
-
-/* Would like to call this a "vbo_index_buffer", but this would be
- * confusing as the indices are not neccessarily yet in a non-null
- * buffer object.
- */
-struct _mesa_index_buffer
-{
-   GLuint count;
-   unsigned index_size;
-   struct gl_buffer_object *obj;
-   const void *ptr;
-};
-
-
 
 GLboolean
-_vbo_CreateContext(struct gl_context *ctx);
+_vbo_CreateContext(struct gl_context *ctx, bool use_buffer_objects);
 
 void
 _vbo_DestroyContext(struct gl_context *ctx);
@@ -104,7 +68,8 @@ void
 vbo_save_SaveFlushVertices(struct gl_context *ctx);
 
 void
-vbo_save_NotifyBegin(struct gl_context *ctx, GLenum mode);
+vbo_save_NotifyBegin(struct gl_context *ctx, GLenum mode,
+                     bool no_current_update);
 
 void
 vbo_save_NewList(struct gl_context *ctx, GLuint list, GLenum mode);
@@ -119,70 +84,6 @@ void
 vbo_save_EndCallList(struct gl_context *ctx);
 
 
-typedef void (*vbo_draw_func)(struct gl_context *ctx,
-                              const struct _mesa_prim *prims,
-                              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);
-
-
-typedef void (*vbo_indirect_draw_func)(
-   struct gl_context *ctx,
-   GLuint mode,
-   struct gl_buffer_object *indirect_data,
-   GLsizeiptr indirect_offset,
-   unsigned draw_count,
-   unsigned stride,
-   struct gl_buffer_object *indirect_params,
-   GLsizeiptr indirect_params_offset,
-   const struct _mesa_index_buffer *ib);
-
-
-
-
-/* Utility function to cope with various constraints on tnl modules or
- * hardware.  This can be used to split an incoming set of arrays and
- * primitives against the following constraints:
- *    - Maximum number of indices in index buffer.
- *    - Maximum number of vertices referenced by index buffer.
- *    - Maximum hardware vertex buffer size.
- */
-struct split_limits
-{
-   GLuint max_verts;
-   GLuint max_indices;
-   GLuint max_vb_size;         /* bytes */
-};
-
-
-void
-vbo_split_prims(struct gl_context *ctx,
-                const struct gl_vertex_array *arrays[],
-                const struct _mesa_prim *prim,
-                GLuint nr_prims,
-                const struct _mesa_index_buffer *ib,
-                GLuint min_index,
-                GLuint max_index,
-                vbo_draw_func draw,
-                const struct split_limits *limits);
-
-
-void
-vbo_rebase_prims(struct gl_context *ctx,
-                 const struct gl_vertex_array *arrays[],
-                 const struct _mesa_prim *prim,
-                 GLuint nr_prims,
-                 const struct _mesa_index_buffer *ib,
-                 GLuint min_index,
-                 GLuint max_index,
-                 vbo_draw_func draw);
-
-
 void
 vbo_delete_minmax_cache(struct gl_buffer_object *bufferObj);
 
@@ -191,19 +92,6 @@ vbo_get_minmax_indices(struct gl_context *ctx, const struct _mesa_prim *prim,
                        const struct _mesa_index_buffer *ib,
                        GLuint *min_index, GLuint *max_index, GLuint nr_prims);
 
-void
-vbo_use_buffer_objects(struct gl_context *ctx);
-
-void
-vbo_always_unmap_buffers(struct gl_context *ctx);
-
-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_sw_primitive_restart(struct gl_context *ctx,
                          const struct _mesa_prim *prim,
@@ -211,6 +99,15 @@ vbo_sw_primitive_restart(struct gl_context *ctx,
                          const struct _mesa_index_buffer *ib,
                          struct gl_buffer_object *indirect);
 
+
+const struct gl_array_attributes*
+_vbo_current_attrib(const struct gl_context *ctx, gl_vert_attrib attr);
+
+
+const struct gl_vertex_buffer_binding*
+_vbo_current_binding(const struct gl_context *ctx);
+
+
 void GLAPIENTRY
 _es_Color4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a);