diff options
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_rasterpos.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_draw.c | 5 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_draw.h | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_draw_feedback.c | 3 |
4 files changed, 4 insertions, 9 deletions
diff --git a/src/mesa/state_tracker/st_cb_rasterpos.c b/src/mesa/state_tracker/st_cb_rasterpos.c index 44d1586ddb7..b6f22601f82 100644 --- a/src/mesa/state_tracker/st_cb_rasterpos.c +++ b/src/mesa/state_tracker/st_cb_rasterpos.c @@ -264,7 +264,7 @@ st_RasterPos(struct gl_context *ctx, const GLfloat v[4]) /* Draw the point. */ st_feedback_draw_vbo(ctx, &rs->prim, 1, NULL, GL_TRUE, 0, 1, - NULL, 0, NULL); + NULL, 0); /* restore draw's rasterization stage depending on rendermode */ if (ctx->RenderMode == GL_FEEDBACK) { diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index 3ff52b0a5e3..d0a27a01d26 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -173,8 +173,7 @@ st_draw_vbo(struct gl_context *ctx, GLuint min_index, GLuint max_index, struct gl_transform_feedback_object *tfb_vertcount, - unsigned stream, - struct gl_buffer_object *indirect) + unsigned stream) { struct st_context *st = st_context(ctx); struct pipe_draw_info info; @@ -235,8 +234,6 @@ st_draw_vbo(struct gl_context *ctx, } } - assert(!indirect); - /* do actual drawing */ for (i = 0; i < nr_prims; i++) { info.count = prims[i].count; diff --git a/src/mesa/state_tracker/st_draw.h b/src/mesa/state_tracker/st_draw.h index 5b897bda118..5c1dd033cd4 100644 --- a/src/mesa/state_tracker/st_draw.h +++ b/src/mesa/state_tracker/st_draw.h @@ -56,8 +56,7 @@ st_feedback_draw_vbo(struct gl_context *ctx, GLuint min_index, GLuint max_index, struct gl_transform_feedback_object *tfb_vertcount, - unsigned stream, - struct gl_buffer_object *indirect); + unsigned stream); /** * When drawing with VBOs, the addresses specified with diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c index 0b70a08a870..813a6388c79 100644 --- a/src/mesa/state_tracker/st_draw_feedback.c +++ b/src/mesa/state_tracker/st_draw_feedback.c @@ -101,8 +101,7 @@ st_feedback_draw_vbo(struct gl_context *ctx, GLuint min_index, GLuint max_index, struct gl_transform_feedback_object *tfb_vertcount, - unsigned stream, - struct gl_buffer_object *indirect) + unsigned stream) { struct st_context *st = st_context(ctx); struct pipe_context *pipe = st->pipe; |