diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-26 08:07:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-26 08:07:23 +0100 |
| commit | cec4285e4e6b06babf340165148ff8c31601b382 (patch) | |
| tree | 9e19864958826fb517b22ba224aa713307272687 /mesalib/src/mesa/vbo/vbo.h | |
| parent | 0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (diff) | |
| parent | 4042ec939a2cdc8473479c900871c4c8c0b4e818 (diff) | |
| download | vcxsrv-cec4285e4e6b06babf340165148ff8c31601b382.tar.gz vcxsrv-cec4285e4e6b06babf340165148ff8c31601b382.tar.bz2 vcxsrv-cec4285e4e6b06babf340165148ff8c31601b382.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xkeyboard-config mesa git update 26 nov 2013
Diffstat (limited to 'mesalib/src/mesa/vbo/vbo.h')
| -rw-r--r-- | mesalib/src/mesa/vbo/vbo.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mesalib/src/mesa/vbo/vbo.h b/mesalib/src/mesa/vbo/vbo.h index c4472e9c2..6e1a4aa1a 100644 --- a/mesalib/src/mesa/vbo/vbo.h +++ b/mesalib/src/mesa/vbo/vbo.h @@ -46,13 +46,16 @@ 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; + + GLsizeiptr indirect_offset; }; /* Would like to call this a "vbo_index_buffer", but this would be @@ -89,7 +92,8 @@ 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, + struct gl_buffer_object *indirect ); @@ -182,7 +186,8 @@ 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); |