commit ef72e2a7cf4fa5708fdbfbc1c972a24ad0dbf809
author Cody Northrop <cody@lunarg.com> Mon Aug 03 17:04:53 2015 -0600
committer Cody Northrop <cody@lunarg.com> Tue Aug 04 17:37:03 2015 -0600
tree 99151244b95a947be86808ddf6a1449840c78940
parent c8aa4a5cf5902e22b99d0107164ac43c6c7c4e5d

v140: Bug 14251 - Inconsistencies in the definition of queries

loader/loader.h

diff --git a/loader/loader.h b/loader/loader.h
index 21e997d..6b2a3d7 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -136,8 +136,7 @@
     PFN_vkGetPhysicalDeviceLimits GetPhysicalDeviceLimits;
     PFN_vkCreateDevice CreateDevice;
     PFN_vkGetPhysicalDeviceProperties GetPhysicalDeviceProperties;
-    PFN_vkGetPhysicalDeviceQueueCount GetPhysicalDeviceQueueCount;
-    PFN_vkGetPhysicalDeviceQueueProperties GetPhysicalDeviceQueueProperties;
+    PFN_vkGetPhysicalDeviceQueueFamilyProperties GetPhysicalDeviceQueueFamilyProperties;
     PFN_vkGetPhysicalDeviceMemoryProperties GetPhysicalDeviceMemoryProperties;
     PFN_vkGetPhysicalDeviceExtensionProperties GetPhysicalDeviceExtensionProperties;
     PFN_vkGetPhysicalDeviceSparseImageFormatProperties GetPhysicalDeviceSparseImageFormatProperties;
@@ -321,14 +320,10 @@
         uint32_t *pCount,
         VkLayerProperties* pProperties);
 
-VkResult VKAPI loader_GetPhysicalDeviceQueueCount (
-        VkPhysicalDevice physicalDevice,
-        uint32_t* pCount);
-
-VkResult VKAPI loader_GetPhysicalDeviceQueueProperties (
-        VkPhysicalDevice physicalDevice,
-        uint32_t count,
-        VkPhysicalDeviceQueueProperties * pProperties);
+VkResult VKAPI loader_GetPhysicalDeviceQueueFamilyProperties (
+        VkPhysicalDevice                        physicalDevice,
+        uint32_t*                               pCount,
+        VkQueueFamilyProperties*                pProperties);
 
 VkResult VKAPI loader_GetPhysicalDeviceMemoryProperties (
         VkPhysicalDevice physicalDevice,