diff options
| author | Marek Olšák <[email protected]> | 2012-03-31 14:52:35 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-04-24 01:39:21 +0200 |
| commit | 5ec7c28fdbc2e05d20b1a07cba1fe6ac3b6658f9 (patch) | |
| tree | 02a8fde674e3b4c9ddb900b5d2ec044d4d850a38 /src/gallium/drivers | |
| parent | 889238c8b1e6b8ac5eed30ec3122be94216ca7cf (diff) | |
u_vbuf: override draw_vbo
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/r300/r300_render.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_state_common.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c index 84162bfa638..c0f5687d80a 100644 --- a/src/gallium/drivers/r300/r300_render.c +++ b/src/gallium/drivers/r300/r300_render.c @@ -754,7 +754,6 @@ static void r300_draw_vbo(struct pipe_context* pipe, } r300_update_derived_state(r300); - u_vbuf_draw_begin(r300->vbuf_mgr, &info); /* Draw. */ if (info.indexed) { @@ -763,7 +762,7 @@ static void r300_draw_vbo(struct pipe_context* pipe, if (!max_count) { fprintf(stderr, "r300: Skipping a draw command. There is a buffer " " which is too small to be used for rendering.\n"); - goto done; + return; } if (max_count == ~0) { @@ -795,9 +794,6 @@ static void r300_draw_vbo(struct pipe_context* pipe, r300_draw_arrays_instanced(r300, &info); } } - -done: - u_vbuf_draw_end(r300->vbuf_mgr); } /**************************************************************************** diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index a6fb6b81d83..6c02ed544c4 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -761,7 +761,6 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo) r600_update_derived_state(rctx); /* Update vertex buffers. */ - u_vbuf_draw_begin(rctx->vbuf_mgr, &info); if (rctx->vertex_buffers_dirty) { r600_inval_vertex_cache(rctx); rctx->vertex_buffer_state.num_dw = (rctx->chip_class >= EVERGREEN ? 12 : 10) * @@ -902,7 +901,6 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo) } pipe_resource_reference(&ib.buffer, NULL); - u_vbuf_draw_end(rctx->vbuf_mgr); } void _r600_pipe_state_add_reg_bo(struct r600_context *ctx, |