From 9e35426731bc0bfee4eeeb828f61c026a97c841c Mon Sep 17 00:00:00 2001 From: Bruce Cherniak Date: Thu, 22 Dec 2016 18:06:41 -0600 Subject: [PATCH] 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 --- src/gallium/drivers/swr/swr_fence_work.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.30.2