From cbd6affc1bcf169c184a3241747a6691c9a58bf7 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Tue, 19 Feb 2019 04:24:02 +0000 Subject: Merge Mesa 18.3.4 --- lib/mesa/src/gallium/drivers/swr/swr_fence.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/mesa/src/gallium/drivers/swr') diff --git a/lib/mesa/src/gallium/drivers/swr/swr_fence.cpp b/lib/mesa/src/gallium/drivers/swr/swr_fence.cpp index b05ac8cec..074d82a3b 100644 --- a/lib/mesa/src/gallium/drivers/swr/swr_fence.cpp +++ b/lib/mesa/src/gallium/drivers/swr/swr_fence.cpp @@ -50,7 +50,9 @@ swr_fence_cb(uint64_t userData, uint64_t userData2, uint64_t userData3) swr_fence_do_work(fence); /* Correct value is in SwrSync data, and not the fence write field. */ - fence->read = userData2; + /* Contexts may not finish in order, but fence value always increases */ + if (fence->read < userData2) + fence->read = userData2; } /* -- cgit v1.2.3