KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

winsys/radeon: remove use_reusable_pool parameter from buffer_create 

All callers set this parameter to true.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle 2016-04-22 22:58:38 -05:00
parent 13acf2b243
commit 562c4a17b7
11 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/r300/r300_query.c
View File

@ -58,7 +58,7 @@ static struct pipe_query *r300_create_query(struct pipe_context *pipe,
else
q->num_pipes = r300screen->info.r300_num_gb_pipes;
q->buf = r300->rws->buffer_create(r300->rws, 4096, 4096, TRUE,
q->buf = r300->rws->buffer_create(r300->rws, 4096, 4096,
RADEON_DOMAIN_GTT, 0);
if (!q->buf) {
FREE(q);

2
src/gallium/drivers/r300/r300_render.c
View File

@ -904,7 +904,7 @@ static boolean r300_render_allocate_vertices(struct vbuf_render* render,
r300->vbo = rws->buffer_create(rws,
MAX2(R300_MAX_DRAW_VBO_SIZE, size),
R300_BUFFER_ALIGNMENT, TRUE,
R300_BUFFER_ALIGNMENT,
RADEON_DOMAIN_GTT, 0);
if (!r300->vbo) {
return FALSE;

4
src/gallium/drivers/r300/r300_screen_buffer.c
View File

@ -102,7 +102,7 @@ r300_buffer_transfer_map( struct pipe_context *context,
/* Create a new one in the same pipe_resource. */
new_buf = r300->rws->buffer_create(r300->rws, rbuf->b.b.width0,
R300_BUFFER_ALIGNMENT, TRUE,
R300_BUFFER_ALIGNMENT,
rbuf->domain, 0);
if (new_buf) {
/* Discard the old buffer. */
@ -183,7 +183,7 @@ struct pipe_resource *r300_buffer_create(struct pipe_screen *screen,
rbuf->buf =
r300screen->rws->buffer_create(r300screen->rws, rbuf->b.b.width0,
R300_BUFFER_ALIGNMENT, TRUE,
R300_BUFFER_ALIGNMENT,
rbuf->domain, 0);
if (!rbuf->buf) {
FREE(rbuf);

2
src/gallium/drivers/r300/r300_texture.c
View File

@ -1047,7 +1047,7 @@ r300_texture_create_object(struct r300_screen *rscreen,
/* Create the backing buffer if needed. */
if (!tex->buf) {
tex->buf = rws->buffer_create(rws, tex->tex.size_in_bytes, 2048, TRUE,
tex->buf = rws->buffer_create(rws, tex->tex.size_in_bytes, 2048,
tex->domain, 0);
if (!tex->buf) {

1
src/gallium/drivers/radeon/r600_buffer_common.c
View File

@ -176,7 +176,6 @@ bool r600_init_resource(struct r600_common_screen *rscreen,
/* Allocate a new resource. */
new_buf = rscreen->ws->buffer_create(rscreen->ws, size, alignment,
true,
res->domains, flags);
if (!new_buf) {
return false;

2
src/gallium/drivers/radeon/radeon_video.c
View File

@ -185,7 +185,7 @@ void rvid_join_surfaces(struct radeon_winsys* ws,
/* TODO: 2D tiling workaround */
alignment *= 2;
pb = ws->buffer_create(ws, size, alignment, TRUE, RADEON_DOMAIN_VRAM, 0);
pb = ws->buffer_create(ws, size, alignment, RADEON_DOMAIN_VRAM, 0);
if (!pb)
return;

1
src/gallium/drivers/radeon/radeon_winsys.h
View File

@ -451,7 +451,6 @@ struct radeon_winsys {
struct pb_buffer *(*buffer_create)(struct radeon_winsys *ws,
uint64_t size,
unsigned alignment,
boolean use_reusable_pool,
enum radeon_bo_domain domain,
enum radeon_bo_flag flags);

14
src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
View File

@ -456,7 +456,6 @@ static struct pb_buffer *
amdgpu_bo_create(struct radeon_winsys *rws,
uint64_t size,
unsigned alignment,
boolean use_reusable_pool,
enum radeon_bo_domain domain,
enum radeon_bo_flag flags)
{
@ -481,13 +480,10 @@ amdgpu_bo_create(struct radeon_winsys *rws,
usage |= 1 << (flags + 3);
/* Get a buffer from the cache. */
if (use_reusable_pool) {
bo = (struct amdgpu_winsys_bo*)
pb_cache_reclaim_buffer(&ws->bo_cache, size, alignment,
usage);
if (bo)
return &bo->base;
}
bo = (struct amdgpu_winsys_bo*)
pb_cache_reclaim_buffer(&ws->bo_cache, size, alignment, usage);
if (bo)
return &bo->base;
/* Create a new one. */
bo = amdgpu_create_bo(ws, size, alignment, usage, domain, flags);
@ -499,7 +495,7 @@ amdgpu_bo_create(struct radeon_winsys *rws,
return NULL;
}
bo->use_reusable_pool = use_reusable_pool;
bo->use_reusable_pool = true;
return &bo->base;
}

2
src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
View File

@ -236,7 +236,7 @@ static bool amdgpu_get_new_ib(struct radeon_winsys *ws, struct amdgpu_ib *ib,
ib->used_ib_space = 0;
ib->big_ib_buffer = ws->buffer_create(ws, buffer_size,
4096, true,
4096,
RADEON_DOMAIN_GTT,
RADEON_FLAG_CPU_ACCESS);
if (!ib->big_ib_buffer)

11
src/gallium/winsys/radeon/drm/radeon_drm_bo.c
View File

@ -720,7 +720,6 @@ static struct pb_buffer *
radeon_winsys_bo_create(struct radeon_winsys *rws,
uint64_t size,
unsigned alignment,
boolean use_reusable_pool,
enum radeon_bo_domain domain,
enum radeon_bo_flag flags)
{
@ -748,11 +747,9 @@ radeon_winsys_bo_create(struct radeon_winsys *rws,
assert(flags < sizeof(usage) * 8 - 3);
usage |= 1 << (flags + 3);
if (use_reusable_pool) {
bo = radeon_bo(pb_cache_reclaim_buffer(&ws->bo_cache, size, alignment, usage));
if (bo)
return &bo->base;
}
bo = radeon_bo(pb_cache_reclaim_buffer(&ws->bo_cache, size, alignment, usage));
if (bo)
return &bo->base;
bo = radeon_create_bo(ws, size, alignment, usage, domain, flags);
if (!bo) {
@ -763,7 +760,7 @@ radeon_winsys_bo_create(struct radeon_winsys *rws,
return NULL;
}
bo->use_reusable_pool = use_reusable_pool;
bo->use_reusable_pool = true;
pipe_mutex_lock(ws->bo_handles_mutex);
util_hash_table_set(ws->bo_handles, (void*)(uintptr_t)bo->handle, bo);

2
src/gallium/winsys/radeon/drm/radeon_drm_cs.c
View File

@ -638,7 +638,7 @@ radeon_cs_create_fence(struct radeon_winsys_cs *rcs)
struct pb_buffer *fence;
/* Create a fence, which is a dummy BO. */
fence = cs->ws->base.buffer_create(&cs->ws->base, 1, 1, TRUE,
fence = cs->ws->base.buffer_create(&cs->ws->base, 1, 1,
RADEON_DOMAIN_GTT, 0);
/* Add the fence as a dummy relocation. */
cs->ws->base.cs_add_buffer(rcs, fence,