X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgallium%2Fdrivers%2Fi915%2Fi915_surface.c;h=a4c1f39dd389f74c54db5be6a279d6bb631057d4;hb=e7b4219e2287f98a323b6883ce5f42545cab0e8f;hp=ac6e94500c85297b7022c2edc70e1d279d8310b3;hpb=883d8a0b449b53d83cc5970d2ce50df536aef55f;p=mesa.git

diff --git a/src/gallium/drivers/i915/i915_surface.c b/src/gallium/drivers/i915/i915_surface.c
index ac6e94500c8..a4c1f39dd38 100644
--- a/src/gallium/drivers/i915/i915_surface.c
+++ b/src/gallium/drivers/i915/i915_surface.c
@@ -43,6 +43,31 @@
  * surface functions using the render engine
  */
 
+static void
+i915_util_blitter_save_states(struct i915_context *i915)
+{
+   util_blitter_save_blend(i915->blitter, (void *)i915->blend);
+   util_blitter_save_depth_stencil_alpha(i915->blitter, (void *)i915->depth_stencil);
+   util_blitter_save_stencil_ref(i915->blitter, &i915->stencil_ref);
+   util_blitter_save_rasterizer(i915->blitter, (void *)i915->rasterizer);
+   util_blitter_save_fragment_shader(i915->blitter, i915->fs);
+   util_blitter_save_vertex_shader(i915->blitter, i915->vs);
+   util_blitter_save_viewport(i915->blitter, &i915->viewport);
+   util_blitter_save_scissor(i915->blitter, &i915->scissor);
+   util_blitter_save_vertex_elements(i915->blitter, i915->velems);
+   util_blitter_save_vertex_buffer_slot(i915->blitter,
+                                    i915->vertex_buffers);
+
+   util_blitter_save_framebuffer(i915->blitter, &i915->framebuffer);
+
+   util_blitter_save_fragment_sampler_states(i915->blitter,
+                                             i915->num_samplers,
+                                             (void**)i915->fragment_sampler);
+   util_blitter_save_fragment_sampler_views(i915->blitter,
+                                            i915->num_fragment_sampler_views,
+                                            i915->fragment_sampler_views);
+}
+
 static void
 i915_surface_copy_render(struct pipe_context *pipe,
                          struct pipe_resource *dst, unsigned dst_level,
@@ -59,35 +84,22 @@ i915_surface_copy_render(struct pipe_context *pipe,
       return;
    }
 
-   util_blitter_save_blend(i915->blitter, (void *)i915->blend);
-   util_blitter_save_depth_stencil_alpha(i915->blitter, (void *)i915->depth_stencil);
-   util_blitter_save_stencil_ref(i915->blitter, &i915->stencil_ref);
-   util_blitter_save_rasterizer(i915->blitter, (void *)i915->rasterizer);
-   util_blitter_save_fragment_shader(i915->blitter, i915->saved_fs);
-   util_blitter_save_vertex_shader(i915->blitter, i915->saved_vs);
-   util_blitter_save_viewport(i915->blitter, &i915->viewport);
-   util_blitter_save_clip(i915->blitter, &i915->saved_clip);
-   util_blitter_save_vertex_elements(i915->blitter, i915->saved_velems);
-   util_blitter_save_vertex_buffers(i915->blitter, i915->saved_nr_vertex_buffers,
-                                    i915->saved_vertex_buffers);
-
-   util_blitter_save_framebuffer(i915->blitter, &i915->framebuffer);
+   if (!util_blitter_is_copy_supported(i915->blitter, dst, src)) {
+      util_resource_copy_region(pipe, dst, dst_level, dstx, dsty, dstz,
+                                src, src_level, src_box);
+      return;
+   }
 
-   util_blitter_save_fragment_sampler_states(i915->blitter,
-                                             i915->saved_nr_samplers,
-                                             i915->saved_samplers);
-   util_blitter_save_fragment_sampler_views(i915->blitter,
-                                            i915->saved_nr_sampler_views,
-                                            i915->saved_sampler_views);
+   i915_util_blitter_save_states(i915);
 
-   util_blitter_copy_region(i915->blitter, dst, dst_level, dstx, dsty, dstz,
-                            src, src_level, src_box, TRUE);
+   util_blitter_copy_texture(i915->blitter, dst, dst_level, dstx, dsty, dstz,
+                            src, src_level, src_box);
 }
 
 static void
 i915_clear_render_target_render(struct pipe_context *pipe,
                                 struct pipe_surface *dst,
-                                const float *rgba,
+                                const union pipe_color_union *color,
                                 unsigned dstx, unsigned dsty,
                                 unsigned width, unsigned height)
 {
@@ -106,7 +118,7 @@ i915_clear_render_target_render(struct pipe_context *pipe,
    if (i915->dirty)
       i915_update_derived(i915);
 
-   i915_clear_emit(pipe, PIPE_CLEAR_COLOR, rgba, 0.0, 0x0,
+   i915_clear_emit(pipe, PIPE_CLEAR_COLOR, color, 0.0, 0x0,
                    dstx, dsty, width, height);
 
    pipe->set_framebuffer_state(pipe, &i915->blitter->saved_fb_state);
@@ -199,10 +211,42 @@ i915_surface_copy_blitter(struct pipe_context *pipe,
                    (short) src_box->width, (short) src_box->height );
 }
 
+static void
+i915_blit(struct pipe_context *pipe, const struct pipe_blit_info *blit_info)
+{
+   struct i915_context *i915 = i915_context(pipe);
+   struct pipe_blit_info info = *blit_info;
+
+   if (util_try_blit_via_copy_region(pipe, &info)) {
+      return; /* done */
+   }
+
+   if (info.mask & PIPE_MASK_S) {
+      debug_printf("i915: cannot blit stencil, skipping\n");
+      info.mask &= ~PIPE_MASK_S;
+   }
+
+   if (!util_blitter_is_blit_supported(i915->blitter, &info)) {
+      debug_printf("i915: blit unsupported %s -> %s\n",
+                   util_format_short_name(info.src.resource->format),
+                   util_format_short_name(info.dst.resource->format));
+      return;
+   }
+
+   i915_util_blitter_save_states(i915);
+
+   util_blitter_blit(i915->blitter, &info);
+}
+
+static void
+i915_flush_resource(struct pipe_context *ctx, struct pipe_resource *resource)
+{
+}
+
 static void
 i915_clear_render_target_blitter(struct pipe_context *pipe,
                                  struct pipe_surface *dst,
-                                 const float *rgba,
+                                 const union pipe_color_union *color,
                                  unsigned dstx, unsigned dsty,
                                  unsigned width, unsigned height)
 {
@@ -214,7 +258,7 @@ i915_clear_render_target_blitter(struct pipe_context *pipe,
    assert(util_format_get_blockwidth(pt->format) == 1);
    assert(util_format_get_blockheight(pt->format) == 1);
 
-   util_pack_color(rgba, dst->format, &uc);
+   util_pack_color(color->f, dst->format, &uc);
    i915_fill_blit( i915_context(pipe),
                    util_format_get_blocksize(pt->format),
                    XY_COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB,
@@ -251,7 +295,7 @@ i915_clear_depth_stencil_blitter(struct pipe_context *pipe,
       (otherwise this won't work anyway). Hence will only want to
       do it if really have stencil and it isn't cleared */
    if ((clear_flags & PIPE_CLEAR_STENCIL) ||
-       (dst->format != PIPE_FORMAT_Z24_UNORM_S8_USCALED))
+       (dst->format != PIPE_FORMAT_Z24_UNORM_S8_UINT))
       mask |= XY_COLOR_BLT_WRITE_ALPHA;
 
    i915_fill_blit( i915_context(pipe),
@@ -292,7 +336,6 @@ i915_create_surface(struct pipe_context *ctx,
       ps->u.tex.level = surf_tmpl->u.tex.level;
       ps->u.tex.first_layer = surf_tmpl->u.tex.first_layer;
       ps->u.tex.last_layer = surf_tmpl->u.tex.last_layer;
-      ps->usage = surf_tmpl->usage;
       ps->context = ctx;
    }
    return ps;
@@ -319,6 +362,8 @@ i915_init_surface_functions(struct i915_context *i915)
       i915->base.clear_render_target = i915_clear_render_target_render;
       i915->base.clear_depth_stencil = i915_clear_depth_stencil_render;
    }
+   i915->base.blit = i915_blit;
+   i915->base.flush_resource = i915_flush_resource;
    i915->base.create_surface = i915_create_surface;
    i915->base.surface_destroy = i915_surface_destroy;
 }