diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-10-26 20:48:51 +0800 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-11-02 13:40:50 -0700 |
| commit | 3dfc13470d037c5681ae716bfbeb65b7e59f9018 (patch) | |
| tree | 57e3af6b43557afbb039eb1c7f53bc6bf63ba3a4 /layers/mem_tracker.cpp | |
| parent | 3f72dda365a3289d988160b6fdbcaa28dc059a71 (diff) | |
| download | usermoji-3dfc13470d037c5681ae716bfbeb65b7e59f9018.tar.xz | |
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
Diffstat (limited to 'layers/mem_tracker.cpp')
| -rw-r--r-- | layers/mem_tracker.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index 7412021b..cd606271 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -962,7 +962,7 @@ VkResult VKAPI vkCreateInstance( my_data->report_data = debug_report_create_instance( pTable, *pInstance, - pCreateInfo->extensionCount, + pCreateInfo->enabledExtensionNameCount, pCreateInfo->ppEnabledExtensionNames); init_mem_tracker(my_data); @@ -984,7 +984,7 @@ static void createDeviceRegisterExtensions(const VkDeviceCreateInfo* pCreateInfo pDisp->AcquireNextImageKHR = (PFN_vkAcquireNextImageKHR) gpa(device, "vkAcquireNextImageKHR"); pDisp->QueuePresentKHR = (PFN_vkQueuePresentKHR) gpa(device, "vkQueuePresentKHR"); my_device_data->wsi_enabled = false; - for (uint32_t i = 0; i < pCreateInfo->extensionCount; i++) { + for (uint32_t i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) { if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME) == 0) my_device_data->wsi_enabled = true; } @@ -1137,14 +1137,14 @@ VK_LAYER_EXPORT VkResult VKAPI vkQueueSubmit( printCBList(my_data, queue); for (uint32_t submit_idx = 0; submit_idx < submitCount; submit_idx++) { const VkSubmitInfo *submit = &pSubmitInfo[submit_idx]; - for (uint32_t i = 0; i < submit->cmdBufferCount; i++) { + for (uint32_t i = 0; i < submit->commandBufferCount; i++) { pCBInfo = get_cmd_buf_info(my_data, submit->pCommandBuffers[i]); pCBInfo->fenceId = fenceId; pCBInfo->lastSubmittedFence = fence; pCBInfo->lastSubmittedQueue = queue; } - for (uint32_t i = 0; i < submit->waitSemCount; i++) { + for (uint32_t i = 0; i < submit->waitSemaphoreCount; i++) { VkSemaphore sem = submit->pWaitSemaphores[i]; if (my_data->semaphoreMap.find(sem) != my_data->semaphoreMap.end()) { @@ -1156,7 +1156,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkQueueSubmit( my_data->semaphoreMap[sem] = MEMTRACK_SEMAPHORE_STATE_WAIT; } } - for (uint32_t i = 0; i < submit->signalSemCount; i++) { + for (uint32_t i = 0; i < submit->signalSemaphoreCount; i++) { VkSemaphore sem = submit->pWaitSemaphores[i]; if (my_data->semaphoreMap.find(sem) != my_data->semaphoreMap.end()) { @@ -1179,7 +1179,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkQueueSubmit( loader_platform_thread_lock_mutex(&globalLock); for (uint32_t submit_idx = 0; submit_idx < submitCount; submit_idx++) { const VkSubmitInfo *submit = &pSubmitInfo[submit_idx]; - for (uint32_t i = 0; i < submit->waitSemCount; i++) { + for (uint32_t i = 0; i < submit->waitSemaphoreCount; i++) { VkSemaphore sem = submit->pWaitSemaphores[i]; if (my_data->semaphoreMap.find(sem) != my_data->semaphoreMap.end()) { |