diff options
author | marha <marha@users.sourceforge.net> | 2013-11-26 08:05:44 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-26 08:05:44 +0100 |
commit | 4042ec939a2cdc8473479c900871c4c8c0b4e818 (patch) | |
tree | cdf43e2577d3aaf53cfeda1ccf49bdb6eaa09677 /mesalib/src/mesa/tnl | |
parent | a473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (diff) | |
download | vcxsrv-4042ec939a2cdc8473479c900871c4c8c0b4e818.tar.gz vcxsrv-4042ec939a2cdc8473479c900871c4c8c0b4e818.tar.bz2 vcxsrv-4042ec939a2cdc8473479c900871c4c8c0b4e818.zip |
xkeyboard-config mesa git update 26 nov 2013
xkeyboard-config commit aaf4edebf7de3c2b5188a4f25a8901d274ea3400
mesa commit ddc77c5092b6f782327a7014b320f31f5f4e8e93
Diffstat (limited to 'mesalib/src/mesa/tnl')
-rw-r--r-- | mesalib/src/mesa/tnl/t_draw.c | 3 | ||||
-rw-r--r-- | mesalib/src/mesa/tnl/tnl.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/tnl/t_draw.c b/mesalib/src/mesa/tnl/t_draw.c index 637ac6f9c..d6b09005e 100644 --- a/mesalib/src/mesa/tnl/t_draw.c +++ b/mesalib/src/mesa/tnl/t_draw.c @@ -415,7 +415,8 @@ void _tnl_vbo_draw_prims(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) { const struct gl_client_array **arrays = ctx->Array._DrawArrays; diff --git a/mesalib/src/mesa/tnl/tnl.h b/mesalib/src/mesa/tnl/tnl.h index 162b7abd7..86ef5057e 100644 --- a/mesalib/src/mesa/tnl/tnl.h +++ b/mesalib/src/mesa/tnl/tnl.h @@ -92,7 +92,8 @@ _tnl_vbo_draw_prims( 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 ); extern void _tnl_RasterPos(struct gl_context *ctx, const GLfloat vObj[4]); |