OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virgl: texture_transfer_pool --> transfer_pool

Browse Source 
It's used for all types of resources.

Reviewed-by: Elie Tournier <elie.tournier@collabora.com>
This commit is contained in:
Gurchetan Singh
2018-11-30 08:58:27 -08:00
committed by Bas Nieuwenhuizen
parent d73a25f2c0
commit 6d13d1aadb
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/virgl/virgl_buffer.c
View File

@@ -62,7 +62,7 @@ static void *virgl_buffer_transfer_map(struct pipe_context *ctx,
if (doflushwait) if (doflushwait)
ctx->flush(ctx, NULL, 0); ctx->flush(ctx, NULL, 0);
trans = slab_alloc(&vctx->texture_transfer_pool); trans = slab_alloc(&vctx->transfer_pool);
if (!trans) if (!trans)
return NULL; return NULL;
@@ -113,7 +113,7 @@ static void virgl_buffer_transfer_unmap(struct pipe_context *ctx,
} }
} }
slab_free(&vctx->texture_transfer_pool, trans); slab_free(&vctx->transfer_pool, trans);
} }
static void virgl_buffer_transfer_flush_region(struct pipe_context *ctx, static void virgl_buffer_transfer_flush_region(struct pipe_context *ctx,

4
src/gallium/drivers/virgl/virgl_context.c
View File

@@ -1188,7 +1188,7 @@ virgl_context_destroy( struct pipe_context *ctx )
u_upload_destroy(vctx->uploader); u_upload_destroy(vctx->uploader);
util_primconvert_destroy(vctx->primconvert); util_primconvert_destroy(vctx->primconvert);
slab_destroy_child(&vctx->texture_transfer_pool); slab_destroy_child(&vctx->transfer_pool);
FREE(vctx); FREE(vctx);
} }
@@ -1330,7 +1330,7 @@ struct pipe_context *virgl_context_create(struct pipe_screen *pscreen,
virgl_init_so_functions(vctx); virgl_init_so_functions(vctx);
list_inithead(&vctx->to_flush_bufs); list_inithead(&vctx->to_flush_bufs);
slab_create_child(&vctx->texture_transfer_pool, &rs->texture_transfer_pool); slab_create_child(&vctx->transfer_pool, &rs->transfer_pool);
vctx->primconvert = util_primconvert_create(&vctx->base, rs->caps.caps.v1.prim_mask); vctx->primconvert = util_primconvert_create(&vctx->base, rs->caps.caps.v1.prim_mask);
vctx->uploader = u_upload_create(&vctx->base, 1024 * 1024, vctx->uploader = u_upload_create(&vctx->base, 1024 * 1024,

2
src/gallium/drivers/virgl/virgl_context.h
View File

@@ -58,7 +58,7 @@ struct virgl_context {
struct pipe_framebuffer_state framebuffer; struct pipe_framebuffer_state framebuffer;
struct slab_child_pool texture_transfer_pool; struct slab_child_pool transfer_pool;
struct u_upload_mgr *uploader; struct u_upload_mgr *uploader;

4
src/gallium/drivers/virgl/virgl_screen.c
View File

@@ -743,7 +743,7 @@ virgl_destroy_screen(struct pipe_screen *screen)
struct virgl_screen *vscreen = virgl_screen(screen); struct virgl_screen *vscreen = virgl_screen(screen);
struct virgl_winsys *vws = vscreen->vws; struct virgl_winsys *vws = vscreen->vws;
slab_destroy_parent(&vscreen->texture_transfer_pool); slab_destroy_parent(&vscreen->transfer_pool);
if (vws) if (vws)
vws->destroy(vws); vws->destroy(vws);
@@ -783,7 +783,7 @@ virgl_create_screen(struct virgl_winsys *vws)
screen->refcnt = 1; screen->refcnt = 1;
slab_create_parent(&screen->texture_transfer_pool, sizeof(struct virgl_transfer), 16); slab_create_parent(&screen->transfer_pool, sizeof(struct virgl_transfer), 16);
return &screen->base; return &screen->base;
} }

2
src/gallium/drivers/virgl/virgl_screen.h
View File

@@ -43,7 +43,7 @@ struct virgl_screen {
struct virgl_drm_caps caps; struct virgl_drm_caps caps;
struct slab_parent_pool texture_transfer_pool; struct slab_parent_pool transfer_pool;
uint32_t sub_ctx_id; uint32_t sub_ctx_id;
}; };

6
src/gallium/drivers/virgl/virgl_texture.c
View File

@@ -144,7 +144,7 @@ static void *virgl_texture_transfer_map(struct pipe_context *ctx,
if (doflushwait) if (doflushwait)
ctx->flush(ctx, NULL, 0); ctx->flush(ctx, NULL, 0);
trans = slab_alloc(&vctx->texture_transfer_pool); trans = slab_alloc(&vctx->transfer_pool);
if (!trans) if (!trans)
return NULL; return NULL;
@@ -196,7 +196,7 @@ static void *virgl_texture_transfer_map(struct pipe_context *ctx,
ptr = vs->vws->resource_map(vs->vws, hw_res); ptr = vs->vws->resource_map(vs->vws, hw_res);
if (!ptr) { if (!ptr) {
slab_free(&vctx->texture_transfer_pool, trans); slab_free(&vctx->transfer_pool, trans);
return NULL; return NULL;
} }
@@ -237,7 +237,7 @@ static void virgl_texture_transfer_unmap(struct pipe_context *ctx,
if (trans->resolve_tmp) if (trans->resolve_tmp)
pipe_resource_reference((struct pipe_resource **)&trans->resolve_tmp, NULL); pipe_resource_reference((struct pipe_resource **)&trans->resolve_tmp, NULL);
slab_free(&vctx->texture_transfer_pool, trans); slab_free(&vctx->transfer_pool, trans);
} }