llvmpipe: implement blit

Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c
index dec347380296ea951f9bb4a49fb618c0027c0124..e59ae237efd95bb92bc119876d5d8b2639c01c8a 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_context.c
+++ b/src/gallium/drivers/llvmpipe/lp_context.c
@@ -58,6 +58,10 @@ static void llvmpipe_destroy( struct pipe_context *pipe )
 
    lp_print_counters();
 
+   if (llvmpipe->blitter) {
+      util_blitter_destroy(llvmpipe->blitter);
+   }
+
    /* This will also destroy llvmpipe->setup:
     */
    if (llvmpipe->draw)
@@ -168,6 +172,14 @@ llvmpipe_create_context( struct pipe_screen *screen, void *priv )
    if (!llvmpipe->setup)
       goto fail;
 
+   llvmpipe->blitter = util_blitter_create(&llvmpipe->pipe);
+   if (!llvmpipe->blitter) {
+      goto fail;
+   }
+
+   /* must be done before installing Draw stages */
+   util_blitter_cache_all_shaders(llvmpipe->blitter);
+
    /* plug in AA line/point stages */
    draw_install_aaline_stage(llvmpipe->draw, &llvmpipe->pipe);
    draw_install_aapoint_stage(llvmpipe->draw, &llvmpipe->pipe);

diff --git a/src/gallium/drivers/llvmpipe/lp_context.h b/src/gallium/drivers/llvmpipe/lp_context.h
index b7b7ede7eaf55e9a8db330591e7e808db88725da..fcdc0f82b12e2e69e8941d2749d1917aa07d2291 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_context.h
+++ b/src/gallium/drivers/llvmpipe/lp_context.h
@@ -34,6 +34,7 @@
 #include "pipe/p_context.h"
 
 #include "draw/draw_vertex.h"
+#include "util/u_blitter.h"
 
 #include "lp_tex_sample.h"
 #include "lp_jit.h"
@@ -122,6 +123,8 @@ struct llvmpipe_context {
    /** The primitive drawing context */
    struct draw_context *draw;
 
+   struct blitter_context *blitter;
+
    unsigned tex_timestamp;
    boolean no_rast;
 

diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index e0c229b9dbf5fa1153b8e6639946f026f4f568ac..b64a6c0f36c5d2b441aab0957d467fb28ec39567 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -297,6 +297,10 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen,
    if (!format_desc)
       return FALSE;
 
+   /* Z16 support is missing, which breaks the blit */
+   if (format == PIPE_FORMAT_Z16_UNORM)
+      return FALSE;
+
    assert(target == PIPE_BUFFER ||
           target == PIPE_TEXTURE_1D ||
           target == PIPE_TEXTURE_2D ||

diff --git a/src/gallium/drivers/llvmpipe/lp_surface.c b/src/gallium/drivers/llvmpipe/lp_surface.c
index 1b5e9d055f5de631ea1cefe713214857acc08107..a4789b4f5c3cfa02e3d0ed734ec127498145c642 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_surface.c
+++ b/src/gallium/drivers/llvmpipe/lp_surface.c
@@ -172,10 +172,71 @@ lp_resource_copy(struct pipe_context *pipe,
 }
 
 
+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_buffers(lp->blitter, lp->num_vertex_buffers,
+                                    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
 llvmpipe_init_surface_functions(struct llvmpipe_context *lp)
 {
    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;
 }