fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: pass indirect buffer to sw primitive restart

Browse source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Chris Forbes 2013-10-13 20:56:42 +13:00
parent 803fcc3298
commit 3953766e57
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_primitive_restart.c
View file

@ -176,7 +176,7 @@ brw_handle_primitive_restart(struct gl_context *ctx,
/* Not all the primitive draw modes are supported by the cut index,
* so take the software path
*/
vbo_sw_primitive_restart(ctx, prims, nr_prims, ib);
vbo_sw_primitive_restart(ctx, prims, nr_prims, ib, indirect);
}
brw->prim_restart.in_progress = false;

3
src/mesa/vbo/vbo.h
View file

@ -186,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);

2
src/mesa/vbo/vbo_exec_array.c
View file

@ -579,7 +579,7 @@ vbo_handle_primitive_restart(struct gl_context *ctx,
ctx->Const.PrimitiveRestartInSoftware &&
ctx->Array._PrimitiveRestart) {
/* Handle primitive restart in software */
vbo_sw_primitive_restart(ctx, prim, nr_prims, ib);
vbo_sw_primitive_restart(ctx, prim, nr_prims, ib, NULL);
} else {
/* Call driver directly for draw_prims */
vbo->draw_prims(ctx, prim, nr_prims, ib,

3
src/mesa/vbo/vbo_primitive_restart.c
View file

@ -163,7 +163,8 @@ void
vbo_sw_primitive_restart(struct gl_context *ctx,
const struct _mesa_prim *prims,
GLuint nr_prims,
const struct _mesa_index_buffer *ib)
const struct _mesa_index_buffer *ib,
struct gl_buffer_object *indirect)
{
GLuint prim_num;
struct sub_primitive *sub_prims;