summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandros Frantzis <[email protected]>2019-07-05 14:23:19 +0300
committerChia-I Wu <[email protected]>2019-07-06 19:30:34 -0700
commitf8975f8f2f51e265609d17875b6850c7b2ac5313 (patch)
tree9d0d78b5cbbd73ca2f4bd62aae0eefa314e933ad
parentbb0a38d8197e1480dc5aedb3520741c840d01e91 (diff)
virgl: Use virgl_resource_transfer_map for buffers
Replace custom buffer map code with virgl_resource_transfer_map. Signed-off-by: Alexandros Frantzis <[email protected]> Reviewed-by: Chia-I Wu <[email protected]>
-rw-r--r--src/gallium/drivers/virgl/virgl_buffer.c80
1 files changed, 1 insertions, 79 deletions
diff --git a/src/gallium/drivers/virgl/virgl_buffer.c b/src/gallium/drivers/virgl/virgl_buffer.c
index b0684bcbf57..9f999fec1fb 100644
--- a/src/gallium/drivers/virgl/virgl_buffer.c
+++ b/src/gallium/drivers/virgl/virgl_buffer.c
@@ -28,84 +28,6 @@
#include "virgl_resource.h"
#include "virgl_screen.h"
-static void *virgl_buffer_transfer_map(struct pipe_context *ctx,
- struct pipe_resource *resource,
- unsigned level,
- unsigned usage,
- const struct pipe_box *box,
- struct pipe_transfer **transfer)
-{
- struct virgl_context *vctx = virgl_context(ctx);
- struct virgl_screen *vs = virgl_screen(ctx->screen);
- struct virgl_resource *vbuf = virgl_resource(resource);
- struct virgl_transfer *trans;
- enum virgl_transfer_map_type map_type;
- void *map_addr;
-
- trans = virgl_resource_create_transfer(vctx, resource,
- &vbuf->metadata, level, usage, box);
-
- map_type = virgl_resource_transfer_prepare(vctx, trans);
- switch (map_type) {
- case VIRGL_TRANSFER_MAP_REALLOC:
- if (!virgl_resource_realloc(vctx, vbuf)) {
- map_addr = NULL;
- break;
- }
- vs->vws->resource_reference(vs->vws, &trans->hw_res, vbuf->hw_res);
- /* fall through */
- case VIRGL_TRANSFER_MAP_HW_RES:
- trans->hw_res_map = vs->vws->resource_map(vs->vws, vbuf->hw_res);
- if (trans->hw_res_map)
- map_addr = trans->hw_res_map + trans->offset;
- else
- map_addr = NULL;
- break;
- case VIRGL_TRANSFER_MAP_STAGING:
- map_addr = virgl_staging_map(vctx, trans);
- /* Copy transfers don't make use of hw_res_map at the moment. */
- trans->hw_res_map = NULL;
- break;
- case VIRGL_TRANSFER_MAP_ERROR:
- default:
- trans->hw_res_map = NULL;
- map_addr = NULL;
- break;
- }
-
- if (!map_addr) {
- virgl_resource_destroy_transfer(vctx, trans);
- return NULL;
- }
-
- /* For the checks below to be able to use 'usage', we assume that
- * transfer preparation doesn't affect the usage.
- */
- assert(usage == trans->base.usage);
-
- /* If we are doing a whole resource discard with a hw_res map, the buffer
- * storage can now be considered unused and we don't care about previous
- * contents. We can thus mark the storage as uninitialized, but only if the
- * buffer is not host writable (in which case we can't clear the valid
- * range, since that would result in missed readbacks in future transfers).
- * We only do this for VIRGL_TRANSFER_MAP_HW_RES, since for
- * VIRGL_TRANSFER_MAP_REALLOC we already take care of the buffer range when
- * reallocating and rebinding, and VIRGL_TRANSFER_MAP_STAGING is not
- * currently used for whole resource discards.
- */
- if (map_type == VIRGL_TRANSFER_MAP_HW_RES &&
- (usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE) &&
- (vbuf->clean_mask & 1)) {
- util_range_set_empty(&vbuf->valid_buffer_range);
- }
-
- if (usage & PIPE_TRANSFER_WRITE)
- util_range_add(&vbuf->valid_buffer_range, box->x, box->x + box->width);
-
- *transfer = &trans->base;
- return map_addr;
-}
-
static void virgl_buffer_transfer_unmap(struct pipe_context *ctx,
struct pipe_transfer *transfer)
{
@@ -156,7 +78,7 @@ static const struct u_resource_vtbl virgl_buffer_vtbl =
{
u_default_resource_get_handle, /* get_handle */
virgl_resource_destroy, /* resource_destroy */
- virgl_buffer_transfer_map, /* transfer_map */
+ virgl_resource_transfer_map, /* transfer_map */
virgl_buffer_transfer_flush_region, /* transfer_flush_region */
virgl_buffer_transfer_unmap, /* transfer_unmap */
};