diff options
| author | Corbin Simpson <MostAwesomeDude@gmail.com> | 2010-06-22 22:46:15 -0700 |
|---|---|---|
| committer | Corbin Simpson <MostAwesomeDude@gmail.com> | 2010-06-22 22:49:13 -0700 |
| commit | 3f758d4ed42f6b4c6bed60f8270ef908d3829ee5 (patch) | |
| tree | bf1e11ced97502cc6c916ec80b210ac883e3bb24 /src | |
| parent | de7b181e99a64cb517a021f00f714c6af9b337ee (diff) | |
glhd: Grab resource_copy_region from r300g.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/galahad/glhd_context.c | 8 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_blit.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/galahad/glhd_context.c b/src/gallium/drivers/galahad/glhd_context.c index ae4fc923e42..6dfee2c7a71 100644 --- a/src/gallium/drivers/galahad/glhd_context.c +++ b/src/gallium/drivers/galahad/glhd_context.c @@ -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, diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c index 2a477012912..389354c4e4a 100644 --- a/src/gallium/drivers/r300/r300_blit.c +++ b/src/gallium/drivers/r300/r300_blit.c @@ -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, |