diff options
| author | Eric Engestrom <[email protected]> | 2019-01-08 18:04:54 +0000 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-01-08 18:47:56 +0000 |
| commit | 4f5a52678988ba537a38dfa9aeb0eaed7d4a216e (patch) | |
| tree | 7bc48611c94b5022edecb6a09028ff6a9a89781e /src/intel/vulkan/anv_device.c | |
| parent | d0c6ef2793370a943a21c1d5e47e397c96b183f6 (diff) | |
anv: drop unneeded KHR suffix
Signed-off-by: Eric Engestrom <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/intel/vulkan/anv_device.c')
| -rw-r--r-- | src/intel/vulkan/anv_device.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index cd179e6801c..523f1483e29 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -904,9 +904,9 @@ void anv_GetPhysicalDeviceFeatures2( break; } - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES_KHR: { - VkPhysicalDevice16BitStorageFeaturesKHR *features = - (VkPhysicalDevice16BitStorageFeaturesKHR *)ext; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES: { + VkPhysicalDevice16BitStorageFeatures *features = + (VkPhysicalDevice16BitStorageFeatures *)ext; ANV_FROM_HANDLE(anv_physical_device, pdevice, physicalDevice); features->storageBuffer16BitAccess = pdevice->info.gen >= 8; @@ -2359,9 +2359,9 @@ VkResult anv_AllocateMemory( */ if (mem->bo->size < aligned_alloc_size) { result = vk_errorf(device->instance, device, - VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR, + VK_ERROR_INVALID_EXTERNAL_HANDLE, "aligned allocationSize too large for " - "VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR: " + "VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT: " "%"PRIu64"B > %"PRIu64"B", aligned_alloc_size, mem->bo->size); anv_bo_cache_release(device, &device->bo_cache, mem->bo); @@ -2392,8 +2392,8 @@ VkResult anv_AllocateMemory( if (result != VK_SUCCESS) goto fail; - const VkMemoryDedicatedAllocateInfoKHR *dedicated_info = - vk_find_struct_const(pAllocateInfo->pNext, MEMORY_DEDICATED_ALLOCATE_INFO_KHR); + const VkMemoryDedicatedAllocateInfo *dedicated_info = + vk_find_struct_const(pAllocateInfo->pNext, MEMORY_DEDICATED_ALLOCATE_INFO); if (dedicated_info && dedicated_info->image != VK_NULL_HANDLE) { ANV_FROM_HANDLE(anv_image, image, dedicated_info->image); @@ -2444,7 +2444,7 @@ VkResult anv_GetMemoryFdKHR( VkResult anv_GetMemoryFdPropertiesKHR( VkDevice _device, - VkExternalMemoryHandleTypeFlagBitsKHR handleType, + VkExternalMemoryHandleTypeFlagBits handleType, int fd, VkMemoryFdPropertiesKHR* pMemoryFdProperties) { @@ -2738,8 +2738,8 @@ void anv_GetImageMemoryRequirements2( switch (ext->sType) { case VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO: { struct anv_physical_device *pdevice = &device->instance->physicalDevice; - const VkImagePlaneMemoryRequirementsInfoKHR *plane_reqs = - (const VkImagePlaneMemoryRequirementsInfoKHR *) ext; + const VkImagePlaneMemoryRequirementsInfo *plane_reqs = + (const VkImagePlaneMemoryRequirementsInfo *) ext; uint32_t plane = anv_image_aspect_to_plane(image->aspects, plane_reqs->planeAspect); |