diff options
| author | Marek Olšák <[email protected]> | 2016-05-31 19:11:54 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-06-04 15:42:33 +0200 |
| commit | ee0c96c11eb3bee5010e5a22ff18d51cd948c075 (patch) | |
| tree | 775bf39aefdaded256aaa6ce0bc9ce2413d9b46f /src/gallium | |
| parent | ada3d8f31ef3aeeb73d6d365738a2d1968ced596 (diff) | |
gallium/radeon: rename allocator_so_filled_size -> allocator_zeroed_memory
Reviewed-by: Alex Deucher <[email protected]>
Tested-by: Grazvydas Ignotas <[email protected]>
Tested-by: Dieter Nützel <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.c | 8 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_streamout.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index 870d5b8e5c8..fa9f70d33ba 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -369,10 +369,10 @@ bool r600_common_context_init(struct r600_common_context *rctx, r600_query_init(rctx); cayman_init_msaa(&rctx->b); - rctx->allocator_so_filled_size = + rctx->allocator_zeroed_memory = u_suballocator_create(&rctx->b, rscreen->info.gart_page_size, 0, PIPE_USAGE_DEFAULT, TRUE); - if (!rctx->allocator_so_filled_size) + if (!rctx->allocator_zeroed_memory) return false; rctx->uploader = u_upload_create(&rctx->b, 1024 * 1024, @@ -410,8 +410,8 @@ void r600_common_context_cleanup(struct r600_common_context *rctx) util_slab_destroy(&rctx->pool_transfers); - if (rctx->allocator_so_filled_size) { - u_suballocator_destroy(rctx->allocator_so_filled_size); + if (rctx->allocator_zeroed_memory) { + u_suballocator_destroy(rctx->allocator_zeroed_memory); } rctx->ws->fence_reference(&rctx->last_sdma_fence, NULL); } diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index d6930040b93..8072833204a 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -471,7 +471,7 @@ struct r600_common_context { unsigned last_dirty_tex_descriptor_counter; struct u_upload_mgr *uploader; - struct u_suballocator *allocator_so_filled_size; + struct u_suballocator *allocator_zeroed_memory; struct util_slab_mempool pool_transfers; /* Current unaccounted memory usage. */ diff --git a/src/gallium/drivers/radeon/r600_streamout.c b/src/gallium/drivers/radeon/r600_streamout.c index 24216dee5eb..eb818464c90 100644 --- a/src/gallium/drivers/radeon/r600_streamout.c +++ b/src/gallium/drivers/radeon/r600_streamout.c @@ -46,7 +46,7 @@ r600_create_so_target(struct pipe_context *ctx, return NULL; } - u_suballocator_alloc(rctx->allocator_so_filled_size, 4, 4, + u_suballocator_alloc(rctx->allocator_zeroed_memory, 4, 4, &t->buf_filled_size_offset, (struct pipe_resource**)&t->buf_filled_size); if (!t->buf_filled_size) { |