commit 17bf1c00aa5ad96fb60670dc53d7331af1cd0c4a
author Yiwei Zhang <zzyiwei@google.com> Mon Oct 19 20:14:01 2020 -0700
committer Yiwei Zhang <zzyiwei@google.com> Thu Oct 22 14:06:13 2020 -0700
tree a26862a02bb1fcd5f67d353330ec4f26cf59bd6f
parent 58593e6b12385679e8d83a20f316d806542fc0ca

vkjson: update accordingly to latest vulkan-headers

Those RANGE enums have been deprecated.

Bug: 171402955
Test: adb shell cmd gpu vkjson
Change-Id: Icef72c1b2845c8017642fe3a7fa9e53a73908c5a

vulkan/vkjson/vkjson_instance.cc

diff --git a/vulkan/vkjson/vkjson_instance.cc b/vulkan/vkjson/vkjson_instance.cc
index 84cfe5e..73586d4 100644
--- a/vulkan/vkjson/vkjson_instance.cc
+++ b/vulkan/vkjson/vkjson_instance.cc
@@ -165,7 +165,9 @@
 
   VkFormatProperties format_properties = {};
   for (VkFormat format = VK_FORMAT_R4G4_UNORM_PACK8;
-       format <= VK_FORMAT_END_RANGE;
+       // TODO(http://b/171403054): avoid hard-coding last value in the
+       // contiguous range
+       format <= VK_FORMAT_ASTC_12x12_SRGB_BLOCK;
        format = static_cast<VkFormat>(format + 1)) {
     vkGetPhysicalDeviceFormatProperties(physical_device, format,
                                         &format_properties);
@@ -178,6 +180,8 @@
 
   if (device.properties.apiVersion >= VK_API_VERSION_1_1) {
     for (VkFormat format = VK_FORMAT_G8B8G8R8_422_UNORM;
+         // TODO(http://b/171403054): avoid hard-coding last value in the
+         // contiguous range
          format <= VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM;
          format = static_cast<VkFormat>(format + 1)) {
       vkGetPhysicalDeviceFormatProperties(physical_device, format,