commit ae3b70dea59236780aa909338de1ba5201603439
author Jesse Hall <jessehall@google.com> Sun Jan 17 22:05:29 2016 -0800
committer Jesse Hall <jessehall@google.com> Mon Jan 25 13:49:31 2016 -0800
tree 9afd7340792dc4de05140e73647bfcc1ea834826
parent c55fa944f9882621cd1005fcae5e3076c68b0d1d

libvulkan: Return error if an unsupported instance extension is requested

Change-Id: I93d4a2a0b991682160c0ffe401f2b2b19f6e2be3
(cherry picked from commit 8a69c0845de6884377da2221ae3272b8dac03d55)

vulkan/tools/vkinfo.cpp

diff --git a/vulkan/tools/vkinfo.cpp b/vulkan/tools/vkinfo.cpp
index a2f4e8f..6a63667 100644
--- a/vulkan/tools/vkinfo.cpp
+++ b/vulkan/tools/vkinfo.cpp
@@ -202,10 +202,11 @@
                                     &info->layer_extensions[i]);
     }
 
-    const std::array<const char*, 1> kDesiredExtensions = {
-        {VK_EXT_DEBUG_REPORT_EXTENSION_NAME},
+    const char* kDesiredExtensions[] = {
+        VK_EXT_DEBUG_REPORT_EXTENSION_NAME,
     };
-    const char* extensions[kDesiredExtensions.size()];
+    const char*
+        extensions[sizeof(kDesiredExtensions) / sizeof(kDesiredExtensions[0])];
     uint32_t num_extensions = 0;
     for (const auto& desired_ext : kDesiredExtensions) {
         bool available = HasExtension(info->extensions, desired_ext);