summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2019-02-01 17:10:46 -0500
committerDylan Baker <dylan@pnwbakers.com>2019-02-12 14:19:52 -0800
commitfb3485bc9248a12f47b07b593f0a81d58cbb3155 (patch)
treeb38c23c9b6ef6e51f5d8b5f2d07768a47e79755b
parent2a97a3a8e708ec104c7ac18fff7c518be7487900 (diff)
downloadmesa-fb3485bc9248a12f47b07b593f0a81d58cbb3155.tar.gz
mesa-fb3485bc9248a12f47b07b593f0a81d58cbb3155.tar.bz2
mesa-fb3485bc9248a12f47b07b593f0a81d58cbb3155.zip
gallium/u_threaded: fix EXPLICIT_FLUSH for flush offsets > 0
Cc: 18.3 19.0 <mesa-stable@lists.freedesktop.org> Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> (cherry picked from commit 4522f01d4ef9e8a1bb945ca28fba7649aae2171b)
-rw-r--r--src/gallium/auxiliary/util/u_threaded_context.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_threaded_context.c b/src/gallium/auxiliary/util/u_threaded_context.c
index 8e3bceae18d..b596c322918 100644
--- a/src/gallium/auxiliary/util/u_threaded_context.c
+++ b/src/gallium/auxiliary/util/u_threaded_context.c
@@ -1524,7 +1524,8 @@ tc_buffer_do_flush_region(struct threaded_context *tc,
if (ttrans->staging) {
struct pipe_box src_box;
- u_box_1d(ttrans->offset + box->x % tc->map_buffer_alignment,
+ u_box_1d(ttrans->offset + ttrans->b.box.x % tc->map_buffer_alignment +
+ (box->x - ttrans->b.box.x),
box->width, &src_box);
/* Copy the staging buffer into the original one. */