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

icd/intel/gpu.c

diff --git a/icd/intel/gpu.c b/icd/intel/gpu.c
index eb1e2e1..a86926d 100644
--- a/icd/intel/gpu.c
+++ b/icd/intel/gpu.c
@@ -240,7 +240,7 @@
 
 void intel_gpu_get_queue_props(const struct intel_gpu *gpu,
                                enum intel_gpu_engine_type engine,
-                               VkPhysicalDeviceQueueProperties *props)
+                               VkQueueFamilyProperties *props)
 {
     switch (engine) {
     case INTEL_GPU_ENGINE_3D:
@@ -402,27 +402,23 @@
     return VK_SUCCESS;
 }
 
-ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueCount(
+ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueFamilyProperties(
     VkPhysicalDevice gpu_,
-    uint32_t* pCount)
-{
-    *pCount = INTEL_GPU_ENGINE_COUNT;
-
-    return VK_SUCCESS;
-}
-
-ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueProperties(
-    VkPhysicalDevice gpu_,
-    uint32_t count,
-    VkPhysicalDeviceQueueProperties* pProperties)
+    uint32_t* pCount,
+    VkQueueFamilyProperties* pProperties)
 {
    struct intel_gpu *gpu = intel_gpu(gpu_);
    int engine;
 
-   if (count > INTEL_GPU_ENGINE_COUNT)
+   if (pProperties == NULL) {
+       *pCount = INTEL_GPU_ENGINE_COUNT;
+       return VK_SUCCESS;
+   }
+
+   if (*pCount > INTEL_GPU_ENGINE_COUNT)
        return VK_ERROR_INVALID_VALUE;
 
-   for (engine = 0; engine < count; engine++) {
+   for (engine = 0; engine < *pCount; engine++) {
        intel_gpu_get_queue_props(gpu, engine, pProperties);
        pProperties++;
    }