From bed8c5d678bc73bede59bbddf5e8b6af05185780 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@qt.io>
Date: Tue, 30 Jun 2020 09:28:38 +0200
Subject: Switch to qvla where it makes sense in rhi

For all of these we know in advance that the vast majority of usages
will not exceed a certain number of elements. Also, none of these are
copied or moved ever.

Change-Id: I48aedf143e221dc178d661e23454d1e4fb7a271b
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
---
 src/gui/rhi/qrhivulkan_p_p.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/gui/rhi/qrhivulkan_p_p.h')

diff --git a/src/gui/rhi/qrhivulkan_p_p.h b/src/gui/rhi/qrhivulkan_p_p.h
index 3d02806033..cb21945301 100644
--- a/src/gui/rhi/qrhivulkan_p_p.h
+++ b/src/gui/rhi/qrhivulkan_p_p.h
@@ -601,7 +601,7 @@ struct QVkSwapChain : public QRhiSwapChain
     VkColorSpaceKHR colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
     QVkRenderBuffer *ds = nullptr;
     VkSampleCountFlagBits samples = VK_SAMPLE_COUNT_1_BIT;
-    QList<VkPresentModeKHR> supportedPresentationModes;
+    QVarLengthArray<VkPresentModeKHR, 8> supportedPresentationModes;
     VkDeviceMemory msaaImageMem = VK_NULL_HANDLE;
     QVkReferenceRenderTarget rtWrapper;
     QVkCommandBuffer cbWrapper;
@@ -865,7 +865,7 @@ public:
         int refCount = 0;
         int allocedDescSets = 0;
     };
-    QList<DescriptorPoolData> descriptorPools;
+    QVarLengthArray<DescriptorPoolData, 8> descriptorPools;
 
     VkQueryPool timestampQueryPool = VK_NULL_HANDLE;
     QBitArray timestampQueryPoolMap;
@@ -894,7 +894,7 @@ public:
         QSize pixelSize;
         QRhiTexture::Format format;
     };
-    QList<TextureReadback> activeTextureReadbacks;
+    QVarLengthArray<TextureReadback, 2> activeTextureReadbacks;
     struct BufferReadback {
         int activeFrameSlot = -1;
         QRhiBufferReadbackResult *result;
@@ -902,7 +902,7 @@ public:
         VkBuffer stagingBuf;
         QVkAlloc stagingAlloc;
     };
-    QList<BufferReadback> activeBufferReadbacks;
+    QVarLengthArray<BufferReadback, 2> activeBufferReadbacks;
 
     struct DeferredReleaseEntry {
         enum Type {
-- 
cgit v1.2.3