Get rid of a bunch of KHR suffixes

[mesa.git] / src / intel / vulkan / vk_format_info.h

diff --git a/src/intel/vulkan/vk_format_info.h b/src/intel/vulkan/vk_format_info.h
index 167938ac10998dce0906f3ee15dbf10f90190e57..a1cc6952c8fa94b7372a2b808dbb0fbdf839bb3e 100644 (file)
--- a/src/intel/vulkan/vk_format_info.h
+++ b/src/intel/vulkan/vk_format_info.h
@@ -47,32 +47,32 @@ vk_format_aspects(VkFormat format)
    case VK_FORMAT_D32_SFLOAT:
       return VK_IMAGE_ASPECT_DEPTH_BIT;
 
-   case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM_KHR:
-   case VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM_KHR:
-   case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM_KHR:
-   case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16_KHR:
-   case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16_KHR:
-   case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16_KHR:
-   case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16_KHR:
-   case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16_KHR:
-   case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16_KHR:
-   case VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM_KHR:
-   case VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM_KHR:
-   case VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM_KHR:
-      return (VK_IMAGE_ASPECT_PLANE_0_BIT_KHR |
-              VK_IMAGE_ASPECT_PLANE_1_BIT_KHR |
-              VK_IMAGE_ASPECT_PLANE_2_BIT_KHR);
+   case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM:
+   case VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM:
+   case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM:
+   case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16:
+   case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16:
+   case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16:
+   case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16:
+   case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16:
+   case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16:
+   case VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM:
+   case VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM:
+   case VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM:
+      return (VK_IMAGE_ASPECT_PLANE_0_BIT |
+              VK_IMAGE_ASPECT_PLANE_1_BIT |
+              VK_IMAGE_ASPECT_PLANE_2_BIT);
 
-   case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM_KHR:
-   case VK_FORMAT_G8_B8R8_2PLANE_422_UNORM_KHR:
-   case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16_KHR:
-   case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16_KHR:
-   case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16_KHR:
-   case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16_KHR:
-   case VK_FORMAT_G16_B16R16_2PLANE_420_UNORM_KHR:
-   case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM_KHR:
-      return (VK_IMAGE_ASPECT_PLANE_0_BIT_KHR |
-              VK_IMAGE_ASPECT_PLANE_1_BIT_KHR);
+   case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM:
+   case VK_FORMAT_G8_B8R8_2PLANE_422_UNORM:
+   case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16:
+   case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16:
+   case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16:
+   case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16:
+   case VK_FORMAT_G16_B16R16_2PLANE_420_UNORM:
+   case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM:
+      return (VK_IMAGE_ASPECT_PLANE_0_BIT |
+              VK_IMAGE_ASPECT_PLANE_1_BIT);
 
    default:
       return VK_IMAGE_ASPECT_COLOR_BIT;