Module: Mesa Branch: main Commit: 09061e2fe91d1bfa21327893c1544e0c9dae284e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=09061e2fe91d1bfa21327893c1544e0c9dae284e
Author: Yonggang Luo <[email protected]> Date: Thu Nov 3 23:48:31 2022 +0800 vulkan: Use static_assert for check HWVULKAN_DISPATCH_MAGIC == ICD_LOADER_MAGIC Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Erik Faye-Lund <[email protected]> Reviewed-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21210> --- src/amd/vulkan/radv_android.c | 6 +----- src/broadcom/vulkan/v3dv_android.c | 6 +----- src/freedreno/vulkan/tu_android.c | 6 +----- src/intel/vulkan/anv_android.c | 6 +----- src/intel/vulkan_hasvk/anv_android.c | 6 +----- src/virtio/vulkan/vn_android.c | 6 +----- 6 files changed, 6 insertions(+), 30 deletions(-) diff --git a/src/amd/vulkan/radv_android.c b/src/amd/vulkan/radv_android.c index 18330e9e2df..63785f7f6f1 100644 --- a/src/amd/vulkan/radv_android.c +++ b/src/amd/vulkan/radv_android.c @@ -44,11 +44,7 @@ static int radv_hal_open(const struct hw_module_t *mod, const char *id, struct hw_device_t **dev); static int radv_hal_close(struct hw_device_t *dev); -static void UNUSED -static_asserts(void) -{ - STATIC_ASSERT(HWVULKAN_DISPATCH_MAGIC == ICD_LOADER_MAGIC); -} +static_assert(HWVULKAN_DISPATCH_MAGIC == ICD_LOADER_MAGIC, ""); PUBLIC struct hwvulkan_module_t HAL_MODULE_INFO_SYM = { .common = diff --git a/src/broadcom/vulkan/v3dv_android.c b/src/broadcom/vulkan/v3dv_android.c index cbf1dbad9b3..d217aaf11d6 100644 --- a/src/broadcom/vulkan/v3dv_android.c +++ b/src/broadcom/vulkan/v3dv_android.c @@ -46,11 +46,7 @@ v3dv_hal_open(const struct hw_module_t *mod, static int v3dv_hal_close(struct hw_device_t *dev); -static void UNUSED -static_asserts(void) -{ - STATIC_ASSERT(HWVULKAN_DISPATCH_MAGIC == ICD_LOADER_MAGIC); -} +static_assert(HWVULKAN_DISPATCH_MAGIC == ICD_LOADER_MAGIC, ""); PUBLIC struct hwvulkan_module_t HAL_MODULE_INFO_SYM = { .common = diff --git a/src/freedreno/vulkan/tu_android.c b/src/freedreno/vulkan/tu_android.c index d1f6bb3abfa..10295579385 100644 --- a/src/freedreno/vulkan/tu_android.c +++ b/src/freedreno/vulkan/tu_android.c @@ -29,11 +29,7 @@ tu_hal_open(const struct hw_module_t *mod, static int tu_hal_close(struct hw_device_t *dev); -static void UNUSED -static_asserts(void) -{ - STATIC_ASSERT(HWVULKAN_DISPATCH_MAGIC == ICD_LOADER_MAGIC); -} +static_assert(HWVULKAN_DISPATCH_MAGIC == ICD_LOADER_MAGIC, ""); PUBLIC struct hwvulkan_module_t HAL_MODULE_INFO_SYM = { .common = diff --git a/src/intel/vulkan/anv_android.c b/src/intel/vulkan/anv_android.c index 0394488fe43..c241a0e4624 100644 --- a/src/intel/vulkan/anv_android.c +++ b/src/intel/vulkan/anv_android.c @@ -40,11 +40,7 @@ static int anv_hal_open(const struct hw_module_t* mod, const char* id, struct hw_device_t** dev); static int anv_hal_close(struct hw_device_t *dev); -static void UNUSED -static_asserts(void) -{ - STATIC_ASSERT(HWVULKAN_DISPATCH_MAGIC == ICD_LOADER_MAGIC); -} +static_assert(HWVULKAN_DISPATCH_MAGIC == ICD_LOADER_MAGIC, ""); PUBLIC struct hwvulkan_module_t HAL_MODULE_INFO_SYM = { .common = { diff --git a/src/intel/vulkan_hasvk/anv_android.c b/src/intel/vulkan_hasvk/anv_android.c index 204c4a1fca9..03c7c67cccd 100644 --- a/src/intel/vulkan_hasvk/anv_android.c +++ b/src/intel/vulkan_hasvk/anv_android.c @@ -40,11 +40,7 @@ static int anv_hal_open(const struct hw_module_t* mod, const char* id, struct hw_device_t** dev); static int anv_hal_close(struct hw_device_t *dev); -static void UNUSED -static_asserts(void) -{ - STATIC_ASSERT(HWVULKAN_DISPATCH_MAGIC == ICD_LOADER_MAGIC); -} +static_assert(HWVULKAN_DISPATCH_MAGIC == ICD_LOADER_MAGIC, ""); PUBLIC struct hwvulkan_module_t HAL_MODULE_INFO_SYM = { .common = { diff --git a/src/virtio/vulkan/vn_android.c b/src/virtio/vulkan/vn_android.c index d5016e8ad4f..94f9a35af86 100644 --- a/src/virtio/vulkan/vn_android.c +++ b/src/virtio/vulkan/vn_android.c @@ -191,11 +191,7 @@ vn_hal_open(const struct hw_module_t *mod, const char *id, struct hw_device_t **dev); -static void UNUSED -static_asserts(void) -{ - STATIC_ASSERT(HWVULKAN_DISPATCH_MAGIC == ICD_LOADER_MAGIC); -} +static_assert(HWVULKAN_DISPATCH_MAGIC == ICD_LOADER_MAGIC, ""); PUBLIC struct hwvulkan_module_t HAL_MODULE_INFO_SYM = { .common = {
