commit 9e35426731bc0bfee4eeeb828f61c026a97c841c
author Bruce Cherniak <bruce.cherniak@intel.com> Thu Dec 22 18:06:41 2016 -0600
committer Tim Rowley <timothy.o.rowley@intel.com> Fri Dec 23 08:36:21 2016 -0600
tree 6ab8d4fc8b90643fa6f1643992a07b32eca71cfd
parent e7279f16a0bf37a26e2556b188c760cd16fd60bb

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 <timothy.o.rowley@intel.com>

src/gallium/drivers/swr/swr_fence_work.cpp

diff --git a/src/gallium/drivers/swr/swr_fence_work.cpp b/src/gallium/drivers/swr/swr_fence_work.cpp
index 3f83e61..1fd2a83 100644
--- a/src/gallium/drivers/swr/swr_fence_work.cpp
+++ b/src/gallium/drivers/swr/swr_fence_work.cpp
@@ -39,7 +39,7 @@
       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);