fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-06 18:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gallium/radeon: rename allocator_so_filled_size -> allocator_zeroed_memory

Browse source 
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
This commit is contained in:
Marek Olšák 2016-05-31 19:11:54 +02:00
parent ada3d8f31e
commit ee0c96c11e
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/drivers/radeon/r600_pipe_common.c
View file

@ -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);
}

2
src/gallium/drivers/radeon/r600_pipe_common.h
View file

@ -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. */

2
src/gallium/drivers/radeon/r600_streamout.c
View file

@ -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) {