From 3dfc13470d037c5681ae716bfbeb65b7e59f9018 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 26 Oct 2015 20:48:51 +0800 Subject: 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 --- layers/screenshot.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'layers/screenshot.cpp') diff --git a/layers/screenshot.cpp b/layers/screenshot.cpp index 46c015e3..eae5867b 100644 --- a/layers/screenshot.cpp +++ b/layers/screenshot.cpp @@ -248,11 +248,11 @@ static void writePPM( const char *filename, VkImage image1) VkSubmitInfo submit_info; submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; submit_info.pNext = NULL; - submit_info.waitSemCount = 0; + submit_info.waitSemaphoreCount = 0; submit_info.pWaitSemaphores = NULL; - submit_info.cmdBufferCount = 1; + submit_info.commandBufferCount = 1; submit_info.pCommandBuffers = &cmdBuffer; - submit_info.signalSemCount = 0; + submit_info.signalSemaphoreCount = 0; submit_info.pSignalSemaphores = NULL; err = pTableQueue->QueueSubmit(queue, 1, &submit_info, nullFence); @@ -327,7 +327,7 @@ static void createDeviceRegisterExtensions(const VkDeviceCreateInfo* pCreateInfo pDisp->AcquireNextImageKHR = (PFN_vkAcquireNextImageKHR) gpa(device, "vkAcquireNextImageKHR"); pDisp->QueuePresentKHR = (PFN_vkQueuePresentKHR) gpa(device, "vkQueuePresentKHR"); deviceExtMap[pDisp].wsi_enabled = false; - for (i = 0; i < pCreateInfo->extensionCount; i++) { + for (i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) { if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME) == 0) deviceExtMap[pDisp].wsi_enabled = true; } -- cgit v1.2.3