commit 5e8c4e562a4898020d5561a22db16d6e89456254
author Greg Daniel <egdaniel@google.com> Mon Apr 09 16:47:54 2018 -0400
committer Hal Canary <halcanary@google.com> Tue Apr 10 01:19:11 2018 +0000
tree 36aa46a662ea089cf13e7877135ae37e0ed5993a
parent c214b389998e2aa39f0698271271504fb841e98f

Check physical device version to make sure physical device supports 1.1

Bug: skia:7789
Change-Id: I605a225c30ffc15ec2183213d8683a804951c47f
Reviewed-on: https://skia-review.googlesource.com/119946
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

tests/VkHardwareBufferTest.cpp

diff --git a/tests/VkHardwareBufferTest.cpp b/tests/VkHardwareBufferTest.cpp
index af33f36..169918d 100644
--- a/tests/VkHardwareBufferTest.cpp
+++ b/tests/VkHardwareBufferTest.cpp
@@ -589,15 +589,12 @@
     ACQUIRE_VK_PROC(DestroyInstance, fInst, VK_NULL_HANDLE);
     ACQUIRE_INST_VK_PROC(EnumeratePhysicalDevices);
     ACQUIRE_INST_VK_PROC(GetPhysicalDeviceProperties);
-    ACQUIRE_INST_VK_PROC(GetPhysicalDeviceMemoryProperties2);
     ACQUIRE_INST_VK_PROC(GetPhysicalDeviceQueueFamilyProperties);
     ACQUIRE_INST_VK_PROC(GetPhysicalDeviceFeatures);
     ACQUIRE_INST_VK_PROC(CreateDevice);
     ACQUIRE_INST_VK_PROC(GetDeviceQueue);
     ACQUIRE_INST_VK_PROC(DeviceWaitIdle);
     ACQUIRE_INST_VK_PROC(DestroyDevice);
-    ACQUIRE_INST_VK_PROC(GetPhysicalDeviceImageFormatProperties2);
-    ACQUIRE_INST_VK_PROC(GetPhysicalDeviceExternalSemaphoreProperties);
 
     uint32_t gpuCount;
     err = fVkEnumeratePhysicalDevices(fInst, &gpuCount, nullptr);
@@ -654,6 +651,15 @@
     fVkGetPhysicalDeviceProperties(fPhysDev, &physDevProperties);
     int physDevVersion = physDevProperties.apiVersion;
 
+    if (physDevVersion < VK_MAKE_VERSION(1, 1, 0)) {
+        return false;
+    }
+
+    // Physical-Device-level functions added in 1.1
+    ACQUIRE_INST_VK_PROC(GetPhysicalDeviceMemoryProperties2);
+    ACQUIRE_INST_VK_PROC(GetPhysicalDeviceImageFormatProperties2);
+    ACQUIRE_INST_VK_PROC(GetPhysicalDeviceExternalSemaphoreProperties);
+
     extensions.initDevice(physDevVersion, fInst, fPhysDev);
 
     SkTArray<const char*> deviceLayerNames;