diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-22 08:31:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-22 08:31:31 +0200 |
| commit | b318686d7779dab877e5fb33b7d97034cf8f44a8 (patch) | |
| tree | 8fd256304d1aac04400eead7b5f54743c472f233 /mesalib/src/gallium/auxiliary/util/u_upload_mgr.c | |
| parent | 63f9a2c22dbac3e52e4d875bd70d729de5f81a43 (diff) | |
| parent | 34d741a3fc96c9424ffec29b114a1bdfde40f8b0 (diff) | |
| download | vcxsrv-b318686d7779dab877e5fb33b7d97034cf8f44a8.tar.gz vcxsrv-b318686d7779dab877e5fb33b7d97034cf8f44a8.tar.bz2 vcxsrv-b318686d7779dab877e5fb33b7d97034cf8f44a8.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa pixman git update 22 oct 2012
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_upload_mgr.c')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_upload_mgr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_upload_mgr.c b/mesalib/src/gallium/auxiliary/util/u_upload_mgr.c index b62973de6..ee1c6881e 100644 --- a/mesalib/src/gallium/auxiliary/util/u_upload_mgr.c +++ b/mesalib/src/gallium/auxiliary/util/u_upload_mgr.c @@ -76,7 +76,7 @@ void u_upload_unmap( struct u_upload_mgr *upload ) { if (upload->transfer) { struct pipe_box *box = &upload->transfer->box; - if (upload->offset > box->x) { + if ((int) upload->offset > box->x) { pipe_buffer_flush_mapped_range(upload->pipe, upload->transfer, box->x, upload->offset - box->x); |