diff options
| -rw-r--r-- | src/intel/vulkan/anv_private.h | 28 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_queue.c | 32 |
2 files changed, 54 insertions, 6 deletions
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 38f7bccc0e5..7fc732f24f7 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -1706,6 +1706,33 @@ struct anv_event { struct anv_state state; }; +enum anv_semaphore_type { + ANV_SEMAPHORE_TYPE_NONE = 0, + ANV_SEMAPHORE_TYPE_DUMMY +}; + +struct anv_semaphore_impl { + enum anv_semaphore_type type; +}; + +struct anv_semaphore { + /* Permanent semaphore state. Every semaphore has some form of permanent + * state (type != ANV_SEMAPHORE_TYPE_NONE). This may be a BO to fence on + * (for cross-process semaphores0 or it could just be a dummy for use + * internally. + */ + struct anv_semaphore_impl permanent; + + /* Temporary semaphore state. A semaphore *may* have temporary state. + * That state is added to the semaphore by an import operation and is reset + * back to ANV_SEMAPHORE_TYPE_NONE when the semaphore is waited on. A + * semaphore with temporary state cannot be signaled because the semaphore + * must already be signaled before the temporary state can be exported from + * the semaphore in the other process and imported here. + */ + struct anv_semaphore_impl temporary; +}; + struct anv_shader_module { unsigned char sha1[20]; uint32_t size; @@ -2316,6 +2343,7 @@ ANV_DEFINE_NONDISP_HANDLE_CASTS(anv_pipeline_layout, VkPipelineLayout) ANV_DEFINE_NONDISP_HANDLE_CASTS(anv_query_pool, VkQueryPool) ANV_DEFINE_NONDISP_HANDLE_CASTS(anv_render_pass, VkRenderPass) ANV_DEFINE_NONDISP_HANDLE_CASTS(anv_sampler, VkSampler) +ANV_DEFINE_NONDISP_HANDLE_CASTS(anv_semaphore, VkSemaphore) ANV_DEFINE_NONDISP_HANDLE_CASTS(anv_shader_module, VkShaderModule) /* Gen-specific function declarations */ diff --git a/src/intel/vulkan/anv_queue.c b/src/intel/vulkan/anv_queue.c index 5a22ff7fe60..f6ff41f84b2 100644 --- a/src/intel/vulkan/anv_queue.c +++ b/src/intel/vulkan/anv_queue.c @@ -493,23 +493,43 @@ done: // Queue semaphore functions VkResult anv_CreateSemaphore( - VkDevice device, + VkDevice _device, const VkSemaphoreCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSemaphore* pSemaphore) { - /* The DRM execbuffer ioctl always execute in-oder, even between different - * rings. As such, there's nothing to do for the user space semaphore. + ANV_FROM_HANDLE(anv_device, device, _device); + struct anv_semaphore *semaphore; + + assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO); + + semaphore = vk_alloc2(&device->alloc, pAllocator, sizeof(*semaphore), 8, + VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); + if (semaphore == NULL) + return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); + + /* The DRM execbuffer ioctl always execute in-oder, even between + * different rings. As such, a dummy no-op semaphore is a perfectly + * valid implementation. */ + semaphore->permanent.type = ANV_SEMAPHORE_TYPE_DUMMY; + semaphore->temporary.type = ANV_SEMAPHORE_TYPE_NONE; - *pSemaphore = (VkSemaphore)1; + *pSemaphore = anv_semaphore_to_handle(semaphore); return VK_SUCCESS; } void anv_DestroySemaphore( - VkDevice device, - VkSemaphore semaphore, + VkDevice _device, + VkSemaphore _semaphore, const VkAllocationCallbacks* pAllocator) { + ANV_FROM_HANDLE(anv_device, device, _device); + ANV_FROM_HANDLE(anv_semaphore, semaphore, _semaphore); + + if (semaphore == NULL) + return; + + vk_free2(&device->alloc, pAllocator, semaphore); } |