summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/i915
diff options
context:
space:
mode:
authorStéphane Marchesin <[email protected]>2014-05-28 10:29:40 -0700
committerStéphane Marchesin <[email protected]>2014-05-28 19:53:51 -0700
commit9e59c91a73903638eb5b807950d59fdf2dd981ce (patch)
tree08b0fdd4edef13a009a1c464d1cd703d427fbf97 /src/gallium/drivers/i915
parentfc7e7cfabc9f9453e21fdacb9c84d3c7a325bbd4 (diff)
i915g: Fix copy region code
This fixes a few issues with it, also cleans up the code.
Diffstat (limited to 'src/gallium/drivers/i915')
-rw-r--r--src/gallium/drivers/i915/i915_surface.c48
1 files changed, 14 insertions, 34 deletions
diff --git a/src/gallium/drivers/i915/i915_surface.c b/src/gallium/drivers/i915/i915_surface.c
index 8afe8d07867..61c5441acd2 100644
--- a/src/gallium/drivers/i915/i915_surface.c
+++ b/src/gallium/drivers/i915/i915_surface.c
@@ -73,7 +73,7 @@ i915_util_blitter_save_states(struct i915_context *i915)
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,
@@ -81,53 +81,28 @@ i915_surface_copy_render(struct pipe_context *pipe,
struct pipe_resource *src, unsigned src_level,
const struct pipe_box *src_box)
{
- struct pipe_screen *screen = pipe->screen;
struct i915_context *i915 = i915_context(pipe);
- struct i915_texture *dst_tex = i915_texture(dst);
- struct i915_texture *src_tex = i915_texture(src);
unsigned src_width0 = src->width0;
unsigned src_height0 = src->height0;
unsigned dst_width0 = dst->width0;
unsigned dst_height0 = dst->height0;
- unsigned layout;
struct pipe_box dstbox;
struct pipe_sampler_view src_templ, *src_view;
struct pipe_surface dst_templ, *dst_view;
/* Fallback for buffers and npot. */
if ((dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) ||
- !util_is_power_of_two(src_width0) || !util_is_power_of_two(src_height0)) {
- util_resource_copy_region(pipe, dst, dst_level, dstx, dsty, dstz,
- src, src_level, src_box);
- return;
- }
-
- layout = util_format_description(dst_templ.format)->layout;
-
- if (!util_blitter_is_copy_supported(i915->blitter, dst, src)) {
- switch (util_format_get_blocksize(dst_templ.format)) {
- case 1:
- dst_templ.format = PIPE_FORMAT_I8_UNORM;
- break;
- case 2:
- dst_templ.format = PIPE_FORMAT_B5G6R5_UNORM;
- break;
- case 4:
- dst_templ.format = PIPE_FORMAT_B8G8R8A8_UNORM;
- break;
- default:
- debug_printf("i915: copy_region: Unhandled format: %s. Falling back to software.\n"
- "i915: copy_region: Software fallback doesn't work for tiled textures.\n",
- util_format_short_name(dst_templ.format));
- }
- src_templ.format = dst_templ.format;
- }
-
- i915_util_blitter_save_states(i915);
+ !util_is_power_of_two(src_width0) || !util_is_power_of_two(src_height0))
+ goto fallback;
util_blitter_default_dst_texture(&dst_templ, dst, dst_level, dstz);
util_blitter_default_src_texture(&src_templ, src, src_level);
+ if (!util_blitter_is_copy_supported(i915->blitter, dst, src))
+ goto fallback;
+
+ i915_util_blitter_save_states(i915);
+
dst_view = i915_create_surface_custom(pipe, dst, &dst_templ, dst_width0, dst_height0);
src_view = i915_create_sampler_view_custom(pipe, src, &src_templ, src_width0, src_height0);
@@ -137,7 +112,12 @@ i915_surface_copy_render(struct pipe_context *pipe,
util_blitter_blit_generic(i915->blitter, dst_view, &dstbox,
src_view, src_box, src_width0, src_height0,
PIPE_MASK_RGBAZS, PIPE_TEX_FILTER_NEAREST, NULL);
-}
+ return;
+
+fallback:
+ util_resource_copy_region(pipe, dst, dst_level, dstx, dsty, dstz,
+ src, src_level, src_box);
+ }
static void
i915_clear_render_target_render(struct pipe_context *pipe,