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:
parent
13acf2b243
commit
562c4a17b7
|
@ -58,7 +58,7 @@ static struct pipe_query *r300_create_query(struct pipe_context *pipe,
|
||||||
else
|
else
|
||||||
q->num_pipes = r300screen->info.r300_num_gb_pipes;
|
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);
|
RADEON_DOMAIN_GTT, 0);
|
||||||
if (!q->buf) {
|
if (!q->buf) {
|
||||||
FREE(q);
|
FREE(q);
|
||||||
|
|
|
@ -904,7 +904,7 @@ static boolean r300_render_allocate_vertices(struct vbuf_render* render,
|
||||||
|
|
||||||
r300->vbo = rws->buffer_create(rws,
|
r300->vbo = rws->buffer_create(rws,
|
||||||
MAX2(R300_MAX_DRAW_VBO_SIZE, size),
|
MAX2(R300_MAX_DRAW_VBO_SIZE, size),
|
||||||
R300_BUFFER_ALIGNMENT, TRUE,
|
R300_BUFFER_ALIGNMENT,
|
||||||
RADEON_DOMAIN_GTT, 0);
|
RADEON_DOMAIN_GTT, 0);
|
||||||
if (!r300->vbo) {
|
if (!r300->vbo) {
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
|
@ -102,7 +102,7 @@ r300_buffer_transfer_map( struct pipe_context *context,
|
||||||
|
|
||||||
/* Create a new one in the same pipe_resource. */
|
/* Create a new one in the same pipe_resource. */
|
||||||
new_buf = r300->rws->buffer_create(r300->rws, rbuf->b.b.width0,
|
new_buf = r300->rws->buffer_create(r300->rws, rbuf->b.b.width0,
|
||||||
R300_BUFFER_ALIGNMENT, TRUE,
|
R300_BUFFER_ALIGNMENT,
|
||||||
rbuf->domain, 0);
|
rbuf->domain, 0);
|
||||||
if (new_buf) {
|
if (new_buf) {
|
||||||
/* Discard the old buffer. */
|
/* Discard the old buffer. */
|
||||||
|
@ -183,7 +183,7 @@ struct pipe_resource *r300_buffer_create(struct pipe_screen *screen,
|
||||||
|
|
||||||
rbuf->buf =
|
rbuf->buf =
|
||||||
r300screen->rws->buffer_create(r300screen->rws, rbuf->b.b.width0,
|
r300screen->rws->buffer_create(r300screen->rws, rbuf->b.b.width0,
|
||||||
R300_BUFFER_ALIGNMENT, TRUE,
|
R300_BUFFER_ALIGNMENT,
|
||||||
rbuf->domain, 0);
|
rbuf->domain, 0);
|
||||||
if (!rbuf->buf) {
|
if (!rbuf->buf) {
|
||||||
FREE(rbuf);
|
FREE(rbuf);
|
||||||
|
|
|
@ -1047,7 +1047,7 @@ r300_texture_create_object(struct r300_screen *rscreen,
|
||||||
|
|
||||||
/* Create the backing buffer if needed. */
|
/* Create the backing buffer if needed. */
|
||||||
if (!tex->buf) {
|
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);
|
tex->domain, 0);
|
||||||
|
|
||||||
if (!tex->buf) {
|
if (!tex->buf) {
|
||||||
|
|
|
@ -176,7 +176,6 @@ bool r600_init_resource(struct r600_common_screen *rscreen,
|
||||||
|
|
||||||
/* Allocate a new resource. */
|
/* Allocate a new resource. */
|
||||||
new_buf = rscreen->ws->buffer_create(rscreen->ws, size, alignment,
|
new_buf = rscreen->ws->buffer_create(rscreen->ws, size, alignment,
|
||||||
true,
|
|
||||||
res->domains, flags);
|
res->domains, flags);
|
||||||
if (!new_buf) {
|
if (!new_buf) {
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -185,7 +185,7 @@ void rvid_join_surfaces(struct radeon_winsys* ws,
|
||||||
/* TODO: 2D tiling workaround */
|
/* TODO: 2D tiling workaround */
|
||||||
alignment *= 2;
|
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)
|
if (!pb)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -451,7 +451,6 @@ struct radeon_winsys {
|
||||||
struct pb_buffer *(*buffer_create)(struct radeon_winsys *ws,
|
struct pb_buffer *(*buffer_create)(struct radeon_winsys *ws,
|
||||||
uint64_t size,
|
uint64_t size,
|
||||||
unsigned alignment,
|
unsigned alignment,
|
||||||
boolean use_reusable_pool,
|
|
||||||
enum radeon_bo_domain domain,
|
enum radeon_bo_domain domain,
|
||||||
enum radeon_bo_flag flags);
|
enum radeon_bo_flag flags);
|
||||||
|
|
||||||
|
|
|
@ -456,7 +456,6 @@ static struct pb_buffer *
|
||||||
amdgpu_bo_create(struct radeon_winsys *rws,
|
amdgpu_bo_create(struct radeon_winsys *rws,
|
||||||
uint64_t size,
|
uint64_t size,
|
||||||
unsigned alignment,
|
unsigned alignment,
|
||||||
boolean use_reusable_pool,
|
|
||||||
enum radeon_bo_domain domain,
|
enum radeon_bo_domain domain,
|
||||||
enum radeon_bo_flag flags)
|
enum radeon_bo_flag flags)
|
||||||
{
|
{
|
||||||
|
@ -481,13 +480,10 @@ amdgpu_bo_create(struct radeon_winsys *rws,
|
||||||
usage |= 1 << (flags + 3);
|
usage |= 1 << (flags + 3);
|
||||||
|
|
||||||
/* Get a buffer from the cache. */
|
/* Get a buffer from the cache. */
|
||||||
if (use_reusable_pool) {
|
bo = (struct amdgpu_winsys_bo*)
|
||||||
bo = (struct amdgpu_winsys_bo*)
|
pb_cache_reclaim_buffer(&ws->bo_cache, size, alignment, usage);
|
||||||
pb_cache_reclaim_buffer(&ws->bo_cache, size, alignment,
|
if (bo)
|
||||||
usage);
|
return &bo->base;
|
||||||
if (bo)
|
|
||||||
return &bo->base;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Create a new one. */
|
/* Create a new one. */
|
||||||
bo = amdgpu_create_bo(ws, size, alignment, usage, domain, flags);
|
bo = amdgpu_create_bo(ws, size, alignment, usage, domain, flags);
|
||||||
|
@ -499,7 +495,7 @@ amdgpu_bo_create(struct radeon_winsys *rws,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
bo->use_reusable_pool = use_reusable_pool;
|
bo->use_reusable_pool = true;
|
||||||
return &bo->base;
|
return &bo->base;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -236,7 +236,7 @@ static bool amdgpu_get_new_ib(struct radeon_winsys *ws, struct amdgpu_ib *ib,
|
||||||
ib->used_ib_space = 0;
|
ib->used_ib_space = 0;
|
||||||
|
|
||||||
ib->big_ib_buffer = ws->buffer_create(ws, buffer_size,
|
ib->big_ib_buffer = ws->buffer_create(ws, buffer_size,
|
||||||
4096, true,
|
4096,
|
||||||
RADEON_DOMAIN_GTT,
|
RADEON_DOMAIN_GTT,
|
||||||
RADEON_FLAG_CPU_ACCESS);
|
RADEON_FLAG_CPU_ACCESS);
|
||||||
if (!ib->big_ib_buffer)
|
if (!ib->big_ib_buffer)
|
||||||
|
|
|
@ -720,7 +720,6 @@ static struct pb_buffer *
|
||||||
radeon_winsys_bo_create(struct radeon_winsys *rws,
|
radeon_winsys_bo_create(struct radeon_winsys *rws,
|
||||||
uint64_t size,
|
uint64_t size,
|
||||||
unsigned alignment,
|
unsigned alignment,
|
||||||
boolean use_reusable_pool,
|
|
||||||
enum radeon_bo_domain domain,
|
enum radeon_bo_domain domain,
|
||||||
enum radeon_bo_flag flags)
|
enum radeon_bo_flag flags)
|
||||||
{
|
{
|
||||||
|
@ -748,11 +747,9 @@ radeon_winsys_bo_create(struct radeon_winsys *rws,
|
||||||
assert(flags < sizeof(usage) * 8 - 3);
|
assert(flags < sizeof(usage) * 8 - 3);
|
||||||
usage |= 1 << (flags + 3);
|
usage |= 1 << (flags + 3);
|
||||||
|
|
||||||
if (use_reusable_pool) {
|
bo = radeon_bo(pb_cache_reclaim_buffer(&ws->bo_cache, size, alignment, usage));
|
||||||
bo = radeon_bo(pb_cache_reclaim_buffer(&ws->bo_cache, size, alignment, usage));
|
if (bo)
|
||||||
if (bo)
|
return &bo->base;
|
||||||
return &bo->base;
|
|
||||||
}
|
|
||||||
|
|
||||||
bo = radeon_create_bo(ws, size, alignment, usage, domain, flags);
|
bo = radeon_create_bo(ws, size, alignment, usage, domain, flags);
|
||||||
if (!bo) {
|
if (!bo) {
|
||||||
|
@ -763,7 +760,7 @@ radeon_winsys_bo_create(struct radeon_winsys *rws,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
bo->use_reusable_pool = use_reusable_pool;
|
bo->use_reusable_pool = true;
|
||||||
|
|
||||||
pipe_mutex_lock(ws->bo_handles_mutex);
|
pipe_mutex_lock(ws->bo_handles_mutex);
|
||||||
util_hash_table_set(ws->bo_handles, (void*)(uintptr_t)bo->handle, bo);
|
util_hash_table_set(ws->bo_handles, (void*)(uintptr_t)bo->handle, bo);
|
||||||
|
|
|
@ -638,7 +638,7 @@ radeon_cs_create_fence(struct radeon_winsys_cs *rcs)
|
||||||
struct pb_buffer *fence;
|
struct pb_buffer *fence;
|
||||||
|
|
||||||
/* Create a fence, which is a dummy BO. */
|
/* 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);
|
RADEON_DOMAIN_GTT, 0);
|
||||||
/* Add the fence as a dummy relocation. */
|
/* Add the fence as a dummy relocation. */
|
||||||
cs->ws->base.cs_add_buffer(rcs, fence,
|
cs->ws->base.cs_add_buffer(rcs, fence,
|
||||||
|
|
Loading…
Reference in New Issue