diff options
author | Marek Olšák <[email protected]> | 2017-01-27 00:12:37 +0100 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2017-02-14 21:46:16 +0100 |
commit | 55ad59d2b72d6d6e38bd0a54586b713a7a93bb10 (patch) | |
tree | eb46201b7ce87773e0199399a75a469c389f3dc7 /src/gallium/drivers/vc4/vc4_context.c | |
parent | 998396c32e4e95fef5a1efef6cb1a9efb0868aa6 (diff) |
gallium: set pipe_context uploaders in drivers (v3)
Notes:
- make sure the default size is large enough to handle all state trackers
- pipe wrappers don't receive transfer calls from stream_uploader, because
pipe_context::stream_uploader points directly to the underlying driver's
stream_uploader (to keep it simple for now)
v2: add error handling to nv50, nvc0, noop
v3: set const_uploader
Reviewed-by: Nicolai Hähnle <[email protected]>
Tested-by: Edmondo Tommasina <[email protected]> (v1)
Tested-by: Charmaine Lee <[email protected]>
Diffstat (limited to 'src/gallium/drivers/vc4/vc4_context.c')
-rw-r--r-- | src/gallium/drivers/vc4/vc4_context.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gallium/drivers/vc4/vc4_context.c b/src/gallium/drivers/vc4/vc4_context.c index 974df8a1da2..401c160fcc2 100644 --- a/src/gallium/drivers/vc4/vc4_context.c +++ b/src/gallium/drivers/vc4/vc4_context.c @@ -144,7 +144,12 @@ vc4_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags) vc4->fd = screen->fd; slab_create_child(&vc4->transfer_pool, &screen->transfer_pool); - vc4->blitter = util_blitter_create(pctx); + + vc4->uploader = u_upload_create_default(&vc4->base); + vc4->base.stream_uploader = vc4->uploader; + vc4->base.const_uploader = vc4->uploader; + + vc4->blitter = util_blitter_create(pctx); if (!vc4->blitter) goto fail; @@ -153,10 +158,6 @@ vc4_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags) if (!vc4->primconvert) goto fail; - vc4->uploader = u_upload_create(pctx, 16 * 1024, - PIPE_BIND_INDEX_BUFFER, - PIPE_USAGE_STREAM); - vc4_debug |= saved_shaderdb_flag; vc4->sample_mask = (1 << VC4_MAX_SAMPLES) - 1; |