diff options
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_primitive_restart.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c | 18 |
4 files changed, 12 insertions, 20 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index 92c57742d75..a8dd1572bac 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -1104,8 +1104,7 @@ brw_draw_prims(struct gl_context *ctx, GLuint min_index, GLuint max_index, struct gl_transform_feedback_object *gl_xfb_obj, - unsigned stream, - UNUSED struct gl_buffer_object *unused_indirect) + unsigned stream) { unsigned i; struct brw_context *brw = brw_context(ctx); @@ -1131,7 +1130,7 @@ brw_draw_prims(struct gl_context *ctx, _swsetup_Wakeup(ctx); _tnl_wakeup(ctx); _tnl_draw(ctx, prims, nr_prims, ib, - index_bounds_valid, min_index, max_index, NULL, 0, NULL); + index_bounds_valid, min_index, max_index, NULL, 0); return; } @@ -1234,8 +1233,7 @@ brw_draw_indirect_prims(struct gl_context *ctx, brw_draw_prims(ctx, prim, draw_count, ib, false, 0, ~0, - NULL, 0, - NULL); + NULL, 0); brw->draw.draw_indirect_data = NULL; free(prim); diff --git a/src/mesa/drivers/dri/i965/brw_draw.h b/src/mesa/drivers/dri/i965/brw_draw.h index 1e111fe7431..ddbf6238a17 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.h +++ b/src/mesa/drivers/dri/i965/brw_draw.h @@ -52,8 +52,7 @@ void brw_draw_prims(struct gl_context *ctx, GLuint min_index, GLuint max_index, struct gl_transform_feedback_object *unused_tfb_object, - unsigned stream, - struct gl_buffer_object *indirect ); + unsigned stream); void brw_init_draw_functions(struct dd_function_table *functions); void brw_draw_init( struct brw_context *brw ); diff --git a/src/mesa/drivers/dri/i965/brw_primitive_restart.c b/src/mesa/drivers/dri/i965/brw_primitive_restart.c index 4e4aeeb0a80..dfb9735ef29 100644 --- a/src/mesa/drivers/dri/i965/brw_primitive_restart.c +++ b/src/mesa/drivers/dri/i965/brw_primitive_restart.c @@ -162,8 +162,7 @@ brw_handle_primitive_restart(struct gl_context *ctx, /* Cut index should work for primitive restart, so use it */ brw->prim_restart.enable_cut_index = true; - brw_draw_prims(ctx, prims, nr_prims, ib, GL_FALSE, -1, -1, NULL, 0, - NULL); + brw_draw_prims(ctx, prims, nr_prims, ib, GL_FALSE, -1, -1, NULL, 0); brw->prim_restart.enable_cut_index = false; } else { /* Not all the primitive draw modes are supported by the cut index, diff --git a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c index 280c0ecc291..d365f7a531a 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c @@ -245,8 +245,7 @@ TAG(vbo_render_prims)(struct gl_context *ctx, GLboolean index_bounds_valid, GLuint min_index, GLuint max_index, struct gl_transform_feedback_object *tfb_vertcount, - unsigned stream, - struct gl_buffer_object *indirect); + unsigned stream); static GLboolean vbo_maybe_split(struct gl_context *ctx, const struct tnl_vertex_array *arrays, @@ -483,8 +482,7 @@ TAG(vbo_render_prims)(struct gl_context *ctx, GLboolean index_bounds_valid, GLuint min_index, GLuint max_index, struct gl_transform_feedback_object *tfb_vertcount, - unsigned stream, - struct gl_buffer_object *indirect) + unsigned stream) { struct nouveau_render_state *render = to_render_state(ctx); @@ -521,8 +519,7 @@ TAG(vbo_check_render_prims)(struct gl_context *ctx, GLboolean index_bounds_valid, GLuint min_index, GLuint max_index, struct gl_transform_feedback_object *tfb_vertcount, - unsigned stream, - struct gl_buffer_object *indirect) + unsigned stream) { struct nouveau_context *nctx = to_nouveau_context(ctx); @@ -531,12 +528,12 @@ TAG(vbo_check_render_prims)(struct gl_context *ctx, if (nctx->fallback == HWTNL) TAG(vbo_render_prims)(ctx, arrays, prims, nr_prims, ib, index_bounds_valid, min_index, max_index, - tfb_vertcount, stream, indirect); + tfb_vertcount, stream); if (nctx->fallback == SWTNL) _tnl_draw_prims(ctx, arrays, prims, nr_prims, ib, index_bounds_valid, min_index, max_index, - tfb_vertcount, stream, indirect); + tfb_vertcount, stream); } static void @@ -546,8 +543,7 @@ TAG(vbo_draw)(struct gl_context *ctx, GLboolean index_bounds_valid, GLuint min_index, GLuint max_index, struct gl_transform_feedback_object *tfb_vertcount, - unsigned stream, - struct gl_buffer_object *indirect) + unsigned stream) { /* Borrow and update the inputs list from the tnl context */ const struct tnl_vertex_array* arrays = _tnl_bind_inputs(ctx); @@ -555,7 +551,7 @@ TAG(vbo_draw)(struct gl_context *ctx, TAG(vbo_check_render_prims)(ctx, arrays, prims, nr_prims, ib, index_bounds_valid, min_index, max_index, - tfb_vertcount, stream, indirect); + tfb_vertcount, stream); } void |