commit 91fc3dc9e49e66752bcbdf381b262ba80b735562
author Yiwei Zhang <zzyiwei@google.com> Sun Jul 05 23:33:22 2020 -0700
committer Yiwei Zhang <zzyiwei@google.com> Tue Jul 07 16:55:52 2020 -0700
tree 5bc67d87e9a4ae6d9c64a11a193f615e813b8fb3
parent e1f35011c42fe3f93cfe68c5916a746a92c20557

vkjson: refactor based on 1.1 assumptions

Bug: 160276146
Test: adb shell cmd gpu vkjson
Change-Id: Ieb55dfecb417d8bc49459621a06555bd7544cf5a

vulkan/vkjson/vkjson.h

diff --git a/vulkan/vkjson/vkjson.h b/vulkan/vkjson/vkjson.h
index a283b83..52e7bee 100644
--- a/vulkan/vkjson/vkjson.h
+++ b/vulkan/vkjson/vkjson.h
@@ -158,10 +158,7 @@
                             VkJsonInstance* instance,
                             std::string* errors);
 
-VkJsonDevice VkJsonGetDevice(VkInstance instance,
-                             VkPhysicalDevice device,
-                             uint32_t instanceExtensionCount,
-                             const char* const* instanceExtensions);
+VkJsonDevice VkJsonGetDevice(VkPhysicalDevice device);
 std::string VkJsonDeviceToJson(const VkJsonDevice& device);
 bool VkJsonDeviceFromJson(const std::string& json,
                           VkJsonDevice* device,
@@ -177,7 +174,7 @@
 typedef VkJsonDevice VkJsonAllProperties;
 inline VkJsonAllProperties VkJsonGetAllProperties(
     VkPhysicalDevice physicalDevice) {
-  return VkJsonGetDevice(VK_NULL_HANDLE, physicalDevice, 0, nullptr);
+  return VkJsonGetDevice(physicalDevice);
 }
 inline std::string VkJsonAllPropertiesToJson(
     const VkJsonAllProperties& properties) {