diff options
| author | Bruce Cherniak <[email protected]> | 2016-12-22 18:06:41 -0600 |
|---|---|---|
| committer | Tim Rowley <[email protected]> | 2016-12-23 08:36:21 -0600 |
| commit | 9e35426731bc0bfee4eeeb828f61c026a97c841c (patch) | |
| tree | 6ab8d4fc8b90643fa6f1643992a07b32eca71cfd /src/gallium | |
| parent | e7279f16a0bf37a26e2556b188c760cd16fd60bb (diff) | |
swr: fix icc compile error
ICC doesn't like the use of nullptr (std::nullptr_t) argument in
p_atomic_set. GCC and clang don't complain.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99119
Reviewed-by: Tim Rowley <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/swr/swr_fence_work.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/swr/swr_fence_work.cpp b/src/gallium/drivers/swr/swr_fence_work.cpp index 3f83e61512e..1fd2a834afc 100644 --- a/src/gallium/drivers/swr/swr_fence_work.cpp +++ b/src/gallium/drivers/swr/swr_fence_work.cpp @@ -39,7 +39,7 @@ swr_fence_do_work(struct swr_fence *fence) work = fence->work.head.next; /* Immediately clear the head so any new work gets added to a new work * queue */ - p_atomic_set(&fence->work.head.next, nullptr); + p_atomic_set(&fence->work.head.next, 0); p_atomic_set(&fence->work.tail, &fence->work.head); p_atomic_set(&fence->work.count, 0); |