X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fvbo%2Fvbo.h;h=0007029996c5bfd5e2e91a91e8d1b35e803c7577;hb=a83f7e119cac2020100035d426927629ab666257;hp=08c67d67d43e395db3bd0c23459046e12e2edba8;hpb=3702d2508249bb264ab502c0093dbbc10b0b02fa;p=mesa.git diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h index 08c67d67d43..0007029996c 100644 --- a/src/mesa/vbo/vbo.h +++ b/src/mesa/vbo/vbo.h @@ -1,6 +1,5 @@ /* * mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * @@ -24,8 +23,7 @@ */ /** - * \file vbo_context.h - * \brief VBO builder module datatypes and definitions. + * \brief Public interface to the VBO module * \author Keith Whitwell */ @@ -36,7 +34,11 @@ #include #include "main/glheader.h" -struct gl_client_array; +#ifdef __cplusplus +extern "C" { +#endif + +struct gl_vertex_array; struct gl_context; struct gl_transform_feedback_object; @@ -47,13 +49,17 @@ struct _mesa_prim { GLuint end:1; GLuint weak:1; GLuint no_current_update:1; - GLuint pad:19; + 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 @@ -62,7 +68,7 @@ struct _mesa_prim { */ struct _mesa_index_buffer { GLuint count; - GLenum type; + unsigned index_size; struct gl_buffer_object *obj; const void *ptr; }; @@ -71,9 +77,14 @@ struct _mesa_index_buffer { GLboolean _vbo_CreateContext( struct gl_context *ctx ); void _vbo_DestroyContext( struct gl_context *ctx ); -void _vbo_InvalidateState( struct gl_context *ctx, GLuint new_state ); +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); @@ -82,6 +93,14 @@ void vbo_initialize_save_dispatch(const struct gl_context *ctx, struct _glapi_table *exec); +void vbo_exec_FlushVertices(struct gl_context *ctx, GLuint flags); +void vbo_save_SaveFlushVertices(struct gl_context *ctx); +void vbo_save_NotifyBegin(struct gl_context *ctx, GLenum mode); +void vbo_save_NewList(struct gl_context *ctx, GLuint list, GLenum mode); +void vbo_save_EndList(struct gl_context *ctx); +void vbo_save_BeginCallList(struct gl_context *ctx, struct gl_display_list *list); +void vbo_save_EndCallList(struct gl_context *ctx); + typedef void (*vbo_draw_func)( struct gl_context *ctx, const struct _mesa_prim *prims, @@ -90,7 +109,21 @@ typedef void (*vbo_draw_func)( struct gl_context *ctx, 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); + + +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); @@ -110,7 +143,7 @@ struct split_limits { void vbo_split_prims( struct gl_context *ctx, - const struct gl_client_array *arrays[], + const struct gl_vertex_array *arrays[], const struct _mesa_prim *prim, GLuint nr_prims, const struct _mesa_index_buffer *ib, @@ -120,13 +153,10 @@ 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_client_array *arrays[] ); -GLboolean vbo_any_varyings_in_vbos( const struct gl_client_array *arrays[] ); +GLboolean vbo_all_varyings_in_vbos( const struct gl_vertex_array *arrays[] ); void vbo_rebase_prims( struct gl_context *ctx, - const struct gl_client_array *arrays[], + const struct gl_vertex_array *arrays[], const struct _mesa_prim *prim, GLuint nr_prims, const struct _mesa_index_buffer *ib, @@ -134,22 +164,9 @@ 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); void vbo_get_minmax_indices(struct gl_context *ctx, const struct _mesa_prim *prim, @@ -162,28 +179,15 @@ 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 -vbo_count_tessellated_primitives(GLenum mode, GLuint count, - GLuint num_instances); - -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_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, GLuint nr_prims, - const struct _mesa_index_buffer *ib); + const struct _mesa_index_buffer *ib, + struct gl_buffer_object *indirect); void GLAPIENTRY _es_Color4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a); @@ -224,4 +228,8 @@ _es_VertexAttrib3fv(GLuint indx, const GLfloat* values); void GLAPIENTRY _es_VertexAttrib4fv(GLuint indx, const GLfloat* values); +#ifdef __cplusplus +} // extern "C" +#endif + #endif