diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2018-01-12 14:17:40 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2018-01-12 15:07:06 +0000 |
| commit | 417b32815d5d6c45a6c8b4d38b62ca10119d14fd (patch) | |
| tree | 5c910952affff3d376cbe84b7130be9ee7d6a577 /tests/benchmarks | |
| parent | 1d5f8b8536c1b0165c2292529dc3814e96bb0a27 (diff) | |
| parent | c9edc164ab165ddd31ef2411be19deb130614e8b (diff) | |
Merge branch '5.9' into 5.10
Conflicts:
.qmake.conf
src/animation/backend/handle_types_p.h
src/extras/defaults/qtexturematerial.h
src/render/backend/entity_p.h
src/render/backend/handle_types_p.h
src/render/backend/renderview.cpp
src/render/io/scenemanager.cpp
Change-Id: Ic145062cc98360e9067fd60f0992c7a6b51e41bb
Diffstat (limited to 'tests/benchmarks')
| -rw-r--r-- | tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp index 51eb2d6fc..3046fcb98 100644 --- a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp +++ b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp @@ -69,7 +69,7 @@ public: template<typename Resource> void benchmarkAllocateResources() { - Qt3DCore::QResourceManager<Resource, int, 16> manager; + Qt3DCore::QResourceManager<Resource, int> manager; volatile Resource *c; QBENCHMARK_ONCE { @@ -83,7 +83,7 @@ void benchmarkAllocateResources() template<typename Resource> void benchmarkAccessResources() { - Qt3DCore::QResourceManager<Resource, int, 16> manager; + Qt3DCore::QResourceManager<Resource, int> manager; const int max = (1 << 16) - 1; QVector<Qt3DCore::QHandle<Resource> > handles(max); for (int i = 0; i < max; i++) @@ -99,7 +99,7 @@ void benchmarkAccessResources() template<typename Resource> void benchmarkRandomAccessResource() { - Qt3DCore::QResourceManager<Resource, int, 16> manager; + Qt3DCore::QResourceManager<Resource, int> manager; const int max = (1 << 16) - 1; QVector<Qt3DCore::QHandle<Resource> > handles(max); for (int i = 0; i < max; i++) @@ -118,7 +118,7 @@ void benchmarkRandomAccessResource() { template<typename Resource> void benchmarkLookupResources() { - Qt3DCore::QResourceManager<Resource, int, 16> manager; + Qt3DCore::QResourceManager<Resource, int> manager; const int max = (1 << 16) - 1; for (int i = 0; i < max; i++) manager.getOrCreateResource(i); @@ -134,7 +134,7 @@ void benchmarkLookupResources() template<typename Resource> void benchmarkRandomLookupResources() { - Qt3DCore::QResourceManager<Resource, int, 16> manager; + Qt3DCore::QResourceManager<Resource, int> manager; const int max = (1 << 16) - 1; QVector<int> resourcesIndices(max); for (int i = 0; i < max; i++) { @@ -154,7 +154,7 @@ void benchmarkRandomLookupResources() template<typename Resource> void benchmarkReleaseResources() { - Qt3DCore::QResourceManager<Resource, int, 16> manager; + Qt3DCore::QResourceManager<Resource, int> manager; const int max = (1 << 16) - 1; QVector<Qt3DCore::QHandle<Resource> > handles(max); for (int i = 0; i < max; i++) |