zink: cast pointers to uintptr_t
authorErik Faye-Lund <erik.faye-lund@collabora.com>
Thu, 24 Jun 2021 11:30:20 +0000 (13:30 +0200)
committerMarge Bot <eric+marge@anholt.net>
Thu, 24 Jun 2021 17:51:47 +0000 (17:51 +0000)
The way p_atomic_cmpxchg is implemented on Windows really wants us to
use integers instead of things like pointers. So let's use uintptr_t
here. It seems cleaner to use that than the value zero for the last
argument, because it shows the intent of the code more clearly.

Fixes: d80d9e1c935 ("zink: queue v3.0")
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11424>

src/gallium/drivers/zink/zink_batch.h

index 02178c0..0baed1c 100644 (file)
@@ -189,7 +189,7 @@ zink_batch_usage_is_unflushed(const struct zink_batch_usage *u)
 static inline void
 zink_batch_usage_unset(struct zink_batch_usage **u, struct zink_batch_state *bs)
 {
-   (void)p_atomic_cmpxchg(u, &bs->usage, NULL);
+   (void)p_atomic_cmpxchg((uintptr_t *)u, (uintptr_t)&bs->usage, (uintptr_t)NULL);
 }
 
 static inline void