summaryrefslogtreecommitdiffstats
path: root/src/gui/vulkan/qvulkanwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/vulkan/qvulkanwindow.cpp')
-rw-r--r--src/gui/vulkan/qvulkanwindow.cpp24
1 files changed, 12 insertions, 12 deletions
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<VkPhysicalDeviceProperties> QVulkanWindow::availablePhysicalDevices()
+QList<VkPhysicalDeviceProperties> QVulkanWindow::availablePhysicalDevices()
{
Q_D(QVulkanWindow);
if (!d->physDevs.isEmpty() && !d->physDevProps.isEmpty())
@@ -308,7 +308,7 @@ QVector<VkPhysicalDeviceProperties> QVulkanWindow::availablePhysicalDevices()
if (!count)
return d->physDevProps;
- QVector<VkPhysicalDevice> devs(count);
+ QList<VkPhysicalDevice> 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<QVulkanExtension> QVulkanWindow::supportedDeviceExtensions()
uint32_t count = 0;
VkResult err = f->vkEnumerateDeviceExtensionProperties(physDev, nullptr, &count, nullptr);
if (err == VK_SUCCESS) {
- QVector<VkExtensionProperties> extProps(count);
+ QList<VkExtensionProperties> extProps(count);
err = f->vkEnumerateDeviceExtensionProperties(physDev, nullptr, &count, extProps.data());
if (err == VK_SUCCESS) {
QVulkanInfoVector<QVulkanExtension> exts;
@@ -445,7 +445,7 @@ void QVulkanWindow::setDeviceExtensions(const QByteArrayList &extensions)
\sa colorFormat()
*/
-void QVulkanWindow::setPreferredColorFormats(const QVector<VkFormat> &formats)
+void QVulkanWindow::setPreferredColorFormats(const QList<VkFormat> &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<int> QVulkanWindow::supportedSampleCounts()
+QList<int> QVulkanWindow::supportedSampleCounts()
{
Q_D(const QVulkanWindow);
- QVector<int> result;
+ QList<int> result;
availablePhysicalDevices();
@@ -606,7 +606,7 @@ void QVulkanWindowPrivate::init()
uint32_t queueCount = 0;
f->vkGetPhysicalDeviceQueueFamilyProperties(physDev, &queueCount, nullptr);
- QVector<VkQueueFamilyProperties> queueFamilyProps(queueCount);
+ QList<VkQueueFamilyProperties> 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<VkDeviceQueueCreateInfo> queueInfo;
+ QList<VkDeviceQueueCreateInfo> 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<const char *> devExts;
+ QList<const char *> devExts;
QVulkanInfoVector<QVulkanExtension> 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<VkLayerProperties> layerProps(count);
+ QList<VkLayerProperties> 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<VkSurfaceFormatKHR> formats(formatCount);
+ QList<VkSurfaceFormatKHR> formats(formatCount);
if (formatCount)
vkGetPhysicalDeviceSurfaceFormatsKHR(physDev, surface, &formatCount, formats.data());