diff options
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/testlauncher.cpp | 4 | ||||
-rw-r--r-- | src/test/testmain.cpp | 12 | ||||
-rw-r--r-- | src/test/testmain.h | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index 4352957ef..609198a97 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -172,6 +172,7 @@ int TestLauncher::testBatches() file << mTest << std::endl; file << batches << std::endl; + return 0; } int TestLauncher::testInternal() @@ -226,9 +227,8 @@ int TestLauncher::testInternal() int TestLauncher::testVideoDetection() { - graphicsManager.detectGraphics(); file << mTest << std::endl; - file << config.getIntValue("opengl") << std::endl; + file << graphicsManager.detectGraphics() << std::endl; return 0; } diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp index 94914c41b..535cfebc4 100644 --- a/src/test/testmain.cpp +++ b/src/test/testmain.cpp @@ -195,17 +195,17 @@ int TestMain::exec(const bool testAudio) */ // if OpenGL implimentation is not good, disable it. - if (!detectMode) + if (!(detectMode & 15)) openGLMode = 0; writeConfig(openGLMode, rescaleTest[openGLMode], - soundTest, info, batchSize); + soundTest, info, batchSize, detectMode); return 0; } void TestMain::writeConfig(const int openGLMode, const int rescale, const int sound, const std::string &info, - const int batchSize) + const int batchSize, const int detectMode) { mConfig.init(Client::getConfigDirectory() + "/config.xml"); @@ -226,6 +226,12 @@ void TestMain::writeConfig(const int openGLMode, const int rescale, // max batch size // mConfig.setValue("batchsize", batchSize); + // additinal modes + mConfig.setValue("useTextureSampler", + static_cast<bool>(detectMode & 1024)); + mConfig.setValue("compresstextures", + static_cast<bool>(detectMode & 2048)); + // stats mConfig.setValue("testInfo", info); diff --git a/src/test/testmain.h b/src/test/testmain.h index 3b3b3fbe0..2367b7d1b 100644 --- a/src/test/testmain.h +++ b/src/test/testmain.h @@ -61,7 +61,7 @@ class TestMain void writeConfig(const int openGLMode, const int rescale, const int sound, const std::string &info, - const int batchSize); + const int batchSize, const int detectMode); int readValue2(const int ver); |