diff options
| author | Marek Olšák <[email protected]> | 2017-12-28 15:59:19 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-01-04 00:07:45 +0100 |
| commit | 4f19cc82f9a6113a76a3bc7a848c98d0eb693991 (patch) | |
| tree | 3da6ce6e80f22784eec7f29d26a0f333a70a03aa /src | |
| parent | 81567d01c137bdb41fce6d75d41c63d8183a3f89 (diff) | |
ac: rename has_syncobj_wait -> has_syncobj_wait_for_submit
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/amd/common/ac_gpu_info.c | 2 | ||||
| -rw-r--r-- | src/amd/common/ac_gpu_info.h | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_device.c | 6 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_extensions.py | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index c042bb229ce..2599fb61643 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -277,7 +277,7 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev, vce.available_rings ? vce_version : 0; info->has_userptr = true; info->has_syncobj = has_syncobj(fd); - info->has_syncobj_wait = info->has_syncobj && info->drm_minor >= 20; + info->has_syncobj_wait_for_submit = info->has_syncobj && info->drm_minor >= 20; info->has_sync_file = info->has_syncobj && info->drm_minor >= 21; info->has_ctx_priority = info->drm_minor >= 22; info->num_render_backends = amdinfo->rb_pipes; diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index 04e17f91c59..235cc245bd9 100644 --- a/src/amd/common/ac_gpu_info.h +++ b/src/amd/common/ac_gpu_info.h @@ -81,7 +81,7 @@ struct radeon_info { uint32_t drm_patchlevel; bool has_userptr; bool has_syncobj; - bool has_syncobj_wait; + bool has_syncobj_wait_for_submit; bool has_sync_file; bool has_ctx_priority; diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index ed46692cefb..cbf8f5cf49c 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -3818,8 +3818,8 @@ void radv_GetPhysicalDeviceExternalSemaphorePropertiesKHR( { RADV_FROM_HANDLE(radv_physical_device, pdevice, physicalDevice); - /* Require has_syncobj_wait for the syncobj signal ioctl introduced at virtually the same time */ - if (pdevice->rad_info.has_syncobj_wait && + /* Require has_syncobj_wait_for_submit for the syncobj signal ioctl introduced at virtually the same time */ + if (pdevice->rad_info.has_syncobj_wait_for_submit && (pExternalSemaphoreInfo->handleType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR || pExternalSemaphoreInfo->handleType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR)) { pExternalSemaphoreProperties->exportFromImportedHandleTypes = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR | VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR; @@ -3899,7 +3899,7 @@ void radv_GetPhysicalDeviceExternalFencePropertiesKHR( { RADV_FROM_HANDLE(radv_physical_device, pdevice, physicalDevice); - if (pdevice->rad_info.has_syncobj_wait && + if (pdevice->rad_info.has_syncobj_wait_for_submit && (pExternalFenceInfo->handleType == VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR || pExternalFenceInfo->handleType == VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR)) { pExternalFenceProperties->exportFromImportedHandleTypes = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR | VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR; diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py index 9af941fab35..6bdb011d6cf 100644 --- a/src/amd/vulkan/radv_extensions.py +++ b/src/amd/vulkan/radv_extensions.py @@ -53,9 +53,9 @@ EXTENSIONS = [ Extension('VK_KHR_bind_memory2', 1, True), Extension('VK_KHR_dedicated_allocation', 1, True), Extension('VK_KHR_descriptor_update_template', 1, True), - Extension('VK_KHR_external_fence', 1, 'device->rad_info.has_syncobj_wait'), + Extension('VK_KHR_external_fence', 1, 'device->rad_info.has_syncobj_wait_for_submit'), Extension('VK_KHR_external_fence_capabilities', 1, True), - Extension('VK_KHR_external_fence_fd', 1, 'device->rad_info.has_syncobj_wait'), + Extension('VK_KHR_external_fence_fd', 1, 'device->rad_info.has_syncobj_wait_for_submit'), Extension('VK_KHR_external_memory', 1, True), Extension('VK_KHR_external_memory_capabilities', 1, True), Extension('VK_KHR_external_memory_fd', 1, True), |