gallivm: Add a lp_build_const_func_pointer() helper.

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

diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h
index 79f76655354b57da212f54923549c3a34f283cfe..2d01d9823ccbd69b0457f45cbc85843bdc021585 100644 (file)
--- a/src/mesa/vbo/vbo.h
+++ b/src/mesa/vbo/vbo.h
@@ -32,10 +32,14 @@
 #ifndef _VBO_H
 #define _VBO_H
 
-#include "main/mtypes.h"
+#include "main/glheader.h"
+
+struct gl_client_array;
+struct gl_context;
+struct gl_transform_feedback_object;
 
 struct _mesa_prim {
-   GLuint mode:8;
+   GLuint mode:8;    /**< GL_POINTS, GL_LINES, GL_QUAD_STRIP, etc */
    GLuint indexed:1;
    GLuint begin:1;
    GLuint end:1;
@@ -74,7 +78,8 @@ typedef void (*vbo_draw_func)( struct gl_context *ctx,
                               const struct _mesa_index_buffer *ib,
                               GLboolean index_bounds_valid,
                               GLuint min_index,
-                              GLuint max_index );
+                              GLuint max_index,
+                              struct gl_transform_feedback_object *tfb_vertcount );
 
 
 
@@ -117,16 +122,41 @@ void vbo_rebase_prims( struct gl_context *ctx,
                       GLuint min_index,
                       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_get_minmax_index(struct gl_context *ctx, const struct _mesa_prim *prim,
-                    const struct _mesa_index_buffer *ib,
-                    GLuint *min_index, GLuint *max_index);
+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_check_buffers_are_unmapped(struct gl_context *ctx);
+
+void vbo_bind_arrays(struct gl_context *ctx);
+
+size_t
+count_tessellated_primitives(const struct _mesa_prim *prim);
 
 void GLAPIENTRY
 _es_Color4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a);