diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-02-19 04:24:02 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-02-19 04:24:02 +0000 |
| commit | cbd6affc1bcf169c184a3241747a6691c9a58bf7 (patch) | |
| tree | 2bfc8a9bc5322b924e8558d39140656e1a2a1c05 /lib/mesa/src/gallium/drivers/swr | |
| parent | df3e736303c669580785ffc3f94a16997685c8df (diff) | |
Merge Mesa 18.3.4
Diffstat (limited to 'lib/mesa/src/gallium/drivers/swr')
| -rw-r--r-- | lib/mesa/src/gallium/drivers/swr/swr_fence.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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; } /* |