llvmpipe: check buffers in llvmpipe_is_resource_referenced.
[mesa.git] / src / gallium / drivers / llvmpipe / lp_surface.c
index 1a116989d4c6ce539288782cfe14c51e35fd9f7c..5e6a6ebb34017383563e6cfb28a839fe8cbca2af 100644 (file)
  **************************************************************************/
 
 #include "util/u_rect.h"
+#include "util/u_surface.h"
 #include "lp_context.h"
 #include "lp_flush.h"
+#include "lp_limits.h"
 #include "lp_surface.h"
 #include "lp_texture.h"
-#include "lp_tile_size.h"
 
 
 /**
@@ -50,75 +51,100 @@ adjust_to_tile_bounds(unsigned x, unsigned y, unsigned width, unsigned height,
 
 
 static void
-lp_surface_copy(struct pipe_context *pipe,
-                struct pipe_surface *dst, unsigned dstx, unsigned dsty,
-                struct pipe_surface *src, unsigned srcx, unsigned srcy,
-                unsigned width, unsigned height)
+lp_resource_copy(struct pipe_context *pipe,
+                 struct pipe_resource *dst, unsigned dst_level,
+                 unsigned dstx, unsigned dsty, unsigned dstz,
+                 struct pipe_resource *src, unsigned src_level,
+                 const struct pipe_box *src_box)
 {
-   struct llvmpipe_resource *src_tex = llvmpipe_resource(src->texture);
-   struct llvmpipe_resource *dst_tex = llvmpipe_resource(dst->texture);
+   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;
-
-   llvmpipe_flush_texture(pipe,
-                          dst->texture, dst->face, dst->level,
-                          0, /* flush_flags */
-                          FALSE, /* read_only */
-                          FALSE, /* cpu_access */
-                          FALSE); /* do_not_flush */
-
-   llvmpipe_flush_texture(pipe,
-                          src->texture, src->face, src->level,
-                          0, /* flush_flags */
-                          TRUE, /* read_only */
-                          FALSE, /* cpu_access */
-                          FALSE); /* do_not_flush */
+   unsigned width = src_box->width;
+   unsigned height = src_box->height;
+   unsigned depth = src_box->depth;
+   unsigned z;
+
+   llvmpipe_flush_resource(pipe,
+                           dst, dst_level,
+                           FALSE, /* read_only */
+                           TRUE, /* cpu_access */
+                           FALSE, /* do_not_block */
+                           "blit dest");
+
+   llvmpipe_flush_resource(pipe,
+                           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 to %u: %u,%u to %u,%u %u x %u\n",
-          src_tex->id, dst_tex->id,
-          srcx, srcy, dstx, dsty, width, height);
+   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_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;
+   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(srcx, srcy, width, height, &tx, &ty, &tw, &th);
+         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->face, src->level,
+         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);
+                                                       tx + x, ty + y);
+            }
          }
       }
-   }
 
-   /* set dst tiles to linear layout */
-   {
-      unsigned tx, ty, tw, th;
-      unsigned x, y;
-      enum lp_texture_usage usage;
-
-      /* XXX for the tiles which are completely contained by the
-       * dest rectangle, we could set the usage mode to WRITE_ALL.
-       * Just test for the case of replacing the whole dest region for now.
-       */
-      if (width == dst_tex->base.width0 && height == dst_tex->base.height0)
-         usage = LP_TEX_USAGE_WRITE_ALL;
-      else
-         usage = LP_TEX_USAGE_READ_WRITE;
-
-      adjust_to_tile_bounds(dstx, dsty, 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(dst_tex,
-                                                    dst->face, dst->level,
-                                                    usage,
-                                                    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);
+
+         for (y = 0; y < th; y += TILE_SIZE) {
+            boolean contained_y = ty + y >= dsty &&
+                                  ty + y + TILE_SIZE <= dsty + height ?
+                                  TRUE : FALSE;
+
+            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);
+            }
          }
       }
    }
