fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i915g: implement blit

Browse source 
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák 2012-09-13 00:34:01 +02:00
parent 2a309dc2b4
commit 6d2f59ce54
2 changed files with 61 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gallium/drivers/i915/i915_context.c
View file

@ -187,6 +187,13 @@ i915_create_context(struct pipe_screen *screen, void *priv)
i915_init_resource_functions(i915);
i915_init_query_functions(i915);
/* Create blitter. */
i915->blitter = util_blitter_create(&i915->base);
assert(i915->blitter);
/* must be done before installing Draw stages */
util_blitter_cache_all_shaders(i915->blitter);
draw_install_aaline_stage(i915->draw, &i915->base);
draw_install_aapoint_stage(i915->draw, &i915->base);
draw_enable_point_sprites(i915->draw, TRUE);
@ -194,10 +201,6 @@ i915_create_context(struct pipe_screen *screen, void *priv)
/* augmented draw pipeline clobbers state functions */
i915_init_fixup_state_functions(i915);
/* Create blitter last - calls state creation functions. */
i915->blitter = util_blitter_create(&i915->base);
assert(i915->blitter);
i915->dirty = ~0;
i915->hardware_dirty = ~0;
i915->immediate_dirty = ~0;

73
src/gallium/drivers/i915/i915_surface.c
View file

@ -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->saved_fs);
util_blitter_save_vertex_shader(i915->blitter, i915->saved_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->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);
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);
}
static void
i915_surface_copy_render(struct pipe_context *pipe,
struct pipe_resource *dst, unsigned dst_level,
@ -66,25 +91,7 @@ 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_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);
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_texture(i915->blitter, dst, dst_level, dstx, dsty, dstz,
src, src_level, src_box, PIPE_MASK_RGBAZS, TRUE);
@ -205,6 +212,33 @@ 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_clear_render_target_blitter(struct pipe_context *pipe,
struct pipe_surface *dst,
@ -325,6 +359,7 @@ 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.create_surface = i915_create_surface;
i915->base.surface_destroy = i915_surface_destroy;
}