From 6c5ae32895075c7b6bbc0f06c5e834d9da040f6f Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Mon, 11 Nov 2019 16:53:50 +0000 Subject: [PATCH] check-vulkan: Avoid shadowing this->device with function parameter Detected by g++ -Wshadow. Signed-off-by: Simon McVittie <smcv@collabora.com> --- helpers/check-vulkan.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/helpers/check-vulkan.cpp b/helpers/check-vulkan.cpp index 32e49c3db..af5d3d8b4 100644 --- a/helpers/check-vulkan.cpp +++ b/helpers/check-vulkan.cpp @@ -783,50 +783,50 @@ private: } } - SwapChainSupportDetails querySwapChainSupport(VkPhysicalDevice device) { + SwapChainSupportDetails querySwapChainSupport(VkPhysicalDevice dev) { SwapChainSupportDetails details; - vkGetPhysicalDeviceSurfaceCapabilitiesKHR(device, surface, &details.capabilities); + vkGetPhysicalDeviceSurfaceCapabilitiesKHR(dev, surface, &details.capabilities); uint32_t formatCount; - vkGetPhysicalDeviceSurfaceFormatsKHR(device, surface, &formatCount, nullptr); + vkGetPhysicalDeviceSurfaceFormatsKHR(dev, surface, &formatCount, nullptr); if (formatCount != 0) { details.formats.resize(formatCount); - vkGetPhysicalDeviceSurfaceFormatsKHR(device, surface, &formatCount, details.formats.data()); + vkGetPhysicalDeviceSurfaceFormatsKHR(dev, surface, &formatCount, details.formats.data()); } uint32_t presentModeCount; - vkGetPhysicalDeviceSurfacePresentModesKHR(device, surface, &presentModeCount, nullptr); + vkGetPhysicalDeviceSurfacePresentModesKHR(dev, surface, &presentModeCount, nullptr); if (presentModeCount != 0) { details.presentModes.resize(presentModeCount); - vkGetPhysicalDeviceSurfacePresentModesKHR(device, surface, &presentModeCount, details.presentModes.data()); + vkGetPhysicalDeviceSurfacePresentModesKHR(dev, surface, &presentModeCount, details.presentModes.data()); } return details; } - bool isDeviceSuitable(VkPhysicalDevice device) { - QueueFamilyIndices indices = findQueueFamilies(device); + bool isDeviceSuitable(VkPhysicalDevice dev) { + QueueFamilyIndices indices = findQueueFamilies(dev); - bool extensionsSupported = checkDeviceExtensionSupport(device); + bool extensionsSupported = checkDeviceExtensionSupport(dev); bool swapChainAdequate = false; if (extensionsSupported) { - SwapChainSupportDetails swapChainSupport = querySwapChainSupport(device); + SwapChainSupportDetails swapChainSupport = querySwapChainSupport(dev); swapChainAdequate = !swapChainSupport.formats.empty() && !swapChainSupport.presentModes.empty(); } return indices.isComplete() && extensionsSupported && swapChainAdequate; } - bool checkDeviceExtensionSupport(VkPhysicalDevice device) { + bool checkDeviceExtensionSupport(VkPhysicalDevice dev) { uint32_t extensionCount; - vkEnumerateDeviceExtensionProperties(device, nullptr, &extensionCount, nullptr); + vkEnumerateDeviceExtensionProperties(dev, nullptr, &extensionCount, nullptr); std::vector<VkExtensionProperties> availableExtensions(extensionCount); - vkEnumerateDeviceExtensionProperties(device, nullptr, &extensionCount, availableExtensions.data()); + vkEnumerateDeviceExtensionProperties(dev, nullptr, &extensionCount, availableExtensions.data()); std::set<std::string> requiredExtensions(deviceExtensions.begin(), deviceExtensions.end()); @@ -837,16 +837,16 @@ private: return requiredExtensions.empty(); } - QueueFamilyIndices findQueueFamilies(VkPhysicalDevice device) { + QueueFamilyIndices findQueueFamilies(VkPhysicalDevice dev) { QueueFamilyIndices indices; indices.hasGraphicsFamily = false; indices.hasPresentFamily = false; uint32_t queueFamilyCount = 0; - vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyCount, nullptr); + vkGetPhysicalDeviceQueueFamilyProperties(dev, &queueFamilyCount, nullptr); std::vector<VkQueueFamilyProperties> queueFamilies(queueFamilyCount); - vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyCount, queueFamilies.data()); + vkGetPhysicalDeviceQueueFamilyProperties(dev, &queueFamilyCount, queueFamilies.data()); int i = 0; for (const auto& queueFamily : queueFamilies) { @@ -856,7 +856,7 @@ private: } VkBool32 presentSupport = false; - vkGetPhysicalDeviceSurfaceSupportKHR(device, i, surface, &presentSupport); + vkGetPhysicalDeviceSurfaceSupportKHR(dev, i, surface, &presentSupport); if (queueFamily.queueCount > 0 && presentSupport) { indices.presentFamily = i; -- GitLab