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. ---
There's more to this patch but I dropped the XML and header update because they are highly uninteresting. The only interesting bit is the ANV change. include/vulkan/vulkan.h | 1284 ++++++++++++++++++++++++++------------ src/intel/vulkan/anv_allocator.c | 6 +- src/vulkan/registry/vk.xml | 1208 +++++++++++++++++++++++------------ 3 files changed, 1710 insertions(+), 788 deletions(-) diff --git a/src/intel/vulkan/anv_allocator.c b/src/intel/vulkan/anv_allocator.c index d637867..efaaebc 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, -- 2.5.0.400.gff86faf _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev