virgl: also destroy all read-transfers

[mesa.git] / src / gallium / drivers / virgl / virgl_texture.c

diff --git a/src/gallium/drivers/virgl/virgl_texture.c b/src/gallium/drivers/virgl/virgl_texture.c
index d79ae4d3d098cf72af6636c39aae618101b0d6ec..1832309aa49dfeab9b9f6bca2ab573517e26dc06 100644 (file)
--- a/src/gallium/drivers/virgl/virgl_texture.c
+++ b/src/gallium/drivers/virgl/virgl_texture.c
@@ -108,14 +108,14 @@ static void *virgl_texture_transfer_map(struct pipe_context *ctx,
    void *ptr;
    boolean readback = TRUE;
    struct virgl_hw_res *hw_res;
-   bool doflushwait;
+   bool flush;
 
-   doflushwait = virgl_res_needs_flush_wait(vctx, vtex, usage);
-   if (doflushwait)
-      ctx->flush(ctx, NULL, 0);
+   trans = virgl_resource_create_transfer(&vctx->transfer_pool, resource,
+                                          &vtex->metadata, level, usage, box);
 
-   trans = virgl_resource_create_transfer(ctx, resource, &vtex->metadata,
-                                          level, usage, box);
+   flush = virgl_res_needs_flush(vctx, trans);
+   if (flush)
+      ctx->flush(ctx, NULL, 0);
 
    if (resource->nr_samples > 1) {
       struct pipe_resource tmp_resource;
@@ -137,17 +137,17 @@ static void *virgl_texture_transfer_map(struct pipe_context *ctx,
       trans->resolve_tmp = NULL;
    }
 
-   readback = virgl_res_needs_readback(vctx, vtex, usage);
-   if (readback)
+   readback = virgl_res_needs_readback(vctx, vtex, usage, level);
+   if (readback) {
       vs->vws->transfer_get(vs->vws, hw_res, box, trans->base.stride,
                             trans->l_stride, trans->offset, level);
 
-   if (doflushwait || readback)
       vs->vws->resource_wait(vs->vws, vtex->hw_res);
+   }
 
    ptr = vs->vws->resource_map(vs->vws, hw_res);
    if (!ptr) {
-      slab_free(&vctx->transfer_pool, trans);
+      virgl_resource_destroy_transfer(&vctx->transfer_pool, trans);
       return NULL;
    }
 
@@ -165,94 +165,36 @@ static void virgl_texture_transfer_unmap(struct pipe_context *ctx,
    if (trans->base.usage & PIPE_TRANSFER_WRITE) {
       if (!(transfer->usage & PIPE_TRANSFER_FLUSH_EXPLICIT)) {
          struct virgl_screen *vs = virgl_screen(ctx->screen);
-         vtex->clean = FALSE;
          vctx->num_transfers++;
-         vs->vws->transfer_put(vs->vws, vtex->hw_res,
-                               &transfer->box, trans->base.stride,
-                               trans->l_stride, trans->offset,
-                               transfer->level);
 
+         if (trans->resolve_tmp) {
+            vs->vws->transfer_put(vs->vws, vtex->hw_res,
+                                  &transfer->box, trans->base.stride,
+                                  trans->l_stride, trans->offset,
+                                  transfer->level);
+         } else {
+            virgl_transfer_queue_unmap(&vctx->queue, trans);
+         }
       }
    }
 
-   if (trans->resolve_tmp)
+   if (trans->resolve_tmp) {
       pipe_resource_reference((struct pipe_resource **)&trans->resolve_tmp, NULL);
-
-   virgl_resource_destroy_transfer(vctx, trans);
-}
-
-static boolean virgl_texture_get_handle(struct pipe_screen *screen,
-                                         struct pipe_resource *ptex,
-                                         struct winsys_handle *whandle)
-{
-   struct virgl_screen *vs = virgl_screen(screen);
-   struct virgl_resource *vtex = virgl_resource(ptex);
-
-   return vs->vws->resource_get_handle(vs->vws, vtex->hw_res,
-                                       vtex->metadata.stride[0],
-                                       whandle);
-}
-
-static void virgl_texture_destroy(struct pipe_screen *screen,
-                                  struct pipe_resource *res)
-{
-   struct virgl_screen *vs = virgl_screen(screen);
-   struct virgl_resource *vtex = virgl_resource(res);
-   vs->vws->resource_unref(vs->vws, vtex->hw_res);
-   FREE(vtex);
+      virgl_resource_destroy_transfer(&vctx->transfer_pool, trans);
+   } else if (!(trans->base.usage & PIPE_TRANSFER_WRITE))
+      virgl_resource_destroy_transfer(&vctx->transfer_pool, trans);
 }
 
 static const struct u_resource_vtbl virgl_texture_vtbl =
 {
-   virgl_texture_get_handle,            /* get_handle */
-   virgl_texture_destroy,               /* resource_destroy */
+   virgl_resource_get_handle,           /* get_handle */
+   virgl_resource_destroy,              /* resource_destroy */
    virgl_texture_transfer_map,          /* transfer_map */
    NULL,                                /* transfer_flush_region */
    virgl_texture_transfer_unmap,        /* transfer_unmap */
 };
 
-struct pipe_resource *
-virgl_texture_from_handle(struct virgl_screen *vs,
-                          const struct pipe_resource *template,
-                          struct winsys_handle *whandle)
-{
-   struct virgl_resource *tex = CALLOC_STRUCT(virgl_resource);
-   tex->u.b = *template;
-   tex->u.b.screen = &vs->base;
-   pipe_reference_init(&tex->u.b.reference, 1);
-   tex->u.vtbl = &virgl_texture_vtbl;
-
-   tex->hw_res = vs->vws->resource_create_from_handle(vs->vws, whandle);
-   return &tex->u.b;
-}
-
-struct pipe_resource *virgl_texture_create(struct virgl_screen *vs,
-                                           const struct pipe_resource *template)
+void virgl_texture_init(struct virgl_resource *res)
 {
-   struct virgl_resource *tex;
-   unsigned vbind;
-
-   tex = CALLOC_STRUCT(virgl_resource);
-   tex->clean = TRUE;
-   tex->u.b = *template;
-   tex->u.b.screen = &vs->base;
-   pipe_reference_init(&tex->u.b.reference, 1);
-   tex->u.vtbl = &virgl_texture_vtbl;
-   virgl_resource_layout(&tex->u.b, &tex->metadata);
-
-   vbind = pipe_to_virgl_bind(template->bind);
-   tex->hw_res = vs->vws->resource_create(vs->vws, template->target,
-                                          template->format, vbind,
-                                          template->width0,
-                                          template->height0,
-                                          template->depth0,
-                                          template->array_size,
-                                          template->last_level,
-                                          template->nr_samples,
-                                          tex->metadata.total_size);
-   if (!tex->hw_res) {
-      FREE(tex);
-      return NULL;
-   }
-   return &tex->u.b;
+   res->u.vtbl = &virgl_texture_vtbl;
 }