KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vulkan/sync: Rework asserts a bit 

ANV currently smashes off the TIMELINE bit depending on whether or not
the i915 interface supports them, triggering assert(!type->get_value).
Instead of requiring ANV to smash off function pointers, let the extra
function pointers through and then assert on the feature bits before the
function pointers get used.  This should give us roughly the same amount
of assert protection while side-stepping the feature disabling problem.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13839>
This commit is contained in:
Jason Ekstrand 2021-11-17 09:24:40 -06:00 committed by Marge Bot
parent 0c74f80645
commit 63baeffc2d
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/vulkan/runtime/vk_sync.c
View File

@ -51,8 +51,6 @@ vk_sync_type_validate(const struct vk_sync_type *type)
VK_SYNC_FEATURE_WAIT_PENDING));
assert(type->signal);
assert(type->get_value);
} else {
assert(!type->get_value);
}
if (!(type->features & VK_SYNC_FEATURE_BINARY)) {
@ -74,13 +72,9 @@ vk_sync_type_validate(const struct vk_sync_type *type)
if (type->features & VK_SYNC_FEATURE_CPU_RESET)
assert(type->reset);
else
assert(!type->reset);
if (type->features & VK_SYNC_FEATURE_CPU_SIGNAL)
assert(type->signal);
else
assert(!type->signal);
}
VkResult
@ -150,6 +144,8 @@ vk_sync_signal(struct vk_device *device,
struct vk_sync *sync,
uint64_t value)
{
assert(sync->type->features & VK_SYNC_FEATURE_CPU_SIGNAL);
if (sync->flags & VK_SYNC_IS_TIMELINE)
assert(value > 0);
else
@ -171,6 +167,7 @@ VkResult
vk_sync_reset(struct vk_device *device,
struct vk_sync *sync)
{
assert(sync->type->features & VK_SYNC_FEATURE_CPU_RESET);
assert(!(sync->flags & VK_SYNC_IS_TIMELINE));
return sync->type->reset(device, sync);
}