Mesa (master): virgl: texture_transfer_pool --> transfer_pool
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Dec 19 12:34:10 UTC 2018
Module: Mesa
Branch: master
Commit: 6d13d1aadb3d70eaea7b67ee9ae2651c2b29fbda
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6d13d1aadb3d70eaea7b67ee9ae2651c2b29fbda
Author: Gurchetan Singh <gurchetansingh at chromium.org>
Date: Fri Nov 30 08:58:27 2018 -0800
virgl: texture_transfer_pool --> transfer_pool
It's used for all types of resources.
Reviewed-by: Elie Tournier <elie.tournier at collabora.com>
---
src/gallium/drivers/virgl/virgl_buffer.c | 4 ++--
src/gallium/drivers/virgl/virgl_context.c | 4 ++--
src/gallium/drivers/virgl/virgl_context.h | 2 +-
src/gallium/drivers/virgl/virgl_screen.c | 4 ++--
src/gallium/drivers/virgl/virgl_screen.h | 2 +-
src/gallium/drivers/virgl/virgl_texture.c | 6 +++---
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/gallium/drivers/virgl/virgl_buffer.c b/src/gallium/drivers/virgl/virgl_buffer.c
index f72c93f499..b662e46ccd 100644
--- a/src/gallium/drivers/virgl/virgl_buffer.c
+++ b/src/gallium/drivers/virgl/virgl_buffer.c
@@ -62,7 +62,7 @@ static void *virgl_buffer_transfer_map(struct pipe_context *ctx,
if (doflushwait)
ctx->flush(ctx, NULL, 0);
- trans = slab_alloc(&vctx->texture_transfer_pool);
+ trans = slab_alloc(&vctx->transfer_pool);
if (!trans)
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,
diff --git a/src/gallium/drivers/virgl/virgl_context.c b/src/gallium/drivers/virgl/virgl_context.c
index 2e3202b04e..7b6845df1d 100644
--- a/src/gallium/drivers/virgl/virgl_context.c
+++ b/src/gallium/drivers/virgl/virgl_context.c
@@ -1188,7 +1188,7 @@ virgl_context_destroy( struct pipe_context *ctx )
u_upload_destroy(vctx->uploader);
util_primconvert_destroy(vctx->primconvert);
- slab_destroy_child(&vctx->texture_transfer_pool);
+ slab_destroy_child(&vctx->transfer_pool);
FREE(vctx);
}
@@ -1330,7 +1330,7 @@ struct pipe_context *virgl_context_create(struct pipe_screen *pscreen,
virgl_init_so_functions(vctx);
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->uploader = u_upload_create(&vctx->base, 1024 * 1024,
diff --git a/src/gallium/drivers/virgl/virgl_context.h b/src/gallium/drivers/virgl/virgl_context.h
index 09cf0db2ae..829258d180 100644
--- a/src/gallium/drivers/virgl/virgl_context.h
+++ b/src/gallium/drivers/virgl/virgl_context.h
@@ -58,7 +58,7 @@ struct virgl_context {
struct pipe_framebuffer_state framebuffer;
- struct slab_child_pool texture_transfer_pool;
+ struct slab_child_pool transfer_pool;
struct u_upload_mgr *uploader;
diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c
index b32c061491..ef9af21acf 100644
--- a/src/gallium/drivers/virgl/virgl_screen.c
+++ b/src/gallium/drivers/virgl/virgl_screen.c
@@ -743,7 +743,7 @@ virgl_destroy_screen(struct pipe_screen *screen)
struct virgl_screen *vscreen = virgl_screen(screen);
struct virgl_winsys *vws = vscreen->vws;
- slab_destroy_parent(&vscreen->texture_transfer_pool);
+ slab_destroy_parent(&vscreen->transfer_pool);
if (vws)
vws->destroy(vws);
@@ -783,7 +783,7 @@ virgl_create_screen(struct virgl_winsys *vws)
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;
}
diff --git a/src/gallium/drivers/virgl/virgl_screen.h b/src/gallium/drivers/virgl/virgl_screen.h
index 719f5166d7..97a656fe8e 100644
--- a/src/gallium/drivers/virgl/virgl_screen.h
+++ b/src/gallium/drivers/virgl/virgl_screen.h
@@ -43,7 +43,7 @@ struct virgl_screen {
struct virgl_drm_caps caps;
- struct slab_parent_pool texture_transfer_pool;
+ struct slab_parent_pool transfer_pool;
uint32_t sub_ctx_id;
};
diff --git a/src/gallium/drivers/virgl/virgl_texture.c b/src/gallium/drivers/virgl/virgl_texture.c
index 9edf0ced0c..fd13e8a3a5 100644
--- a/src/gallium/drivers/virgl/virgl_texture.c
+++ b/src/gallium/drivers/virgl/virgl_texture.c
@@ -144,7 +144,7 @@ static void *virgl_texture_transfer_map(struct pipe_context *ctx,
if (doflushwait)
ctx->flush(ctx, NULL, 0);
- trans = slab_alloc(&vctx->texture_transfer_pool);
+ trans = slab_alloc(&vctx->transfer_pool);
if (!trans)
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);
if (!ptr) {
- slab_free(&vctx->texture_transfer_pool, trans);
+ slab_free(&vctx->transfer_pool, trans);
return NULL;
}
@@ -237,7 +237,7 @@ static void virgl_texture_transfer_unmap(struct pipe_context *ctx,
if (trans->resolve_tmp)
pipe_resource_reference((struct pipe_resource **)&trans->resolve_tmp, NULL);
- slab_free(&vctx->texture_transfer_pool, trans);
+ slab_free(&vctx->transfer_pool, trans);
}
More information about the mesa-commit
mailing list