gallium/radeon: rename allocator_so_filled_size -> allocator_zeroed_memory

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index 870d5b8e5c8592b949768bb3cbcd6804134c3ef7..fa9f70d33badb33397c921f1c7572839715020ea 100644 (file)
--- 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 d6930040b93602e1681e3cf83f2585c804ddb23f..8072833204a81b3a89dd7c2f470eacd9153aaf46 100644 (file)
--- 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 24216dee5eb40711228d43c32175e97659e17187..eb818464c90aea3cecba1e4a774bf317d64aa6cf 100644 (file)
--- 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) {