diff options
author | Marek Olšák <[email protected]> | 2016-10-24 23:26:39 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2016-10-26 13:02:58 +0200 |
commit | 29144d0f34d9325a3549e4ed0feecc0577c70358 (patch) | |
tree | f73d8c2fea2d28c967f02883f75592a627cdf218 /src/gallium/drivers/radeonsi | |
parent | e3c3a7fadaf87f68b5d8053d21d8c986a90dec30 (diff) |
gallium/radeon: stop using PIPE_BIND_CUSTOM
it has no effect whatsoever
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi')
-rw-r--r-- | src/gallium/drivers/radeonsi/si_hw_context.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 5 | ||||
-rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.h | 3 | ||||
-rw-r--r-- | src/gallium/drivers/radeonsi/si_pm4.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/radeonsi/si_state_shaders.c | 9 |
5 files changed, 9 insertions, 12 deletions
diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c index 7c11bafcb29..87ba31659b0 100644 --- a/src/gallium/drivers/radeonsi/si_hw_context.c +++ b/src/gallium/drivers/radeonsi/si_hw_context.c @@ -159,7 +159,7 @@ void si_begin_new_cs(struct si_context *ctx) /* Create a buffer used for writing trace IDs and initialize it to 0. */ assert(!ctx->trace_buf); ctx->trace_buf = (struct r600_resource*) - pipe_buffer_create(ctx->b.b.screen, PIPE_BIND_CUSTOM, + pipe_buffer_create(ctx->b.b.screen, 0, PIPE_USAGE_STAGING, 4); if (ctx->trace_buf) pipe_buffer_write_nooverlap(&ctx->b.b, &ctx->trace_buf->b.b, diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index ccd7f3fdcdd..bf3b442dbcc 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -202,8 +202,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, sctx->ce_suballocator = u_suballocator_create(&sctx->b.b, 1024 * 1024, - PIPE_BIND_CUSTOM, - PIPE_USAGE_DEFAULT, false); + 0, PIPE_USAGE_DEFAULT, false); if (!sctx->ce_suballocator) goto fail; } @@ -217,7 +216,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, goto fail; sctx->border_color_buffer = (struct r600_resource*) - pipe_buffer_create(screen, PIPE_BIND_CUSTOM, PIPE_USAGE_DEFAULT, + pipe_buffer_create(screen, 0, PIPE_USAGE_DEFAULT, SI_MAX_BORDER_COLORS * sizeof(*sctx->border_color_table)); if (!sctx->border_color_buffer) diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index 8fc5fcc370f..6b74e496db6 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -406,8 +406,7 @@ si_resource_create_custom(struct pipe_screen *screen, unsigned usage, unsigned size) { assert(size); - return r600_resource(pipe_buffer_create(screen, - PIPE_BIND_CUSTOM, usage, size)); + return r600_resource(pipe_buffer_create(screen, 0, usage, size)); } static inline void diff --git a/src/gallium/drivers/radeonsi/si_pm4.c b/src/gallium/drivers/radeonsi/si_pm4.c index 386d0935e83..97b6799f361 100644 --- a/src/gallium/drivers/radeonsi/si_pm4.c +++ b/src/gallium/drivers/radeonsi/si_pm4.c @@ -190,7 +190,7 @@ void si_pm4_upload_indirect_buffer(struct si_context *sctx, r600_resource_reference(&state->indirect_buffer, NULL); state->indirect_buffer = (struct r600_resource*) - pipe_buffer_create(screen, PIPE_BIND_CUSTOM, + pipe_buffer_create(screen, 0, PIPE_USAGE_DEFAULT, aligned_ndw * 4); if (!state->indirect_buffer) return; diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index f59bfcd7d41..3037a04b03c 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -1730,7 +1730,7 @@ static bool si_update_gs_ring_buffers(struct si_context *sctx) if (update_esgs) { pipe_resource_reference(&sctx->esgs_ring, NULL); - sctx->esgs_ring = pipe_buffer_create(sctx->b.b.screen, PIPE_BIND_CUSTOM, + sctx->esgs_ring = pipe_buffer_create(sctx->b.b.screen, 0, PIPE_USAGE_DEFAULT, esgs_ring_size); if (!sctx->esgs_ring) @@ -1739,7 +1739,7 @@ static bool si_update_gs_ring_buffers(struct si_context *sctx) if (update_gsvs) { pipe_resource_reference(&sctx->gsvs_ring, NULL); - sctx->gsvs_ring = pipe_buffer_create(sctx->b.b.screen, PIPE_BIND_CUSTOM, + sctx->gsvs_ring = pipe_buffer_create(sctx->b.b.screen, 0, PIPE_USAGE_DEFAULT, gsvs_ring_size); if (!sctx->gsvs_ring) @@ -2008,7 +2008,7 @@ static void si_init_tess_factor_ring(struct si_context *sctx) } assert(!sctx->tf_ring); - sctx->tf_ring = pipe_buffer_create(sctx->b.b.screen, PIPE_BIND_CUSTOM, + sctx->tf_ring = pipe_buffer_create(sctx->b.b.screen, 0, PIPE_USAGE_DEFAULT, 32768 * sctx->screen->b.info.max_se); if (!sctx->tf_ring) @@ -2016,8 +2016,7 @@ static void si_init_tess_factor_ring(struct si_context *sctx) assert(((sctx->tf_ring->width0 / 4) & C_030938_SIZE) == 0); - sctx->tess_offchip_ring = pipe_buffer_create(sctx->b.b.screen, - PIPE_BIND_CUSTOM, + sctx->tess_offchip_ring = pipe_buffer_create(sctx->b.b.screen, 0, PIPE_USAGE_DEFAULT, max_offchip_buffers * sctx->screen->tess_offchip_block_dw_size * 4); |