glhd: Grab resource_copy_region from r300g.

This commit is contained in:
Corbin Simpson 2010-06-22 22:46:15 -07:00
parent de7b181e99
commit 3f758d4ed4
2 changed files with 8 additions and 8 deletions

View file

@ -27,6 +27,8 @@
#include "pipe/p_context.h"
#include "util/u_format.h"
#include "util/u_memory.h"
#include "util/u_inlines.h"
@ -633,6 +635,12 @@ galahad_resource_copy_region(struct pipe_context *_pipe,
struct pipe_resource *dst = glhd_resource_dst->resource;
struct pipe_resource *src = glhd_resource_src->resource;
if (_dst->format != _src->format) {
glhd_warn("Format mismatch: Source is %s, destination is %s",
util_format_short_name(_src->format),
util_format_short_name(_dst->format));
}
pipe->resource_copy_region(pipe,
dst,
subdst,

View file

@ -185,14 +185,6 @@ static void r300_resource_copy_region(struct pipe_context *pipe,
enum pipe_format old_format = dst->format;
enum pipe_format new_format = old_format;
if (dst->format != src->format) {
debug_printf("r300: Implementation error: Format mismatch in %s\n"
" : src: %s dst: %s\n", __FUNCTION__,
util_format_short_name(src->format),
util_format_short_name(dst->format));
debug_assert(0);
}
if (!pipe->screen->is_format_supported(pipe->screen,
old_format, src->target,
src->nr_samples,