commit 763a749795bb4827efbbf19cbc87b959511496dd
author Chia-I Wu <olv@lunarg.com> Mon Oct 26 20:48:51 2015 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Nov 02 13:40:50 2015 -0700
tree a6ba6a009fbe9050e9e94c9d7ea190af8c01789e
parent 932f1bd6f761d7d2466c53f50e34609114e56749

bug 14892: 'count' parameters and members named inconsistently in many cases (WIP)

s/waitSemCount/waitSemaphoreCount/g
s/signalSemCount/signalSemaphoreCount/g
s/cmdBufferCount/commandBufferCount/g
s/queueFamilyCount/queueFamilyIndexCount/g
s/layerCount/enabledLayerNameCount/g
s/extensionCount/enabledExtensionNameCount/g

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14892

icd/intel/instance.c

diff --git a/icd/intel/instance.c b/icd/intel/instance.c
index df0ae86..890a513 100644
--- a/icd/intel/instance.c
+++ b/icd/intel/instance.c
@@ -170,8 +170,10 @@
 
     instance->icd = icd;
 
-    for (i = 0; i < info->extensionCount; i++) {
-        const enum intel_global_ext_type ext = intel_gpu_lookup_global_extension(info->ppEnabledExtensionNames[i]);
+    for (i = 0; i < info->enabledExtensionNameCount; i++) {
+        const enum intel_global_ext_type ext =
+            intel_gpu_lookup_global_extension(
+                    info->ppEnabledExtensionNames[i]);
 
         if (ext != INTEL_GLOBAL_EXT_INVALID) {
             instance->global_exts[ext] = true;
@@ -189,7 +191,7 @@
     /*
      * This ICD does not support any layers.
      */
-    if (info->layerCount > 0) {
+    if (info->enabledLayerNameCount > 0) {
         icd_instance_destroy(icd);
         intel_instance_destroy(instance);
         return VK_ERROR_LAYER_NOT_PRESENT;
@@ -232,19 +234,19 @@
 
 ICD_EXPORT VkResult VKAPI vkEnumerateInstanceExtensionProperties(
         const char*                                 pLayerName,
-        uint32_t*                                   pCount,
+        uint32_t*                                   pPropertyCount,
         VkExtensionProperties*                      pProperties)
 {
     uint32_t copy_size;
 
     if (pProperties == NULL) {
-        *pCount = INTEL_GLOBAL_EXT_COUNT;
+        *pPropertyCount = INTEL_GLOBAL_EXT_COUNT;
         return VK_SUCCESS;
     }
 
-    copy_size = *pCount < INTEL_GLOBAL_EXT_COUNT ? *pCount : INTEL_GLOBAL_EXT_COUNT;
+    copy_size = *pPropertyCount < INTEL_GLOBAL_EXT_COUNT ? *pPropertyCount : INTEL_GLOBAL_EXT_COUNT;
     memcpy(pProperties, intel_global_exts, copy_size * sizeof(VkExtensionProperties));
-    *pCount = copy_size;
+    *pPropertyCount = copy_size;
     if (copy_size < INTEL_GLOBAL_EXT_COUNT) {
         return VK_INCOMPLETE;
     }
@@ -253,10 +255,10 @@
 }
 
 ICD_EXPORT VkResult VKAPI vkEnumerateInstanceLayerProperties(
-        uint32_t*                                   pCount,
+        uint32_t*                                   pPropertyCount,
         VkLayerProperties*                          pProperties)
 {
-    *pCount = 0;
+    *pPropertyCount = 0;
     return VK_SUCCESS;
 }