summaryrefslogtreecommitdiffstats
path: root/tests/manual/rhi
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-07-06 16:37:47 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-07-07 11:48:45 +0200
commitd33655a9531b750e1574742ff575f871c19ed808 (patch)
tree8b90d1878dd5f0d9ea38bc048b22f718273bb802 /tests/manual/rhi
parenta02d2d3f22acbf9afb349964f5da00d0e91af887 (diff)
Use QList instead of QVector in other qtbase tests
Task-number: QTBUG-84469 Change-Id: Ie0455c890c048c52eacad1badd6d21df999badf9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/manual/rhi')
-rw-r--r--tests/manual/rhi/computebuffer/computebuffer.cpp2
-rw-r--r--tests/manual/rhi/computeimage/computeimage.cpp2
-rw-r--r--tests/manual/rhi/cubemap/cubemap.cpp2
-rw-r--r--tests/manual/rhi/cubemap_render/cubemap_render.cpp2
-rw-r--r--tests/manual/rhi/cubemap_scissor/cubemap_scissor.cpp2
-rw-r--r--tests/manual/rhi/float16texture_with_compute/float16texture_with_compute.cpp2
-rw-r--r--tests/manual/rhi/floattexture/floattexture.cpp2
-rw-r--r--tests/manual/rhi/instancing/instancing.cpp2
-rw-r--r--tests/manual/rhi/mrt/mrt.cpp2
-rw-r--r--tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp2
-rw-r--r--tests/manual/rhi/msaatexture/msaatexture.cpp2
-rw-r--r--tests/manual/rhi/multiwindow/multiwindow.cpp4
-rw-r--r--tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp4
-rw-r--r--tests/manual/rhi/qrhiprof/qrhiprof.cpp2
-rw-r--r--tests/manual/rhi/shadowmap/shadowmap.cpp2
-rw-r--r--tests/manual/rhi/texuploads/texuploads.cpp2
16 files changed, 18 insertions, 18 deletions
diff --git a/tests/manual/rhi/computebuffer/computebuffer.cpp b/tests/manual/rhi/computebuffer/computebuffer.cpp
index ebff01d278..942de2821b 100644
--- a/tests/manual/rhi/computebuffer/computebuffer.cpp
+++ b/tests/manual/rhi/computebuffer/computebuffer.cpp
@@ -60,7 +60,7 @@
// everywhere. So in some cases the points will be of size 1.
struct {
- QVector<QRhiResource *> releasePool;
+ QList<QRhiResource *> releasePool;
QRhiBuffer *sbuf = nullptr;
QRhiBuffer *computeUniBuf = nullptr;
QRhiShaderResourceBindings *computeBindings = nullptr;
diff --git a/tests/manual/rhi/computeimage/computeimage.cpp b/tests/manual/rhi/computeimage/computeimage.cpp
index d583778577..35c48a0451 100644
--- a/tests/manual/rhi/computeimage/computeimage.cpp
+++ b/tests/manual/rhi/computeimage/computeimage.cpp
@@ -54,7 +54,7 @@
// fragment shader is generated by the compute shader.
struct {
- QVector<QRhiResource *> releasePool;
+ QList<QRhiResource *> releasePool;
QRhiTexture *texIn = nullptr;
QRhiTexture *texOut = nullptr;
diff --git a/tests/manual/rhi/cubemap/cubemap.cpp b/tests/manual/rhi/cubemap/cubemap.cpp
index 84c17918f3..6004c39ea9 100644
--- a/tests/manual/rhi/cubemap/cubemap.cpp
+++ b/tests/manual/rhi/cubemap/cubemap.cpp
@@ -52,7 +52,7 @@
#include "../shared/cube.h"
struct {
- QVector<QRhiResource *> releasePool;
+ QList<QRhiResource *> releasePool;
QRhiBuffer *vbuf = nullptr;
QRhiBuffer *ubuf = nullptr;
QRhiTexture *tex = nullptr;
diff --git a/tests/manual/rhi/cubemap_render/cubemap_render.cpp b/tests/manual/rhi/cubemap_render/cubemap_render.cpp
index 97c831f1f9..3417fbf7c2 100644
--- a/tests/manual/rhi/cubemap_render/cubemap_render.cpp
+++ b/tests/manual/rhi/cubemap_render/cubemap_render.cpp
@@ -79,7 +79,7 @@ static quint16 halfQuadIndexData[] =
};
struct {
- QVector<QRhiResource *> releasePool;
+ QList<QRhiResource *> releasePool;
QRhiTexture *cubemap1 = nullptr;
QRhiTexture *cubemap2 = nullptr;
diff --git a/tests/manual/rhi/cubemap_scissor/cubemap_scissor.cpp b/tests/manual/rhi/cubemap_scissor/cubemap_scissor.cpp
index cc30058afc..9a6d55ed69 100644
--- a/tests/manual/rhi/cubemap_scissor/cubemap_scissor.cpp
+++ b/tests/manual/rhi/cubemap_scissor/cubemap_scissor.cpp
@@ -59,7 +59,7 @@
#include "../shared/cube.h"
struct {
- QVector<QRhiResource *> releasePool;
+ QList<QRhiResource *> releasePool;
QRhiBuffer *vbuf = nullptr;
QRhiBuffer *ubuf = nullptr;
QRhiTexture *tex = nullptr;
diff --git a/tests/manual/rhi/float16texture_with_compute/float16texture_with_compute.cpp b/tests/manual/rhi/float16texture_with_compute/float16texture_with_compute.cpp
index 014b521bd8..7310872748 100644
--- a/tests/manual/rhi/float16texture_with_compute/float16texture_with_compute.cpp
+++ b/tests/manual/rhi/float16texture_with_compute/float16texture_with_compute.cpp
@@ -77,7 +77,7 @@ static quint16 indexData[] =
static const int MAX_MIP_LEVELS = 20;
struct {
- QVector<QRhiResource *> releasePool;
+ QList<QRhiResource *> releasePool;
QRhiBuffer *vbuf = nullptr;
QRhiBuffer *ibuf = nullptr;
diff --git a/tests/manual/rhi/floattexture/floattexture.cpp b/tests/manual/rhi/floattexture/floattexture.cpp
index 30f61c3e04..02403ed0af 100644
--- a/tests/manual/rhi/floattexture/floattexture.cpp
+++ b/tests/manual/rhi/floattexture/floattexture.cpp
@@ -212,7 +212,7 @@ static quint16 indexData[] =
};
struct {
- QVector<QRhiResource *> releasePool;
+ QList<QRhiResource *> releasePool;
QRhiBuffer *vbuf = nullptr;
QRhiBuffer *ibuf = nullptr;
QRhiBuffer *ubuf = nullptr;
diff --git a/tests/manual/rhi/instancing/instancing.cpp b/tests/manual/rhi/instancing/instancing.cpp
index 9aafadc1b6..87a99b4581 100644
--- a/tests/manual/rhi/instancing/instancing.cpp
+++ b/tests/manual/rhi/instancing/instancing.cpp
@@ -58,7 +58,7 @@
const int INSTANCE_COUNT = 1024;
struct {
- QVector<QRhiResource *> releasePool;
+ QList<QRhiResource *> releasePool;
QRhiBuffer *vbuf = nullptr;
QRhiBuffer *instBuf = nullptr;
diff --git a/tests/manual/rhi/mrt/mrt.cpp b/tests/manual/rhi/mrt/mrt.cpp
index 03182bf170..cfe79419d1 100644
--- a/tests/manual/rhi/mrt/mrt.cpp
+++ b/tests/manual/rhi/mrt/mrt.cpp
@@ -77,7 +77,7 @@ static float triangleData[] =
};
struct {
- QVector<QRhiResource *> releasePool;
+ QList<QRhiResource *> releasePool;
QRhiBuffer *vbuf = nullptr;
QRhiBuffer *ibuf = nullptr;
QRhiBuffer *ubuf = nullptr;
diff --git a/tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp b/tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp
index 26ea484d9e..fb30758bc1 100644
--- a/tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp
+++ b/tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp
@@ -74,7 +74,7 @@ static float triangleData[] =
};
struct {
- QVector<QRhiResource *> releasePool;
+ QList<QRhiResource *> releasePool;
QRhiBuffer *vbuf = nullptr;
QRhiBuffer *ibuf = nullptr;
QRhiBuffer *ubuf = nullptr;
diff --git a/tests/manual/rhi/msaatexture/msaatexture.cpp b/tests/manual/rhi/msaatexture/msaatexture.cpp
index 1b735d2984..c22873342a 100644
--- a/tests/manual/rhi/msaatexture/msaatexture.cpp
+++ b/tests/manual/rhi/msaatexture/msaatexture.cpp
@@ -77,7 +77,7 @@ static float triangleData[] =
const int UBUFSZ = 68;
struct {
- QVector<QRhiResource *> releasePool;
+ QList<QRhiResource *> releasePool;
QRhiBuffer *vbuf = nullptr;
QRhiBuffer *ibuf = nullptr;
QRhiBuffer *ubuf = nullptr;
diff --git a/tests/manual/rhi/multiwindow/multiwindow.cpp b/tests/manual/rhi/multiwindow/multiwindow.cpp
index c5c667fe57..222f82b472 100644
--- a/tests/manual/rhi/multiwindow/multiwindow.cpp
+++ b/tests/manual/rhi/multiwindow/multiwindow.cpp
@@ -169,7 +169,7 @@ void destroyRhi()
}
struct {
- QVector<QWindow *> windows;
+ QList<QWindow *> windows;
QRhiBuffer *vbuf = nullptr;
QRhiBuffer *ubuf = nullptr;
@@ -295,7 +295,7 @@ protected:
bool m_newlyExposed = false;
QMatrix4x4 m_proj;
- QVector<QRhiResource *> m_releasePool;
+ QList<QRhiResource *> m_releasePool;
bool m_hasSwapChain = false;
QRhiSwapChain *m_sc = nullptr;
diff --git a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp
index 731e7221f3..3a2de89291 100644
--- a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp
+++ b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp
@@ -268,7 +268,7 @@ struct Renderer
QColor m_bgColor;
int m_rotationAxis;
- QVector<QRhiResource *> m_releasePool;
+ QList<QRhiResource *> m_releasePool;
bool m_hasSwapChain = false;
QRhiSwapChain *m_sc = nullptr;
QRhiRenderBuffer *m_ds = nullptr;
@@ -691,7 +691,7 @@ struct WindowAndRenderer
Renderer *renderer;
};
-QVector<WindowAndRenderer> windows;
+QList<WindowAndRenderer> windows;
void createWindow()
{
diff --git a/tests/manual/rhi/qrhiprof/qrhiprof.cpp b/tests/manual/rhi/qrhiprof/qrhiprof.cpp
index aa09f78bf3..2dea20ec22 100644
--- a/tests/manual/rhi/qrhiprof/qrhiprof.cpp
+++ b/tests/manual/rhi/qrhiprof/qrhiprof.cpp
@@ -92,7 +92,7 @@ public:
};
};
- QVector<Param> params;
+ QList<Param> params;
const Param *param(const char *key) const {
auto it = std::find_if(params.cbegin(), params.cend(), [key](const Param &p) {
diff --git a/tests/manual/rhi/shadowmap/shadowmap.cpp b/tests/manual/rhi/shadowmap/shadowmap.cpp
index d6c5142854..dc533fea29 100644
--- a/tests/manual/rhi/shadowmap/shadowmap.cpp
+++ b/tests/manual/rhi/shadowmap/shadowmap.cpp
@@ -68,7 +68,7 @@ static quint16 quadIndexData[] =
};
struct {
- QVector<QRhiResource *> releasePool;
+ QList<QRhiResource *> releasePool;
QRhiBuffer *vbuf = nullptr;
QRhiBuffer *ibuf = nullptr;
QRhiBuffer *ubuf = nullptr;
diff --git a/tests/manual/rhi/texuploads/texuploads.cpp b/tests/manual/rhi/texuploads/texuploads.cpp
index ee59c513ba..36be237a3d 100644
--- a/tests/manual/rhi/texuploads/texuploads.cpp
+++ b/tests/manual/rhi/texuploads/texuploads.cpp
@@ -59,7 +59,7 @@ struct {
QRhiSampler *sampler = nullptr;
QRhiShaderResourceBindings *srb = nullptr;
QRhiGraphicsPipeline *ps = nullptr;
- QVector<QRhiResource *> releasePool;
+ QList<QRhiResource *> releasePool;
float rotation = 0;
QRhiResourceUpdateBatch *initialUpdates = nullptr;