nouveau/nir: Implement load_global_constant

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

diff --git a/src/gallium/drivers/virgl/virgl_buffer.c b/src/gallium/drivers/virgl/virgl_buffer.c
index bdbb35178264bd09895cf6d6e16a0cdcd661888b..ba32c29ce2c6a688566ab052ce0dee094b2d1a50 100644 (file)
--- a/src/gallium/drivers/virgl/virgl_buffer.c
+++ b/src/gallium/drivers/virgl/virgl_buffer.c
@@ -24,96 +24,42 @@
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
 #include "virgl_context.h"
+#include "virgl_encode.h"
 #include "virgl_resource.h"
 #include "virgl_screen.h"
 
-static void virgl_buffer_destroy(struct pipe_screen *screen,
-                                 struct pipe_resource *buf)
-{
-   struct virgl_screen *vs = virgl_screen(screen);
-   struct virgl_buffer *vbuf = virgl_buffer(buf);
-
-   vs->vws->resource_unref(vs->vws, vbuf->base.hw_res);
-   FREE(vbuf);
-}
-
-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_buffer *vbuf = virgl_buffer(resource);
-   struct virgl_transfer *trans;
-   void *ptr;
-   bool readback;
-   bool doflushwait = false;
-
-   if (usage & PIPE_TRANSFER_READ)
-      doflushwait = true;
-   else
-      doflushwait = virgl_res_needs_flush_wait(vctx, &vbuf->base, usage);
-
-   if (doflushwait)
-      ctx->flush(ctx, NULL, 0);
-
-   trans = virgl_resource_create_transfer(ctx, resource, &vbuf->metadata, level,
-                                          usage, box);
-
-   readback = virgl_res_needs_readback(vctx, &vbuf->base, usage);
-   if (readback)
-      vs->vws->transfer_get(vs->vws, vbuf->base.hw_res, box, trans->base.stride,
-                            trans->l_stride, trans->offset, level);
-
-   if (!(usage & PIPE_TRANSFER_UNSYNCHRONIZED))
-      doflushwait = true;
-
-   if (doflushwait || readback)
-      vs->vws->resource_wait(vs->vws, vbuf->base.hw_res);
-
-   ptr = vs->vws->resource_map(vs->vws, vbuf->base.hw_res);
-   if (!ptr) {
-      return NULL;
-   }
-
-   *transfer = &trans->base;
-   return ptr + trans->offset;
-}
-
 static void virgl_buffer_transfer_unmap(struct pipe_context *ctx,
                                         struct pipe_transfer *transfer)
 {
    struct virgl_context *vctx = virgl_context(ctx);
    struct virgl_transfer *trans = virgl_transfer(transfer);
-   struct virgl_buffer *vbuf = virgl_buffer(transfer->resource);
 
    if (trans->base.usage & PIPE_TRANSFER_WRITE) {
-      struct virgl_screen *vs = virgl_screen(ctx->screen);
       if (transfer->usage & PIPE_TRANSFER_FLUSH_EXPLICIT) {
+         if (trans->range.end <= trans->range.start) {
+            virgl_resource_destroy_transfer(vctx, trans);
+            return;
+         }
+
          transfer->box.x += trans->range.start;
          transfer->box.width = trans->range.end - trans->range.start;
          trans->offset = transfer->box.x;
       }
 
-      vctx->num_transfers++;
-      vs->vws->transfer_put(vs->vws, vbuf->base.hw_res,
-                            &transfer->box, trans->base.stride,
-                            trans->l_stride, trans->offset,
-                            transfer->level);
-
-   }
-
-   virgl_resource_destroy_transfer(vctx, trans);
+      if (trans->copy_src_hw_res) {
+         virgl_encode_copy_transfer(vctx, trans);
+         virgl_resource_destroy_transfer(vctx, trans);
+      } else {
+         virgl_transfer_queue_unmap(&vctx->queue, trans);
+      }
+   } else
+      virgl_resource_destroy_transfer(vctx, trans);
 }
 
 static void virgl_buffer_transfer_flush_region(struct pipe_context *ctx,
                                                struct pipe_transfer *transfer,
                                                const struct pipe_box *box)
 {
-   struct virgl_buffer *vbuf = virgl_buffer(transfer->resource);
    struct virgl_transfer *trans = virgl_transfer(transfer);
 
    /*
@@ -125,38 +71,19 @@ static void virgl_buffer_transfer_flush_region(struct pipe_context *ctx,
     *
     * We'll end up flushing 25 --> 70.
     */
-   util_range_add(&trans->range, box->x, box->x + box->width);
-   vbuf->base.clean = FALSE;
+   util_range_add(transfer->resource, &trans->range, box->x, box->x + box->width);
 }
 
 static const struct u_resource_vtbl virgl_buffer_vtbl =
 {
    u_default_resource_get_handle,            /* get_handle */
-   virgl_buffer_destroy,                     /* resource_destroy */
-   virgl_buffer_transfer_map,                /* transfer_map */
+   virgl_resource_destroy,                   /* resource_destroy */
+   virgl_resource_transfer_map,              /* transfer_map */
    virgl_buffer_transfer_flush_region,       /* transfer_flush_region */
    virgl_buffer_transfer_unmap,              /* transfer_unmap */
 };
 
-struct pipe_resource *virgl_buffer_create(struct virgl_screen *vs,
-                                          const struct pipe_resource *template)
+void virgl_buffer_init(struct virgl_resource *res)
 {
-   struct virgl_buffer *buf;
-   uint32_t vbind;
-   buf = CALLOC_STRUCT(virgl_buffer);
-   buf->base.clean = TRUE;
-   buf->base.u.b = *template;
-   buf->base.u.b.screen = &vs->base;
-   buf->base.u.vtbl = &virgl_buffer_vtbl;
-   pipe_reference_init(&buf->base.u.b.reference, 1);
-   virgl_resource_layout(&buf->base.u.b, &buf->metadata);
-
-   vbind = pipe_to_virgl_bind(template->bind);
-
-   buf->base.hw_res = vs->vws->resource_create(vs->vws, template->target,
-                                               template->format, vbind,
-                                               template->width0, 1, 1, 1, 0, 0,
-                                               buf->metadata.total_size);
-
-   return &buf->base.u.b;
+   res->u.vtbl = &virgl_buffer_vtbl;
 }