[Mesa-dev] [PATCH] swr: Fix BugID 9919 compile error (icc-only).

Bruce Cherniak bruce.cherniak at intel.com
Fri Dec 23 00:06:41 UTC 2016


ICC doesn't like the use of nullptr (std::nullptr_t) argument in
p_atomic_set.  GCC and clang don't complain.
---
 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 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 @@ 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.7.4



More information about the mesa-dev mailing list