From 227debdc9241afef8db4a76a4bd3d6c9e98a07e9 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 13 Jul 2017 11:57:07 -0700 Subject: vulkan: Update to the new 1.0.54 spec XML and headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is one small ANV change here because we used the VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX enum in the BO cache and that had to be updated to have the _KHR suffix. Reviewed-by: Samuel Iglesias Gonsálvez Reviewed-by: Lionel Landwerlin --- src/intel/vulkan/anv_allocator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/intel') diff --git a/src/intel/vulkan/anv_allocator.c b/src/intel/vulkan/anv_allocator.c index d637867ab9a..efaaebcf39c 100644 --- a/src/intel/vulkan/anv_allocator.c +++ b/src/intel/vulkan/anv_allocator.c @@ -1280,14 +1280,14 @@ anv_bo_cache_import(struct anv_device *device, uint32_t gem_handle = anv_gem_fd_to_handle(device, fd); if (!gem_handle) { pthread_mutex_unlock(&cache->mutex); - return vk_error(VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX); + return vk_error(VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR); } struct anv_cached_bo *bo = anv_bo_cache_lookup_locked(cache, gem_handle); if (bo) { if (bo->bo.size != size) { pthread_mutex_unlock(&cache->mutex); - return vk_error(VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX); + return vk_error(VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR); } __sync_fetch_and_add(&bo->refcount, 1); } else { @@ -1303,7 +1303,7 @@ anv_bo_cache_import(struct anv_device *device, if (import_size == (off_t)-1 || import_size != size) { anv_gem_close(device, gem_handle); pthread_mutex_unlock(&cache->mutex); - return vk_error(VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX); + return vk_error(VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR); } bo = vk_alloc(&device->alloc, sizeof(struct anv_cached_bo), 8, -- cgit v1.2.3