diff options
| author | Marek Olšák <[email protected]> | 2012-04-10 06:00:17 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-04-24 01:39:22 +0200 |
| commit | e0773da1e897164ed7597437070e32b867734ee5 (patch) | |
| tree | 1653bdb8fab0d8e250f7fcc0ca225e7245043184 /src/gallium/drivers/r600/r600_pipe.c | |
| parent | 79eafc14ca70a684b4ea8b89723c1dad3e61eb3d (diff) | |
gallium: make user vertex buffers optional
This couldn't be split because it would break bisecting.
Summary:
* r300g,r600g: stop using u_vbuf
* r300g,r600g: also report that the FIXED vertex type is unsupported
* u_vbuf: refactor for use in the state tracker
* cso: wire up u_vbuf with cso_context
* st/mesa: conditionally install u_vbuf
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 7dfa2bfb3a7..062b94af720 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -192,9 +192,6 @@ static void r600_destroy_context(struct pipe_context *context) free(rctx->states[i]); } - if (rctx->vbuf_mgr) { - u_vbuf_destroy(rctx->vbuf_mgr); - } if (rctx->uploader) { u_upload_destroy(rctx->uploader); } @@ -216,7 +213,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void { struct r600_context *rctx = CALLOC_STRUCT(r600_context); struct r600_screen* rscreen = (struct r600_screen *)screen; - struct u_vbuf_caps vbuf_caps; if (rctx == NULL) return NULL; @@ -298,16 +294,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void rctx->ws->cs_set_flush_callback(rctx->cs, r600_flush_from_winsys, rctx); r600_emit_atom(rctx, &rctx->start_cs_cmd.atom); - u_vbuf_get_caps(screen, &vbuf_caps); - vbuf_caps.format_fixed32 = 0; - rctx->vbuf_mgr = u_vbuf_create(&rctx->context, &vbuf_caps, - 1024 * 1024, 256, - PIPE_BIND_VERTEX_BUFFER | - PIPE_BIND_INDEX_BUFFER | - PIPE_BIND_CONSTANT_BUFFER); - if (!rctx->vbuf_mgr) - goto fail; - rctx->uploader = u_upload_create(&rctx->context, 1024 * 1024, 256, PIPE_BIND_INDEX_BUFFER | PIPE_BIND_CONSTANT_BUFFER); |