commit d46d4311d3275d7c75810e63aefbd8b270bf8a15
author Ian Elliott <ianelliott@google.com> Mon May 08 23:55:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 08 23:55:29 2017 +0000
tree 03cd31ddd1a66eb1d70be0e757d01062770d6f68
parent 5249e61342f5a88173a35c5eee710ed979c42846
parent 8c109c638a2935d397f8ab71499906d9117cb6f3

Merge "Return an error if apiVersion is 1.1+." into oc-dev
am: 8c109c638a

Change-Id: I1e4e17b02155a4095d28cfff8791f63b7dcd3d08

vulkan/libvulkan/driver.cpp

diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index f2cd8e6..0005a90 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -887,6 +887,19 @@
     const VkAllocationCallbacks& data_allocator =
         (pAllocator) ? *pAllocator : GetDefaultAllocator();
 
+    if (pCreateInfo->pApplicationInfo &&
+        pCreateInfo->pApplicationInfo->apiVersion >= VK_MAKE_VERSION(1, 1, 0)) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+        ALOGI(
+            "Requested Vulkan instance version %d.%d is greater than max "
+            "supported version (1.0)",
+            VK_VERSION_MAJOR(pCreateInfo->pApplicationInfo->apiVersion),
+            VK_VERSION_MINOR(pCreateInfo->pApplicationInfo->apiVersion));
+#pragma clang diagnostic pop
+        return VK_ERROR_INCOMPATIBLE_DRIVER;
+    }
+
     CreateInfoWrapper wrapper(*pCreateInfo, data_allocator);
     VkResult result = wrapper.Validate();
     if (result != VK_SUCCESS)