@@ -126,28 +152,93 @@ lp_surface_copy(struct pipe_context *pipe,
    /* copy */
    {
       const ubyte *src_linear_ptr
-         = llvmpipe_get_texture_image_address(src_tex, src->face,
-                                              src->level,
+         = llvmpipe_get_texture_image_address(src_tex, src_box->z,
+                                              src_level,
                                               LP_TEX_LAYOUT_LINEAR);
       ubyte *dst_linear_ptr
-         = llvmpipe_get_texture_image_address(dst_tex, dst->face,
-                                              dst->level,
+         = llvmpipe_get_texture_image_address(dst_tex, dstz,
+                                              dst_level,
                                               LP_TEX_LAYOUT_LINEAR);
 
-      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),
-                     srcx, srcy);
+      if (dst_linear_ptr && src_linear_ptr) {
+         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);
+      }
+   }
+}
+
+
+static void lp_blit(struct pipe_context *pipe,
+                    const struct pipe_blit_info *blit_info)
+{
+   struct llvmpipe_context *lp = llvmpipe_context(pipe);
+   struct pipe_blit_info info = *blit_info;
+
+   if (info.src.resource->nr_samples > 1 &&
+       info.dst.resource->nr_samples <= 1 &&
+       !util_format_is_depth_or_stencil(info.src.resource->format) &&
+       !util_format_is_pure_integer(info.src.resource->format)) {
+      debug_printf("llvmpipe: color resolve unimplemented\n");
+      return;
+   }
+
+   if (util_try_blit_via_copy_region(pipe, &info)) {
+      return; /* done */
    }
+
+   if (info.mask & PIPE_MASK_S) {
+      debug_printf("llvmpipe: cannot blit stencil, skipping\n");
+      info.mask &= ~PIPE_MASK_S;
+   }
+
+   if (!util_blitter_is_blit_supported(lp->blitter, &info)) {
+      debug_printf("llvmpipe: blit unsupported %s -> %s\n",
+                   util_format_short_name(info.src.resource->format),
+                   util_format_short_name(info.dst.resource->format));
+      return;
+   }
+
+   /* XXX turn off occlusion and streamout queries */
+
+   util_blitter_save_vertex_buffer_slot(lp->blitter, lp->vertex_buffer);
+   util_blitter_save_vertex_elements(lp->blitter, (void*)lp->velems);
+   util_blitter_save_vertex_shader(lp->blitter, (void*)lp->vs);
+   util_blitter_save_geometry_shader(lp->blitter, (void*)lp->gs);
+   util_blitter_save_so_targets(lp->blitter, lp->num_so_targets,
+                                (struct pipe_stream_output_target**)lp->so_targets);
+   util_blitter_save_rasterizer(lp->blitter, (void*)lp->rasterizer);
+   util_blitter_save_viewport(lp->blitter, &lp->viewport);
+   util_blitter_save_scissor(lp->blitter, &lp->scissor);
+   util_blitter_save_fragment_shader(lp->blitter, lp->fs);
+   util_blitter_save_blend(lp->blitter, (void*)lp->blend);
+   util_blitter_save_depth_stencil_alpha(lp->blitter, (void*)lp->depth_stencil);
+   util_blitter_save_stencil_ref(lp->blitter, &lp->stencil_ref);
+   /*util_blitter_save_sample_mask(sp->blitter, lp->sample_mask);*/
+   util_blitter_save_framebuffer(lp->blitter, &lp->framebuffer);
+   util_blitter_save_fragment_sampler_states(lp->blitter,
+                     lp->num_samplers[PIPE_SHADER_FRAGMENT],
+                     (void**)lp->samplers[PIPE_SHADER_FRAGMENT]);
+   util_blitter_save_fragment_sampler_views(lp->blitter,
+                     lp->num_sampler_views[PIPE_SHADER_FRAGMENT],
+                     lp->sampler_views[PIPE_SHADER_FRAGMENT]);
+   util_blitter_save_render_condition(lp->blitter, lp->render_cond_query,
+                                      lp->render_cond_mode);
+   util_blitter_blit(lp->blitter, &info);
 }
 
 
 void
-lp_init_surface_functions(struct llvmpipe_context *lp)
+llvmpipe_init_surface_functions(struct llvmpipe_context *lp)
 {
-   lp->pipe.surface_copy = lp_surface_copy;
-   lp->pipe.surface_fill = util_surface_fill;
+   lp->pipe.resource_copy_region = lp_resource_copy;
+   lp->pipe.clear_render_target = util_clear_render_target;
+   lp->pipe.clear_depth_stencil = util_clear_depth_stencil;
+   lp->pipe.blit = lp_blit;
 }