fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 09:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan: Add run-time object type asserts in handle casts

Browse source 
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Kristian H. Kristensen <hoegsberg@google.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4690>
This commit is contained in:
Jason Ekstrand 2020-04-21 15:51:01 -05:00 • committed by Marge Bot
parent 7628585dd7
commit 32f20783a5
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/vulkan/util/vk_object.c
View file

@ -29,6 +29,9 @@ vk_object_base_init(UNUSED struct vk_device *device,
UNUSED VkObjectType obj_type) UNUSED VkObjectType obj_type)
{ {
base->_loader_data.loaderMagic = ICD_LOADER_MAGIC; base->_loader_data.loaderMagic = ICD_LOADER_MAGIC;
#ifndef NDEBUG
base->type = obj_type;
#endif
} }
void void

21
src/vulkan/util/vk_object.h
View file

@ -36,6 +36,9 @@ struct vk_device;
struct vk_object_base { struct vk_object_base {
VK_LOADER_DATA _loader_data; VK_LOADER_DATA _loader_data;
#ifndef NDEBUG
VkObjectType type;
#endif
}; };
void vk_object_base_init(UNUSED struct vk_device *device, void vk_object_base_init(UNUSED struct vk_device *device,
@ -43,6 +46,13 @@ void vk_object_base_init(UNUSED struct vk_device *device,
UNUSED VkObjectType obj_type); UNUSED VkObjectType obj_type);
void vk_object_base_finish(UNUSED struct vk_object_base *base); void vk_object_base_finish(UNUSED struct vk_object_base *base);
static inline void
vk_object_base_assert_valid(ASSERTED struct vk_object_base *base,
ASSERTED VkObjectType obj_type)
{
assert(base == NULL || base->type == obj_type);
}
struct vk_device { struct vk_device {
struct vk_object_base base; struct vk_object_base base;
@ -59,13 +69,16 @@ void vk_device_finish(struct vk_device *device);
static inline struct __driver_type * \ static inline struct __driver_type * \
__driver_type ## _from_handle(__VkType _handle) \ __driver_type ## _from_handle(__VkType _handle) \
{ \ { \
struct vk_object_base *base = (struct vk_object_base *)_handle; \
vk_object_base_assert_valid(base, __VK_TYPE); \
STATIC_ASSERT(offsetof(struct __driver_type, __base) == 0); \ STATIC_ASSERT(offsetof(struct __driver_type, __base) == 0); \
return (struct __driver_type *) _handle; \ return (struct __driver_type *) base; \
} \ } \
\ \
static inline __VkType \ static inline __VkType \
__driver_type ## _to_handle(struct __driver_type *_obj) \ __driver_type ## _to_handle(struct __driver_type *_obj) \
{ \ { \
vk_object_base_assert_valid(&_obj->__base, __VK_TYPE); \
return (__VkType) _obj; \ return (__VkType) _obj; \
} }
@ -73,13 +86,17 @@ void vk_device_finish(struct vk_device *device);
static inline struct __driver_type * \ static inline struct __driver_type * \
__driver_type ## _from_handle(__VkType _handle) \ __driver_type ## _from_handle(__VkType _handle) \
{ \ { \
struct vk_object_base *base = \
(struct vk_object_base *)(uintptr_t)_handle; \
vk_object_base_assert_valid(base, __VK_TYPE); \
STATIC_ASSERT(offsetof(struct __driver_type, __base) == 0); \ STATIC_ASSERT(offsetof(struct __driver_type, __base) == 0); \
return (struct __driver_type *)(uintptr_t) _handle; \ return (struct __driver_type *)base; \
} \ } \
\ \
static inline __VkType \ static inline __VkType \
__driver_type ## _to_handle(struct __driver_type *_obj) \ __driver_type ## _to_handle(struct __driver_type *_obj) \
{ \ { \
vk_object_base_assert_valid(&_obj->__base, __VK_TYPE); \
return (__VkType)(uintptr_t) _obj; \ return (__VkType)(uintptr_t) _obj; \
} }