summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-25 21:24:46 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-25 21:24:46 +0300
commit840e969cadf36e17372da397eb758405150de6f8 (patch)
tree55112e0f4a8aa6642670605e4dfd32780402521f /src/test
parentccbe98de667cd332f48d43f05f598cf4551d882d (diff)
downloadmv-840e969cadf36e17372da397eb758405150de6f8.tar.gz
mv-840e969cadf36e17372da397eb758405150de6f8.tar.bz2
mv-840e969cadf36e17372da397eb758405150de6f8.tar.xz
mv-840e969cadf36e17372da397eb758405150de6f8.zip
Fix texture size detection and saving.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/testlauncher.cpp2
-rw-r--r--src/test/testmain.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index f2167af24..c3b424368 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -190,7 +190,7 @@ int TestLauncher::testTextures()
int maxSize = 1024;
int nextSize = 1024;
int sz = OpenGLImageHelper::getTextureSize() + 1;
- if (sz < 16500)
+ if (sz > 16500)
sz = 16500;
for (nextSize = 512; nextSize < sz; nextSize *= 2)
diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp
index c42efc23e..4cc4966d8 100644
--- a/src/test/testmain.cpp
+++ b/src/test/testmain.cpp
@@ -206,6 +206,7 @@ int TestMain::exec(const bool testAudio)
textureSize1 = readValue2(14);
if (!invokeFastOpenBatchTest("15"))
textureSize2 = readValue2(15);
+ info.append(strprintf(",%d,%d", textureSize1, textureSize2));
textureSize1 = std::min(textureSize1, textureSize2);
if (textureSize1 < 1024)
textureSize1 = 1024;