Mesa (gallium-resources): util: fix assertion failures in pipe_buffer_flush_mapped_range

[Keith Whitwell]

Module: Mesa
Branch: gallium-resources
Commit: fec8a1db13fac04ef56f6ece799d1f20aa3011db
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fec8a1db13fac04ef56f6ece799d1f20aa3011db

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sat Apr  3 07:58:34 2010 +0200

util: fix assertion failures in pipe_buffer_flush_mapped_range

---

 src/gallium/auxiliary/util/u_inlines.h    |    2 +-
 src/gallium/auxiliary/util/u_upload_mgr.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_inlines.h b/src/gallium/auxiliary/util/u_inlines.h
index b1f2285..f9cd4e1 100644
--- a/src/gallium/auxiliary/util/u_inlines.h
+++ b/src/gallium/auxiliary/util/u_inlines.h
@@ -223,7 +223,7 @@ pipe_buffer_flush_mapped_range(struct pipe_context *pipe,
 
    assert(length);
    assert(transfer->box.x <= offset);
-   assert(transfer->box.x + transfer->box.width <= offset + length);
+   assert(offset + length <= transfer->box.x + transfer->box.width);
 
    /* Match old screen->buffer_flush_mapped_range() behaviour, where
     * offset parameter is relative to the start of the buffer, not the
diff --git a/src/gallium/auxiliary/util/u_upload_mgr.c b/src/gallium/auxiliary/util/u_upload_mgr.c
index f8c3954..75d4443 100644
--- a/src/gallium/auxiliary/util/u_upload_mgr.c
+++ b/src/gallium/auxiliary/util/u_upload_mgr.c
@@ -95,7 +95,7 @@ my_buffer_write(struct pipe_context *pipe,
    assert(dirty_size >= size);
    assert(size);
 
-   map = pipe_buffer_map_range(pipe, buf, offset, size, 
+   map = pipe_buffer_map_range(pipe, buf, offset, dirty_size,
                                PIPE_TRANSFER_WRITE |
                                PIPE_TRANSFER_FLUSH_EXPLICIT |
                                PIPE_TRANSFER_DISCARD |