From: Eric Engestrom <eric.engestrom@intel.com>
Date: Wed, 9 Jan 2019 12:11:48 +0000 (+0000)
Subject: radv: remove a few more unnecessary KHR suffixes
X-Git-Tag: android-x86-9.0-r1~10658
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=53fbde4df38d9eec871081236ac9a2956260b104;p=android-x86%2Fexternal-mesa.git

radv: remove a few more unnecessary KHR suffixes

Cc: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> (v1)
---

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 5581fe74e40..ba1d5f24a78 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -3883,7 +3883,7 @@ VkResult radv_CreateBuffer(
 	buffer->flags = pCreateInfo->flags;
 
 	buffer->shareable = vk_find_struct_const(pCreateInfo->pNext,
-						 EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHR) != NULL;
+						 EXTERNAL_MEMORY_BUFFER_CREATE_INFO) != NULL;
 
 	if (pCreateInfo->flags & VK_BUFFER_CREATE_SPARSE_BINDING_BIT) {
 		buffer->bo = device->ws->buffer_create(device->ws,
diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c
index ee408b55334..499d94befeb 100644
--- a/src/amd/vulkan/radv_formats.c
+++ b/src/amd/vulkan/radv_formats.c
@@ -1289,11 +1289,11 @@ VkResult radv_GetPhysicalDeviceImageFormatProperties2(
 		}
 	}
 
-	/* From the Vulkan 1.0.42 spec:
+	/* From the Vulkan 1.0.97 spec:
 	 *
-	 *    If handleType is 0, vkGetPhysicalDeviceImageFormatProperties2KHR will
-	 *    behave as if VkPhysicalDeviceExternalImageFormatInfoKHR was not
-	 *    present and VkExternalImageFormatPropertiesKHR will be ignored.
+	 *    If handleType is 0, vkGetPhysicalDeviceImageFormatProperties2 will
+	 *    behave as if VkPhysicalDeviceExternalImageFormatInfo was not
+	 *    present and VkExternalImageFormatProperties will be ignored.
 	 */
 	if (external_info && external_info->handleType != 0) {
 		switch (external_info->handleType) {
@@ -1304,11 +1304,11 @@ VkResult radv_GetPhysicalDeviceImageFormatProperties2(
 			                                     &external_props->externalMemoryProperties);
 			break;
 		default:
-			/* From the Vulkan 1.0.42 spec:
+			/* From the Vulkan 1.0.97 spec:
 			 *
 			 *    If handleType is not compatible with the [parameters] specified
-			 *    in VkPhysicalDeviceImageFormatInfo2KHR, then
-			 *    vkGetPhysicalDeviceImageFormatProperties2KHR returns
+			 *    in VkPhysicalDeviceImageFormatInfo2, then
+			 *    vkGetPhysicalDeviceImageFormatProperties2 returns
 			 *    VK_ERROR_FORMAT_NOT_SUPPORTED.
 			 */
 			result = vk_errorf(physical_device->instance, VK_ERROR_FORMAT_NOT_SUPPORTED,
@@ -1322,10 +1322,10 @@ VkResult radv_GetPhysicalDeviceImageFormatProperties2(
 
 fail:
 	if (result == VK_ERROR_FORMAT_NOT_SUPPORTED) {
-		/* From the Vulkan 1.0.42 spec:
+		/* From the Vulkan 1.0.97 spec:
 		 *
 		 *    If the combination of parameters to
-		 *    vkGetPhysicalDeviceImageFormatProperties2KHR is not supported by
+		 *    vkGetPhysicalDeviceImageFormatProperties2 is not supported by
 		 *    the implementation for use in vkCreateImage, then all members of
 		 *    imageFormatProperties will be filled with zero.
 		 */
diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index e7f5d5249d8..6b51efaf919 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -991,7 +991,7 @@ radv_image_create(VkDevice _device,
 	}
 
 	image->shareable = vk_find_struct_const(pCreateInfo->pNext,
-	                                        EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHR) != NULL;
+	                                        EXTERNAL_MEMORY_IMAGE_CREATE_INFO) != NULL;
 	if (!vk_format_is_depth_or_stencil(pCreateInfo->format) && !create_info->scanout && !image->shareable) {
 		image->info.surf_index = &device->image_mrt_offset_counter;
 	}