llvmpipe: check buffers in llvmpipe_is_resource_referenced.

[mesa.git] / src / gallium / drivers / llvmpipe / lp_surface.c

diff --git a/src/gallium/drivers/llvmpipe/lp_surface.c b/src/gallium/drivers/llvmpipe/lp_surface.c
index 11475fd447c296491bc8da4c80e4cefaef9489fe..5e6a6ebb34017383563e6cfb28a839fe8cbca2af 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_surface.c
+++ b/src/gallium/drivers/llvmpipe/lp_surface.c
@@ -57,93 +57,94 @@ lp_resource_copy(struct pipe_context *pipe,
                  struct pipe_resource *src, unsigned src_level,
                  const struct pipe_box *src_box)
 {
-   /* XXX this used to ignore srcz/dstz
-    * assume it works the same for cube and 3d
-    */
    struct llvmpipe_resource *src_tex = llvmpipe_resource(src);
    struct llvmpipe_resource *dst_tex = llvmpipe_resource(dst);
    const enum pipe_format format = src_tex->base.format;
    unsigned width = src_box->width;
    unsigned height = src_box->height;
-   assert(src_box->depth == 1);
-
-   /* Fallback for buffers. */
-   if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
-      util_resource_copy_region(pipe, dst, dst_level, dstx, dsty, dstz,
-                                src, src_level, src_box);
-      return;
-   }
+   unsigned depth = src_box->depth;
+   unsigned z;
 
    llvmpipe_flush_resource(pipe,
-                           dst, dst_level, dstz,
+                           dst, dst_level,
                            FALSE, /* read_only */
                            TRUE, /* cpu_access */
                            FALSE, /* do_not_block */
                            "blit dest");
 
    llvmpipe_flush_resource(pipe,
-                           src, src_level, src_box->z,
+                           src, src_level,
                            TRUE, /* read_only */
                            TRUE, /* cpu_access */
                            FALSE, /* do_not_block */
                            "blit src");
 
+   /* Fallback for buffers. */
+   if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
+      util_resource_copy_region(pipe, dst, dst_level, dstx, dsty, dstz,
+                                src, src_level, src_box);
+      return;
+   }
+
    /*
    printf("surface copy from %u lvl %u to %u lvl %u: %u,%u,%u to %u,%u,%u %u x %u x %u\n",
-          src_tex->id, src_level, dst_tex->id, dst_level, 
+          src_tex->id, src_level, dst_tex->id, dst_level,
           src_box->x, src_box->y, src_box->z, dstx, dsty, dstz,
           src_box->width, src_box->height, src_box->depth);
    */
 
-   /* set src tiles to linear layout */
-   {
-      unsigned tx, ty, tw, th;
-      unsigned x, y;
-
-      adjust_to_tile_bounds(src_box->x, src_box->y, width, height,
-                            &tx, &ty, &tw, &th);
-
-      for (y = 0; y < th; y += TILE_SIZE) {
-         for (x = 0; x < tw; x += TILE_SIZE) {
-            (void) llvmpipe_get_texture_tile_linear(src_tex,
-                                                    src_box->z, src_level,
-                                                    LP_TEX_USAGE_READ,
-                                                    tx + x, ty + y);
+   for (z = 0; z < src_box->depth; z++){
+
+      /* set src tiles to linear layout */
+      {
+         unsigned tx, ty, tw, th;
+         unsigned x, y;
+
+         adjust_to_tile_bounds(src_box->x, src_box->y, width, height,
+                               &tx, &ty, &tw, &th);
+
+         for (y = 0; y < th; y += TILE_SIZE) {
+            for (x = 0; x < tw; x += TILE_SIZE) {
+               (void) llvmpipe_get_texture_tile_linear(src_tex,
+                                                       src_box->z + z, src_level,
+                                                       LP_TEX_USAGE_READ,
+                                                       tx + x, ty + y);
+            }
          }
       }
-   }
-
-   /* set dst tiles to linear layout */
-   {
-      unsigned tx, ty, tw, th;
-      unsigned x, y;
-      enum lp_texture_usage usage;
 
-      adjust_to_tile_bounds(dstx, dsty, width, height, &tx, &ty, &tw, &th);
+      /* set dst tiles to linear layout */
+      {
+         unsigned tx, ty, tw, th;
+         unsigned x, y;
+         enum lp_texture_usage usage;
 
-      for (y = 0; y < th; y += TILE_SIZE) {
-         boolean contained_y = ty + y >= dsty &&
-                               ty + y + TILE_SIZE <= dsty + height ?
-                               TRUE : FALSE;
+         adjust_to_tile_bounds(dstx, dsty, width, height, &tx, &ty, &tw, &th);
 
-         for (x = 0; x < tw; x += TILE_SIZE) {
-            boolean contained_x = tx + x >= dstx &&
-                                  tx + x + TILE_SIZE <= dstx + width ?
+         for (y = 0; y < th; y += TILE_SIZE) {
+            boolean contained_y = ty + y >= dsty &&
+                                  ty + y + TILE_SIZE <= dsty + height ?
                                   TRUE : FALSE;
 
-            /*
-             * Set the usage mode to WRITE_ALL for the tiles which are
-             * completely contained by the dest rectangle.
-             */
-            if (contained_y && contained_x)
-               usage = LP_TEX_USAGE_WRITE_ALL;
-            else
-               usage = LP_TEX_USAGE_READ_WRITE;
-
-            (void) llvmpipe_get_texture_tile_linear(dst_tex,
-                                                    dstz, dst_level,
-                                                    usage,
-                                                    tx + x, ty + y);
+            for (x = 0; x < tw; x += TILE_SIZE) {
+               boolean contained_x = tx + x >= dstx &&
+                                     tx + x + TILE_SIZE <= dstx + width ?
+                                     TRUE : FALSE;
+
+               /*
+                * Set the usage mode to WRITE_ALL for the tiles which are
+                * completely contained by the dest rectangle.
+                */
+               if (contained_y && contained_x)
+                  usage = LP_TEX_USAGE_WRITE_ALL;
+               else
+                  usage = LP_TEX_USAGE_READ_WRITE;
+
+               (void) llvmpipe_get_texture_tile_linear(dst_tex,
+                                                       dstz + z, dst_level,
+                                                       usage,
+                                                       tx + x, ty + y);
+            }
          }
       }
    }
@@ -160,13 +161,15 @@ lp_resource_copy(struct pipe_context *pipe,
                                               LP_TEX_LAYOUT_LINEAR);
 
       if (dst_linear_ptr && src_linear_ptr) {
-         util_copy_rect(dst_linear_ptr, format,
-                        llvmpipe_resource_stride(&dst_tex->base, dst_level),
-                        dstx, dsty,
-                        width, height,
-                        src_linear_ptr,
-                        llvmpipe_resource_stride(&src_tex->base, src_level),
-                        src_box->x, src_box->y);
+         util_copy_box(dst_linear_ptr, format,
+                       llvmpipe_resource_stride(&dst_tex->base, dst_level),
+                       dst_tex->img_stride[dst_level],
+                       dstx, dsty, 0,
+                       width, height, depth,
+                       src_linear_ptr,
+                       llvmpipe_resource_stride(&src_tex->base, src_level),
+                       src_tex->img_stride[src_level],
+                       src_box->x, src_box->y, 0);
       }
    }
 }