BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix performance regression

Browse Source
This commit is contained in:
Craig Robbins 2015-02-05 17:22:10 +10:00
parent 929e0b0ad8
commit 9a0dd47057
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/porting.cpp
View File

@ -647,7 +647,8 @@ const char *getVideoDriverFriendlyName(irr::video::E_DRIVER_TYPE type)
#ifndef __ANDROID__
#ifdef XORG_USED
float getDisplayDensity()
static float calcDisplayDensity()
{
const char* current_display = getenv("DISPLAY");
@ -665,7 +666,7 @@ float getDisplayDensity()
XCloseDisplay(x11display);
return (std::max(dpi_height,dpi_width) / 96.0);
return std::max(dpi_height,dpi_width) / 96.0;
}
}
@ -673,6 +674,14 @@ float getDisplayDensity()
return g_settings->getFloat("screen_dpi")/96.0;
}
float getDisplayDensity()
{
static float cached_display_density = calcDisplayDensity();
return cached_display_density;
}
#else
float getDisplayDensity()
{