llvmpipe: clean-up lp_surface_copy()
Remove unreachable code, etc from previous revisions.
This commit is contained in:
@@ -56,6 +56,10 @@ lp_surface_copy(struct pipe_context *pipe,
|
|||||||
struct pipe_surface *src, unsigned srcx, unsigned srcy,
|
struct pipe_surface *src, unsigned srcx, unsigned srcy,
|
||||||
unsigned width, unsigned height)
|
unsigned width, unsigned height)
|
||||||
{
|
{
|
||||||
|
struct llvmpipe_resource *src_tex = llvmpipe_resource(src->texture);
|
||||||
|
struct llvmpipe_resource *dst_tex = llvmpipe_resource(dst->texture);
|
||||||
|
const enum pipe_format format = src_tex->base.format;
|
||||||
|
|
||||||
llvmpipe_flush_texture(pipe,
|
llvmpipe_flush_texture(pipe,
|
||||||
dst->texture, dst->face, dst->level,
|
dst->texture, dst->face, dst->level,
|
||||||
0, /* flush_flags */
|
0, /* flush_flags */
|
||||||
@@ -70,14 +74,6 @@ lp_surface_copy(struct pipe_context *pipe,
|
|||||||
FALSE, /* cpu_access */
|
FALSE, /* cpu_access */
|
||||||
FALSE); /* do_not_flush */
|
FALSE); /* do_not_flush */
|
||||||
|
|
||||||
/* Look for special case in which we're copying from a tiled image
|
|
||||||
* to a linear image.
|
|
||||||
*/
|
|
||||||
{
|
|
||||||
struct llvmpipe_resource *src_tex = llvmpipe_resource(src->texture);
|
|
||||||
struct llvmpipe_resource *dst_tex = llvmpipe_resource(dst->texture);
|
|
||||||
enum pipe_format format = src_tex->base.format;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
printf("surface copy from %u to %u: %u,%u to %u,%u %u x %u\n",
|
printf("surface copy from %u to %u: %u,%u to %u,%u %u x %u\n",
|
||||||
src_tex->id, dst_tex->id,
|
src_tex->id, dst_tex->id,
|
||||||
@@ -146,14 +142,8 @@ lp_surface_copy(struct pipe_context *pipe,
|
|||||||
src_linear_ptr, src_tex->stride[src->level],
|
src_linear_ptr, src_tex->stride[src->level],
|
||||||
srcx, srcy);
|
srcx, srcy);
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
util_surface_copy(pipe, FALSE,
|
|
||||||
dst, dstx, dsty,
|
|
||||||
src, srcx, srcy,
|
|
||||||
width, height);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
lp_init_surface_functions(struct llvmpipe_context *lp)
|
lp_init_surface_functions(struct llvmpipe_context *lp)
|
||||||
|
Reference in New Issue
Block a user