diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-07-05 02:06:55 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-07-05 02:06:55 +0100 |
| commit | 97fe4b6b2d6ada8066821594543bea38b564fb93 (patch) | |
| tree | f46619f2667ad16ff1653f3e6566069a3d6a6a7c | |
| parent | Re-add testHelpers.h (diff) | |
| download | ilt-97fe4b6b2d6ada8066821594543bea38b564fb93.tar.bz2 ilt-97fe4b6b2d6ada8066821594543bea38b564fb93.tar.xz ilt-97fe4b6b2d6ada8066821594543bea38b564fb93.zip | |
Fix up perf tests in light of window management changes
| -rw-r--r-- | test/Jamfile.jam | 8 | ||||
| -rw-r--r-- | test/perf-assetFactory.cpp | 6 | ||||
| -rw-r--r-- | test/perf-instancing.cpp | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/test/Jamfile.jam b/test/Jamfile.jam index 1266854..0b830a8 100644 --- a/test/Jamfile.jam +++ b/test/Jamfile.jam @@ -55,8 +55,8 @@ run test-enumDetails.cpp ; run test-render.cpp : -- : test-assetFactory : <library>test ; run test-glContextBhvr.cpp ; run test-assetFactory.cpp : -- : [ sequence.insertion-sort [ glob-tree $(res) : *.* ] fixtures/rgb.txt test-instancing ] : <library>test ; -run perf-assetFactory.cpp : <\ : test-assetFactory : <library>benchmark <library>test ; -run perf-geoData.cpp : : : <library>test <library>benchmark ; +run perf-assetFactory.cpp : \< : test-assetFactory : <library>benchmark <library>test ; +run perf-geoData.cpp : \< : test-geoData : <library>test <library>benchmark ; run perf-persistence.cpp : \< : test-persistence : <library>benchmark <library>test ; run test-worker.cpp ; run test-instancing.cpp : -- : test-glContainer : <library>test ; @@ -67,7 +67,7 @@ compile test-static-enumDetails.cpp ; compile test-static-stream_support.cpp ; explicit perf-assetFactory ; explicit perf-persistence ; -explicit perf-terrain ; +explicit perf-geoData ; explicit perf-instancing ; -alias perf : perf-assetFactory perf-persistence perf-terrain ; +alias perf : perf-assetFactory perf-persistence perf-geoData perf-instancing ; explicit perf ; diff --git a/test/perf-assetFactory.cpp b/test/perf-assetFactory.cpp index 147e4ba..671713c 100644 --- a/test/perf-assetFactory.cpp +++ b/test/perf-assetFactory.cpp @@ -1,13 +1,11 @@ #include "assetFactory/assetFactory.h" -#include "assetFactory/factoryMesh.h" #include "testMainWindow.h" -#include "ui/applicationBase.h" #include <benchmark/benchmark.h> static void brush47xml_load(benchmark::State & state) { - TestMainWindow window; + TestMainWindowAppBase window; for (auto _ : state) { benchmark::DoNotOptimize(AssetFactory::loadXML(RESDIR "/brush47.xml")); @@ -17,7 +15,7 @@ brush47xml_load(benchmark::State & state) static void foliagexml_load(benchmark::State & state) { - TestMainWindow window; + TestMainWindowAppBase window; for (auto _ : state) { benchmark::DoNotOptimize(AssetFactory::loadXML(RESDIR "/foliage.xml")); diff --git a/test/perf-instancing.cpp b/test/perf-instancing.cpp index 829ea50..3638111 100644 --- a/test/perf-instancing.cpp +++ b/test/perf-instancing.cpp @@ -26,7 +26,7 @@ struct data { static void partition(benchmark::State & state) { - TestMainWindow window; + TestMainWindowAppBase window; data d(static_cast<size_t>(state.range())); GlobalPosition2D pos {}; for (auto _ : state) { |