This commit is contained in:
proller 2016-04-18 00:54:12 +03:00
parent 95ae277fc1
commit 1725304eaf
3 changed files with 13 additions and 8 deletions

View File

@ -1856,7 +1856,7 @@ void Client::afterContentReceived(IrrlichtDevice *device)
{
//infostream<<"Client::afterContentReceived() started"<<std::endl;
bool headless_optimize = g_settings->getBool("headless_optimize"); //device->getVideoDriver()->getDriverType() == video::EDT_NULL;
static auto headless_optimize = g_settings->getBool("headless_optimize"); //device->getVideoDriver()->getDriverType() == video::EDT_NULL;
//bool no_output = device->getVideoDriver()->getDriverType() == video::EDT_NULL;
const wchar_t* text = wgettext("Loading textures...");
@ -2068,8 +2068,10 @@ ParticleManager* Client::getParticleManager()
scene::IAnimatedMesh* Client::getMesh(const std::string &filename)
{
static auto headless_optimize = g_settings->getBool("headless_optimize");
StringMap::const_iterator it = m_mesh_data.find(filename);
if (it == m_mesh_data.end()) {
if (!headless_optimize)
errorstream << "Client::getMesh(): Mesh not found: \"" << filename
<< "\"" << std::endl;
return NULL;

View File

@ -818,6 +818,8 @@ void GenericCAO::removeFromScene(bool permanent)
void GenericCAO::addToScene(scene::ISceneManager *smgr,
ITextureSource *tsrc, IrrlichtDevice *irr)
{
static auto headless_optimize = g_settings->getBool("headless_optimize");
m_smgr = smgr;
m_irr = irr;
@ -954,7 +956,7 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr,
m_animated_meshnode->setMaterialFlag(video::EMF_FOG_ENABLE, true);
m_animated_meshnode->setMaterialFlag(video::EMF_BACK_FACE_CULLING, backface_culling);
}
else
else if (!headless_optimize)
errorstream<<"GenericCAO::addToScene(): Could not load mesh "<<m_prop.mesh<<std::endl;
}
else if(m_prop.visual == "wielditem") {

View File

@ -601,12 +601,13 @@ qq{$config->{vtune_amplifier}amplxe-cl -report $report -report-width=250 -report
},
bot_vtune => ['build_client_debug', ['vtune', 'run_single'], 'vtune_report'],
stress_vtune => [
'build_debug',
sub {
commands_run('vtune', 'run_server');
},
['sleep', 10],
'clients_run',
#'build_debug',sub { commands_run('vtune', 'run_server');}, ['sleep', 10], 'clients_run',
{#-no_build_client => 1, -no_build_server => 0,
-server_bg => 1,}, 'build_debug',
[\'vtune', 'run_server'], ['sleep', 10],
#{build_name => '_normal'},
'clients',
],
gperf => sub {