virgl: texture_transfer_pool --> transfer_pool

It's used for all types of resources.

Reviewed-by: Elie Tournier <elie.tournier@collabora.com>

diff --git a/src/gallium/drivers/virgl/virgl_buffer.c b/src/gallium/drivers/virgl/virgl_buffer.c
index f72c93f4995e324708b42eef547b7b032f7af8d4..b662e46ccd0d9738e6c7a0bdee0d408a977ae945 100644 (file)
--- 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);
 
    if (doflushwait)
       ctx->flush(ctx, NULL, 0);
 

-   trans = slab_alloc(&vctx->texture_transfer_pool);
+   trans = slab_alloc(&vctx->transfer_pool);

    if (!trans)
       return NULL;
 
    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,
 }
 
 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 2e3202b04e93dc1308182f9ca45fa8df942264b8..7b6845df1d8772427fed45955184a7b1511cdecf 100644 (file)
--- 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);
 
       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);
 }
 
    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);
    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,
 
    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 09cf0db2ae4a3f6880afd282842e9c9ae21df264..829258d1801f80b2628488ae0db663d8066a977e 100644 (file)
--- 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 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;
 

diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c
index b32c061491c81f910e3476dd61b3fb9ceb66e619..ef9af21acf0e1160171db92f504ca23f762280f1 100644 (file)
--- 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;
 
    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);
 
    if (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;
 }

diff --git a/src/gallium/drivers/virgl/virgl_screen.h b/src/gallium/drivers/virgl/virgl_screen.h
index 719f5166d785b7848d1a5882acb3e4b2b06b73f0..97a656fe8eb007828a0c0ad3da04b098c372eba2 100644 (file)
--- 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 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;
 };

diff --git a/src/gallium/drivers/virgl/virgl_texture.c b/src/gallium/drivers/virgl/virgl_texture.c
index 9edf0ced0c1b1f05e984579be2351142e9e938a4..fd13e8a3a5f9c409b883ecbad4bbb3711255fc96 100644 (file)
--- 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);
 
    if (doflushwait)
       ctx->flush(ctx, NULL, 0);
 

-   trans = slab_alloc(&vctx->texture_transfer_pool);
+   trans = slab_alloc(&vctx->transfer_pool);

    if (!trans)
       return NULL;
 
    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) {
 
    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;
    }
 
       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);
 
    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);

 }
 
 
 }