Mesa (master): u_blitter: use util_is_format_compatible in the assert

Marek Olšák mareko at kemper.freedesktop.org
Tue Dec 7 08:13:00 UTC 2010


Module: Mesa
Branch: master
Commit: 857d107bfe1d8c98e614f93da06588639576d3fe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=857d107bfe1d8c98e614f93da06588639576d3fe

Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Dec  7 06:22:38 2010 +0100

u_blitter: use util_is_format_compatible in the assert

---

 src/gallium/auxiliary/util/u_blitter.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index eeed87e..4c986e3 100644
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -738,7 +738,8 @@ void util_blitter_copy_region(struct blitter_context *blitter,
       assert(!is_overlap(srcbox->x, srcbox->x + width, srcbox->y, srcbox->y + height,
                          dstx, dstx + width, dsty, dsty + height));
    } else {
-      assert(dst->format == src->format);
+      assert(util_is_format_compatible(util_format_description(dst->format),
+                                       util_format_description(src->format)));
    }
    assert(src->target < PIPE_MAX_TEXTURE_TYPES);
    /* XXX should handle 3d regions */




More information about the mesa-commit mailing list