har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan: return VK_NOT_READY when no queries are available

Browse Source 
Fixes a validation issue.
The issue is that the function gets called before we've sumitted a frame
for decoding to that context. However, we cannot run queries before
they've been reset, which happens at submission time.
As we'd need to otherwise run a command queue at init-time, just check
if submissions have happened.
This commit is contained in:
Lynne 2023-10-25 22:58:20 +00:00
parent 1ad7bd0fe5
commit 1a8e766984
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavutil/vulkan.c
View File

@ -456,6 +456,9 @@ VkResult ff_vk_exec_get_query(FFVulkanContext *s, FFVkExecContext *e,
int64_t res = 0; int64_t res = 0;
VkQueryResultFlags qf = 0; VkQueryResultFlags qf = 0;
if (!e->had_submission)
return VK_NOT_READY;
qf |= pool->query_64bit ? qf |= pool->query_64bit ?
VK_QUERY_RESULT_64_BIT : 0x0; VK_QUERY_RESULT_64_BIT : 0x0;
qf |= pool->query_statuses ? qf |= pool->query_statuses ?
@ -779,6 +782,8 @@ int ff_vk_exec_submit(FFVulkanContext *s, FFVkExecContext *e)
} }
} }
e->had_submission = 1;
return 0; return 0;
} }

1
libavutil/vulkan.h
View File

@ -154,6 +154,7 @@ typedef struct FFVkExecContext {
uint32_t idx; uint32_t idx;
const struct FFVkExecPool *parent; const struct FFVkExecPool *parent;
pthread_mutex_t lock; pthread_mutex_t lock;
int had_submission;
/* Queue for the execution context */ /* Queue for the execution context */
VkQueue queue; VkQueue queue;