Merge branch releases/1.8 revisions 5140:5149 into trunk:

- Add warning in tests when stabilizing screenshots fails 
(Note - it still fails sometimes, just less now with trying to get a good screenshot)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5150 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2015-10-06 20:48:42 +00:00
parent eef7353833
commit 7f8604ca93
2 changed files with 7 additions and 1 deletions

View File

@ -116,6 +116,10 @@ Changes in 1.9 (not yet released)
- burningvideo: getMaxTextureSize adjusted [ changed meaning of SOFTWARE_DRIVER_2_TEXTURE_MAXSIZE
- burningvideo: mipmaplevel adjusted ( not that bad bokeh...(sometimes) )
--------------------------
Changes in 1.8.4
- Tests give now a warning when stabilizing screenshots failed. Aslo trying more often now (a hack as taking screenshots otherwise fails often in windowed mode on some systems).
--------------------------
Changes in 1.8.3 (13.9.2015)
- Fix the fix for compiling on GCC5 (thanks to est31 for report and patch)

View File

@ -336,7 +336,7 @@ float fuzzyCompareImages(irr::video::IVideoDriver * driver,
void stabilizeScreenBackground(irr::video::IVideoDriver * driver,
irr::video::SColor color)
{
for(int i = 0; i < 100; ++i) // 100 - max checks
for(int i = 0; i < 10000; ++i)
{
driver->beginScene(true, true, color);
driver->endScene();
@ -382,6 +382,8 @@ void stabilizeScreenBackground(irr::video::IVideoDriver * driver,
}
screenshot->drop();
}
logTestString("stabilizeScreenBackground failed\n");
}
irr::core::stringc shortDriverName(irr::video::IVideoDriver * driver)