From 471e4fcb226c4523efe93b1bdaf0db026495da94 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 6 Jul 2020 11:55:39 +0200 Subject: Use QList instead of QVector in gui implementation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-84469 Change-Id: I366e845249203d80d640355a7780ac2f91a762f1 Reviewed-by: Tor Arne Vestbø Reviewed-by: Friedemann Kleint --- src/gui/vulkan/qbasicvulkanplatforminstance.cpp | 12 ++++++------ src/gui/vulkan/qplatformvulkaninstance.cpp | 2 +- src/gui/vulkan/qvulkaninstance.cpp | 8 ++++---- src/gui/vulkan/qvulkanwindow.cpp | 24 ++++++++++++------------ 4 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src/gui/vulkan') diff --git a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp index 6f6ba58319..97d5a7643f 100644 --- a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp +++ b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp @@ -40,7 +40,7 @@ #include "qbasicvulkanplatforminstance_p.h" #include #include -#include +#include #include QT_BEGIN_NAMESPACE @@ -138,7 +138,7 @@ void QBasicPlatformVulkanInstance::init(QLibrary *lib) uint32_t layerCount = 0; m_vkEnumerateInstanceLayerProperties(&layerCount, nullptr); if (layerCount) { - QVector layerProps(layerCount); + QList layerProps(layerCount); m_vkEnumerateInstanceLayerProperties(&layerCount, layerProps.data()); m_supportedLayers.reserve(layerCount); for (const VkLayerProperties &p : qAsConst(layerProps)) { @@ -157,7 +157,7 @@ void QBasicPlatformVulkanInstance::init(QLibrary *lib) uint32_t extCount = 0; m_vkEnumerateInstanceExtensionProperties(nullptr, &extCount, nullptr); if (extCount) { - QVector extProps(extCount); + QList extProps(extCount); m_vkEnumerateInstanceExtensionProperties(nullptr, &extCount, extProps.data()); m_supportedExtensions.reserve(extCount); for (const VkExtensionProperties &p : qAsConst(extProps)) { @@ -250,7 +250,7 @@ void QBasicPlatformVulkanInstance::initInstance(QVulkanInstance *instance, const instInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; instInfo.pApplicationInfo = &appInfo; - QVector layerNameVec; + QList layerNameVec; for (const QByteArray &ba : qAsConst(m_enabledLayers)) layerNameVec.append(ba.constData()); if (!layerNameVec.isEmpty()) { @@ -258,7 +258,7 @@ void QBasicPlatformVulkanInstance::initInstance(QVulkanInstance *instance, const instInfo.ppEnabledLayerNames = layerNameVec.constData(); } - QVector extNameVec; + QList extNameVec; for (const QByteArray &ba : qAsConst(m_enabledExtensions)) extNameVec.append(ba.constData()); if (!extNameVec.isEmpty()) { @@ -346,7 +346,7 @@ bool QBasicPlatformVulkanInstance::supportsPresent(VkPhysicalDevice physicalDevi return supported; } -void QBasicPlatformVulkanInstance::setDebugFilters(const QVector &filters) +void QBasicPlatformVulkanInstance::setDebugFilters(const QList &filters) { m_debugFilters = filters; } diff --git a/src/gui/vulkan/qplatformvulkaninstance.cpp b/src/gui/vulkan/qplatformvulkaninstance.cpp index 1b5d3370f0..638e8526b2 100644 --- a/src/gui/vulkan/qplatformvulkaninstance.cpp +++ b/src/gui/vulkan/qplatformvulkaninstance.cpp @@ -90,7 +90,7 @@ void QPlatformVulkanInstance::presentQueued(QWindow *window) Q_UNUSED(window); } -void QPlatformVulkanInstance::setDebugFilters(const QVector &filters) +void QPlatformVulkanInstance::setDebugFilters(const QList &filters) { Q_UNUSED(filters); } diff --git a/src/gui/vulkan/qvulkaninstance.cpp b/src/gui/vulkan/qvulkaninstance.cpp index 319053dec2..31f971b570 100644 --- a/src/gui/vulkan/qvulkaninstance.cpp +++ b/src/gui/vulkan/qvulkaninstance.cpp @@ -268,7 +268,7 @@ public: VkResult errorCode; QScopedPointer funcs; QHash deviceFuncs; - QVector debugFilters; + QList debugFilters; }; bool QVulkanInstancePrivate::ensureVulkan() @@ -411,19 +411,19 @@ QVulkanInstance::~QVulkanInstance() /*! \class QVulkanInfoVector - \brief A specialized QVector for QVulkanLayer and QVulkanExtension. + \brief A specialized QList for QVulkanLayer and QVulkanExtension. */ /*! \fn template bool QVulkanInfoVector::contains(const QByteArray &name) const - \return true if the vector contains a layer or extension with the given \a name. + \return true if the list contains a layer or extension with the given \a name. */ /*! \fn template bool QVulkanInfoVector::contains(const QByteArray &name, int minVersion) const - \return true if the vector contains a layer or extension with the given + \return true if the list contains a layer or extension with the given \a name and a version same as or newer than \a minVersion. */ diff --git a/src/gui/vulkan/qvulkanwindow.cpp b/src/gui/vulkan/qvulkanwindow.cpp index cb89b0b1e6..36d8ecef89 100644 --- a/src/gui/vulkan/qvulkanwindow.cpp +++ b/src/gui/vulkan/qvulkanwindow.cpp @@ -284,7 +284,7 @@ QVulkanWindow::Flags QVulkanWindow::flags() const \note This function can be called before making the window visible. */ -QVector QVulkanWindow::availablePhysicalDevices() +QList QVulkanWindow::availablePhysicalDevices() { Q_D(QVulkanWindow); if (!d->physDevs.isEmpty() && !d->physDevProps.isEmpty()) @@ -308,7 +308,7 @@ QVector QVulkanWindow::availablePhysicalDevices() if (!count) return d->physDevProps; - QVector devs(count); + QList devs(count); err = f->vkEnumeratePhysicalDevices(inst->vkInstance(), &count, devs.data()); if (err != VK_SUCCESS) { qWarning("QVulkanWindow: Failed to enumerate physical devices: %d", err); @@ -378,7 +378,7 @@ QVulkanInfoVector QVulkanWindow::supportedDeviceExtensions() uint32_t count = 0; VkResult err = f->vkEnumerateDeviceExtensionProperties(physDev, nullptr, &count, nullptr); if (err == VK_SUCCESS) { - QVector extProps(count); + QList extProps(count); err = f->vkEnumerateDeviceExtensionProperties(physDev, nullptr, &count, extProps.data()); if (err == VK_SUCCESS) { QVulkanInfoVector exts; @@ -445,7 +445,7 @@ void QVulkanWindow::setDeviceExtensions(const QByteArrayList &extensions) \sa colorFormat() */ -void QVulkanWindow::setPreferredColorFormats(const QVector &formats) +void QVulkanWindow::setPreferredColorFormats(const QList &formats) { Q_D(QVulkanWindow); if (d->status != QVulkanWindowPrivate::StatusUninitialized) { @@ -471,7 +471,7 @@ static struct { /*! Returns the set of supported sample counts when using the physical device - selected by setPhysicalDeviceIndex(), as a sorted vector. + selected by setPhysicalDeviceIndex(), as a sorted list. By default QVulkanWindow uses a sample count of 1. By calling setSampleCount() with a different value (2, 4, 8, ...) from the set returned by this @@ -481,10 +481,10 @@ static struct { \sa setSampleCount() */ -QVector QVulkanWindow::supportedSampleCounts() +QList QVulkanWindow::supportedSampleCounts() { Q_D(const QVulkanWindow); - QVector result; + QList result; availablePhysicalDevices(); @@ -606,7 +606,7 @@ void QVulkanWindowPrivate::init() uint32_t queueCount = 0; f->vkGetPhysicalDeviceQueueFamilyProperties(physDev, &queueCount, nullptr); - QVector queueFamilyProps(queueCount); + QList queueFamilyProps(queueCount); f->vkGetPhysicalDeviceQueueFamilyProperties(physDev, &queueCount, queueFamilyProps.data()); gfxQueueFamilyIdx = uint32_t(-1); presQueueFamilyIdx = uint32_t(-1); @@ -647,7 +647,7 @@ void QVulkanWindowPrivate::init() #endif qCDebug(lcGuiVk, "Using queue families: graphics = %u present = %u", gfxQueueFamilyIdx, presQueueFamilyIdx); - QVector queueInfo; + QList queueInfo; queueInfo.reserve(2); const float prio[] = { 0 }; VkDeviceQueueCreateInfo addQueueInfo; @@ -685,7 +685,7 @@ void QVulkanWindowPrivate::init() // Filter out unsupported extensions in order to keep symmetry // with how QVulkanInstance behaves. Add the swapchain extension. - QVector devExts; + QList devExts; QVulkanInfoVector supportedExtensions = q->supportedDeviceExtensions(); QByteArrayList reqExts = requestedDevExtensions; reqExts.append("VK_KHR_swapchain"); @@ -728,7 +728,7 @@ void QVulkanWindowPrivate::init() uint32_t count = 0; VkResult err = f->vkEnumerateDeviceLayerProperties(physDev, &count, nullptr); if (err == VK_SUCCESS) { - QVector layerProps(count); + QList layerProps(count); err = f->vkEnumerateDeviceLayerProperties(physDev, &count, layerProps.data()); if (err == VK_SUCCESS) { for (const VkLayerProperties &prop : layerProps) { @@ -840,7 +840,7 @@ void QVulkanWindowPrivate::init() uint32_t formatCount = 0; vkGetPhysicalDeviceSurfaceFormatsKHR(physDev, surface, &formatCount, nullptr); - QVector formats(formatCount); + QList formats(formatCount); if (formatCount) vkGetPhysicalDeviceSurfaceFormatsKHR(physDev, surface, &formatCount, formats.data()); -- cgit v1.2.3