diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-06 11:55:39 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-07 20:35:05 +0200 |
commit | 471e4fcb226c4523efe93b1bdaf0db026495da94 (patch) | |
tree | bb963937b2446eb32d7632568433083a386f2c68 /src/gui/rhi/qrhivulkan.cpp | |
parent | 7f400522c39f6a1abf083dc1af49ea3109635cc8 (diff) |
Use QList instead of QVector in gui implementation
Task-number: QTBUG-84469
Change-Id: I366e845249203d80d640355a7780ac2f91a762f1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/gui/rhi/qrhivulkan.cpp')
-rw-r--r-- | src/gui/rhi/qrhivulkan.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/rhi/qrhivulkan.cpp b/src/gui/rhi/qrhivulkan.cpp index 32515ea31a..4bf859a716 100644 --- a/src/gui/rhi/qrhivulkan.cpp +++ b/src/gui/rhi/qrhivulkan.cpp @@ -376,7 +376,7 @@ bool QRhiVulkan::create(QRhi::Flags flags) f = inst->functions(); - QVector<VkQueueFamilyProperties> queueFamilyProps; + QList<VkQueueFamilyProperties> queueFamilyProps; auto queryQueueFamilyProps = [this, &queueFamilyProps] { uint32_t queueCount = 0; f->vkGetPhysicalDeviceQueueFamilyProperties(physDev, &queueCount, nullptr); @@ -492,7 +492,7 @@ bool QRhiVulkan::create(QRhi::Flags flags) queueInfo[0].queueCount = 1; queueInfo[0].pQueuePriorities = prio; - QVector<const char *> devLayers; + QList<const char *> devLayers; if (inst->layers().contains("VK_LAYER_LUNARG_standard_validation")) devLayers.append("VK_LAYER_LUNARG_standard_validation"); @@ -500,14 +500,14 @@ bool QRhiVulkan::create(QRhi::Flags flags) uint32_t devExtCount = 0; f->vkEnumerateDeviceExtensionProperties(physDev, nullptr, &devExtCount, nullptr); if (devExtCount) { - QVector<VkExtensionProperties> extProps(devExtCount); + QList<VkExtensionProperties> extProps(devExtCount); f->vkEnumerateDeviceExtensionProperties(physDev, nullptr, &devExtCount, extProps.data()); for (const VkExtensionProperties &p : qAsConst(extProps)) devExts.append({ p.extensionName, p.specVersion }); } qCDebug(QRHI_LOG_INFO, "%d device extensions available", int(devExts.count())); - QVector<const char *> requestedDevExts; + QList<const char *> requestedDevExts; requestedDevExts.append("VK_KHR_swapchain"); debugMarkersAvailable = false; @@ -3101,7 +3101,7 @@ void QRhiVulkan::enqueueResourceUpdates(QVkCommandBuffer *cbD, QRhiResourceUpdat for (int layer = 0; layer < QRhi::MAX_LAYERS; ++layer) { for (int level = 0; level < QRhi::MAX_LEVELS; ++level) { - const QVector<QRhiTextureSubresourceUploadDescription> &srd(u.subresDesc[layer][level]); + const QList<QRhiTextureSubresourceUploadDescription> &srd(u.subresDesc[layer][level]); if (srd.isEmpty()) continue; for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(srd)) { @@ -3581,13 +3581,13 @@ static struct { { VK_SAMPLE_COUNT_64_BIT, 64 } }; -QVector<int> QRhiVulkan::supportedSampleCounts() const +QList<int> QRhiVulkan::supportedSampleCounts() const { const VkPhysicalDeviceLimits *limits = &physDevProperties.limits; VkSampleCountFlags color = limits->framebufferColorSampleCounts; VkSampleCountFlags depth = limits->framebufferDepthSampleCounts; VkSampleCountFlags stencil = limits->framebufferStencilSampleCounts; - QVector<int> result; + QList<int> result; for (const auto &qvk_sampleCount : qvk_sampleCounts) { if ((color & qvk_sampleCount.mask) @@ -6711,7 +6711,7 @@ bool QVkSwapChain::ensureSurface() quint32 formatCount = 0; rhiD->vkGetPhysicalDeviceSurfaceFormatsKHR(rhiD->physDev, surface, &formatCount, nullptr); - QVector<VkSurfaceFormatKHR> formats(formatCount); + QList<VkSurfaceFormatKHR> formats(formatCount); if (formatCount) rhiD->vkGetPhysicalDeviceSurfaceFormatsKHR(rhiD->physDev, surface, &formatCount, formats.data()); |