From d3f1076d0a3b8b0f44250399ea325020bbe9a0fd Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 22 May 2017 10:23:16 +0200 Subject: QVulkanWindow: use QVector, not QSet, for small int set Apart from being more efficient to construct and test, for the expected very small number of entries, the example code itself shows that a sorted vector is much more useful than an unordered set. Change-Id: Ic5e38df0176ac4be08eac6a89c2e1cabab2a9020 Reviewed-by: Shawn Rutledge Reviewed-by: Laszlo Agocs --- examples/vulkan/hellovulkancubes/renderer.cpp | 2 +- examples/vulkan/hellovulkanwidget/hellovulkanwidget.cpp | 3 +-- examples/vulkan/shared/trianglerenderer.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'examples/vulkan') diff --git a/examples/vulkan/hellovulkancubes/renderer.cpp b/examples/vulkan/hellovulkancubes/renderer.cpp index 96ae6020a7..3b837d85d4 100644 --- a/examples/vulkan/hellovulkancubes/renderer.cpp +++ b/examples/vulkan/hellovulkancubes/renderer.cpp @@ -97,7 +97,7 @@ Renderer::Renderer(VulkanWindow *w, int initialCount) void Renderer::preInitResources() { - QSet sampleCounts = m_window->supportedSampleCounts(); + const QVector sampleCounts = m_window->supportedSampleCounts(); if (DBG) qDebug() << "Supported sample counts:" << sampleCounts; if (sampleCounts.contains(4)) { diff --git a/examples/vulkan/hellovulkanwidget/hellovulkanwidget.cpp b/examples/vulkan/hellovulkanwidget/hellovulkanwidget.cpp index 78de338f1f..81daa9bb96 100644 --- a/examples/vulkan/hellovulkanwidget/hellovulkanwidget.cpp +++ b/examples/vulkan/hellovulkanwidget/hellovulkanwidget.cpp @@ -170,8 +170,7 @@ void VulkanRenderer::initResources() m_window->colorFormat(), m_window->depthStencilFormat()); info += QStringLiteral("Supported sample counts:"); - QList sampleCounts = m_window->supportedSampleCounts().toList(); - std::sort(sampleCounts.begin(), sampleCounts.end()); + const QVector sampleCounts = m_window->supportedSampleCounts(); for (int count : sampleCounts) info += QLatin1Char(' ') + QString::number(count); info += QLatin1Char('\n'); diff --git a/examples/vulkan/shared/trianglerenderer.cpp b/examples/vulkan/shared/trianglerenderer.cpp index a0800080a0..7327c5a706 100644 --- a/examples/vulkan/shared/trianglerenderer.cpp +++ b/examples/vulkan/shared/trianglerenderer.cpp @@ -73,7 +73,7 @@ TriangleRenderer::TriangleRenderer(QVulkanWindow *w, bool msaa) : m_window(w) { if (msaa) { - QSet counts = w->supportedSampleCounts(); + const QVector counts = w->supportedSampleCounts(); qDebug() << "Supported sample counts:" << counts; for (int s = 16; s >= 4; s /= 2) { if (counts.contains(s)) { -- cgit v1.2.3