diff options
| author | Marek Olšák <[email protected]> | 2011-04-21 15:13:34 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-04-21 15:51:18 +0200 |
| commit | 4ad63659c09499f4e538d71aec42035246747ffd (patch) | |
| tree | 38809318ca91580b5a254e4dfecd9f6e475a3ae7 | |
| parent | f9dafcb8f242a6f0d06ff3dcb2d4bb7d73b91b57 (diff) | |
galahad,util: warn on resource target mismatch in copy_region
Reviewed-by: Jakob Bornecrantz <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/util/u_surface.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/galahad/glhd_context.c | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/util/u_surface.c b/src/gallium/auxiliary/util/u_surface.c index 43a026691d3..4c5cc4da182 100644 --- a/src/gallium/auxiliary/util/u_surface.c +++ b/src/gallium/auxiliary/util/u_surface.c @@ -157,6 +157,9 @@ util_resource_copy_region(struct pipe_context *pipe, unsigned h = src_box->height; assert(src && dst); + assert((src->target == PIPE_BUFFER && dst->target == PIPE_BUFFER) || + (src->target != PIPE_BUFFER && dst->target != PIPE_BUFFER)); + if (!src || !dst) return; diff --git a/src/gallium/drivers/galahad/glhd_context.c b/src/gallium/drivers/galahad/glhd_context.c index 813a21e2ee3..f73d8a5d32e 100644 --- a/src/gallium/drivers/galahad/glhd_context.c +++ b/src/gallium/drivers/galahad/glhd_context.c @@ -685,6 +685,12 @@ galahad_resource_copy_region(struct pipe_context *_pipe, util_format_short_name(_dst->format)); } + if ((_src->target == PIPE_BUFFER && _dst->target != PIPE_BUFFER) || + (_src->target != PIPE_BUFFER && _dst->target == PIPE_BUFFER)) { + glhd_warn("Resource target mismatch: Source is %i, destination is %i", + _src->target, _dst->target); + } + pipe->resource_copy_region(pipe, dst, dst_level, |