Mesa (master): anv: use STATIC_ASSERT instead of static_assert
Tapani Pälli
tpalli at kemper.freedesktop.org
Fri Nov 11 06:00:31 UTC 2016
Module: Mesa
Branch: master
Commit: 23d1799f7dd5f8d1e8aa9f4efa6b1a4ed45faaa0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=23d1799f7dd5f8d1e8aa9f4efa6b1a4ed45faaa0
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Wed Nov 9 09:02:39 2016 +0200
anv: use STATIC_ASSERT instead of static_assert
fixes following compilation warnings on Android build:
"warning: implicit declaration of function 'static_assert' is invalid in
C99 [-Wimplicit-function-declaration]"
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
---
src/intel/vulkan/anv_private.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 2cd487af..30deb02 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -159,7 +159,7 @@ anv_clear_mask(uint32_t *inout_mask, uint32_t clear_mask)
__dword &= ~(1 << (b)))
#define typed_memcpy(dest, src, count) ({ \
- static_assert(sizeof(*src) == sizeof(*dest), ""); \
+ STATIC_ASSERT(sizeof(*src) == sizeof(*dest)); \
memcpy((dest), (src), (count) * sizeof(*(src))); \
})
@@ -725,7 +725,7 @@ _anv_combine_address(struct anv_batch *batch, void *location,
do { \
uint32_t *dw; \
\
- static_assert(ARRAY_SIZE(dwords0) == ARRAY_SIZE(dwords1), "mismatch merge"); \
+ STATIC_ASSERT(ARRAY_SIZE(dwords0) == ARRAY_SIZE(dwords1)); \
dw = anv_batch_emit_dwords((batch), ARRAY_SIZE(dwords0)); \
for (uint32_t i = 0; i < ARRAY_SIZE(dwords0); i++) \
dw[i] = (dwords0)[i] | (dwords1)[i]; \
More information about the mesa-commit
mailing list