Mesa (master): swr: fix icc compile error
Tim Rowley
torowley at kemper.freedesktop.org
Fri Dec 23 14:39:09 UTC 2016
Module: Mesa
Branch: master
Commit: 9e35426731bc0bfee4eeeb828f61c026a97c841c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e35426731bc0bfee4eeeb828f61c026a97c841c
Author: Bruce Cherniak <bruce.cherniak at intel.com>
Date: Thu Dec 22 18:06:41 2016 -0600
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 at intel.com>
---
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);
More information about the mesa-commit
mailing list