Mesa (master): gallium: properly check for src->dst blit compatibilities

Jerome Glisse glisse at kemper.freedesktop.org
Wed Dec 15 20:29:35 UTC 2010


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

Author: Jerome Glisse <jglisse at redhat.com>
Date:   Wed Dec 15 15:27:16 2010 -0500

gallium: properly check for src->dst blit compatibilities

Spotted by Christoph Bumiller & Jose Fonseca

Signed-off-by: Jerome Glisse <jglisse at redhat.com>

---

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

diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index 4c986e3..545021d 100644
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -738,8 +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(util_is_format_compatible(util_format_description(dst->format),
-                                       util_format_description(src->format)));
+      assert(util_is_format_compatible(util_format_description(src->format),
+                                       util_format_description(dst->format)));
    }
    assert(src->target < PIPE_MAX_TEXTURE_TYPES);
    /* XXX should handle 3d regions */




More information about the mesa-commit mailing list