diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2016-11-23 11:28:30 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2016-11-23 14:19:29 -0700 |
| commit | 20f352088cc3ca1008ffeca17e82468667988c0b (patch) | |
| tree | cd8fef7133c31816d0703e6362830447a610a548 | |
| parent | 1ad01ce0cef5af137a2a4c3ffc359ecbcf885786 (diff) | |
| download | usermoji-20f352088cc3ca1008ffeca17e82468667988c0b.tar.xz | |
layers: Fix windows build warnings
Change-Id: Ifead20bae1e3c4f237ffc6f49422f20621b6349e
| -rw-r--r-- | layers/core_validation.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index f7a0e242..bf6d2627 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -12021,13 +12021,14 @@ VKAPI_ATTR VkResult VKAPI_CALL AcquireNextImageKHR(VkDevice device, VkSwapchainK auto swapchain_data = getSwapchainNode(dev_data, swapchain); auto physical_device_state = getPhysicalDeviceState(dev_data->instance_data, dev_data->physical_device); if (physical_device_state->vkGetPhysicalDeviceSurfaceCapabilitiesKHRState != UNCALLED) { - int acquired_images = std::count_if(swapchain_data->images.begin(), swapchain_data->images.end(), - [=](VkImage image) { return getImageState(dev_data, image)->acquired; }); + uint64_t acquired_images = std::count_if(swapchain_data->images.begin(), swapchain_data->images.end(), + [=](VkImage image) { return getImageState(dev_data, image)->acquired; }); if (acquired_images > swapchain_data->images.size() - physical_device_state->surfaceCapabilities.minImageCount) { - skip_call |= log_msg( - dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT, - reinterpret_cast<uint64_t const &>(swapchain), __LINE__, DRAWSTATE_SWAPCHAIN_TOO_MANY_IMAGES, "DS", - "vkAcquireNextImageKHR: Application has already acquired the maximum number of images (%d)", acquired_images); + skip_call |= + log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT, + reinterpret_cast<uint64_t const &>(swapchain), __LINE__, DRAWSTATE_SWAPCHAIN_TOO_MANY_IMAGES, "DS", + "vkAcquireNextImageKHR: Application has already acquired the maximum number of images (0x%" PRIxLEAST64 ")", + acquired_images); } } lock.unlock(); @@ -12278,7 +12279,7 @@ VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevi pSupported); if (result == VK_SUCCESS) { - surface_state->gpu_queue_support[{physicalDevice, queueFamilyIndex}] = *pSupported; + surface_state->gpu_queue_support[{physicalDevice, queueFamilyIndex}] = (*pSupported != 0); } return result; |