summaryrefslogtreecommitdiffstats
path: root/src/intel/vulkan
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2017-07-13 11:57:07 -0700
committerJason Ekstrand <[email protected]>2017-07-15 08:59:38 -0700
commit227debdc9241afef8db4a76a4bd3d6c9e98a07e9 (patch)
treebbfebbb5370c4854edc6f5d28b39b52c636481d7 /src/intel/vulkan
parent3b95e03b2c9b8021f2c1d21ec2868dbb34ed4e6c (diff)
vulkan: Update to the new 1.0.54 spec XML and headers
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 <[email protected]> Reviewed-by: Lionel Landwerlin <[email protected]>
Diffstat (limited to 'src/intel/vulkan')
-rw-r--r--src/intel/vulkan/anv_allocator.c6
1 files changed, 3 insertions, 3 deletions
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,