]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/client/renderingengine.cpp
Merge branch 'master' of https://github.com/minetest/minetest
[dragonfireclient.git] / src / client / renderingengine.cpp
index ce8f643b965101c6229120be492a7d282b60e0f8..6ebcc784d151abd0ccb7fecc6ec38fbf07dc096c 100644 (file)
@@ -19,29 +19,67 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include <IrrlichtDevice.h>
-#include <irrlicht.h>
 #include "fontengine.h"
+#include "client.h"
 #include "clouds.h"
 #include "util/numeric.h"
 #include "guiscalingfilter.h"
-#include "hud.h"
+#include "localplayer.h"
+#include "client/hud.h"
 #include "camera.h"
 #include "minimap.h"
 #include "clientmap.h"
 #include "renderingengine.h"
+#include "render/core.h"
+#include "render/factory.h"
 #include "inputhandler.h"
 #include "gettext.h"
+#include "../gui/guiSkin.h"
 
-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) && !defined(SERVER)
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) && \
+               !defined(SERVER) && !defined(__HAIKU__)
 #define XORG_USED
 #endif
 #ifdef XORG_USED
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#endif
+
+#ifdef _WIN32
+#include <windows.h>
+#include <winuser.h>
+#endif
+
+#if ENABLE_GLES
+#include "filesys.h"
 #endif
 
 RenderingEngine *RenderingEngine::s_singleton = nullptr;
 
+
+static gui::GUISkin *createSkin(gui::IGUIEnvironment *environment,
+               gui::EGUI_SKIN_TYPE type, video::IVideoDriver *driver)
+{
+       gui::GUISkin *skin = new gui::GUISkin(type, driver);
+
+       gui::IGUIFont *builtinfont = environment->getBuiltInFont();
+       gui::IGUIFontBitmap *bitfont = nullptr;
+       if (builtinfont && builtinfont->getType() == gui::EGFT_BITMAP)
+               bitfont = (gui::IGUIFontBitmap*)builtinfont;
+
+       gui::IGUISpriteBank *bank = 0;
+       skin->setFont(builtinfont);
+
+       if (bitfont)
+               bank = bitfont->getSpriteBank();
+
+       skin->setSpriteBank(bank);
+
+       return skin;
+}
+
+
 RenderingEngine::RenderingEngine(IEventReceiver *receiver)
 {
        sanity_check(!s_singleton);
@@ -53,7 +91,6 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
 
        // bpp, fsaa, vsync
        bool vsync = g_settings->getBool("vsync");
-       u16 bits = g_settings->getU16("fullscreen_bpp");
        u16 fsaa = g_settings->getU16("fsaa");
 
        // stereo buffer required for pageflip stereo
@@ -67,7 +104,7 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
        u32 i;
        for (i = 0; i != drivers.size(); i++) {
                if (!strcasecmp(driverstring.c_str(),
-                                   RenderingEngine::getVideoDriverName(drivers[i]))) {
+                               RenderingEngine::getVideoDriverInfo(drivers[i]).name.c_str())) {
                        driverType = drivers[i];
                        break;
                }
@@ -79,36 +116,49 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
        }
 
        SIrrlichtCreationParameters params = SIrrlichtCreationParameters();
+       if (tracestream)
+               params.LoggingLevel = irr::ELL_DEBUG;
        params.DriverType = driverType;
        params.WindowSize = core::dimension2d<u32>(screen_w, screen_h);
-       params.Bits = bits;
        params.AntiAlias = fsaa;
        params.Fullscreen = fullscreen;
        params.Stencilbuffer = false;
        params.Stereobuffer = stereo_buffer;
        params.Vsync = vsync;
        params.EventReceiver = receiver;
-       params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu");
-       params.ZBufferBits = 24;
+       params.HighPrecisionFPU = true;
 #ifdef __ANDROID__
        params.PrivateData = porting::app_global;
-       params.OGLES2ShaderPath = std::string(
-                       porting::path_user + DIR_DELIM + "media" + DIR_DELIM + "Shaders" +
-                       DIR_DELIM).c_str();
+#endif
+#if ENABLE_GLES
+       // there is no standardized path for these on desktop
+       std::string rel_path = std::string("client") + DIR_DELIM
+                       + "shaders" + DIR_DELIM + "Irrlicht";
+       params.OGLES2ShaderPath = (porting::path_share + DIR_DELIM + rel_path + DIR_DELIM).c_str();
 #endif
 
        m_device = createDeviceEx(params);
+       driver = m_device->getVideoDriver();
+
        s_singleton = this;
+
+       auto skin = createSkin(m_device->getGUIEnvironment(),
+                       gui::EGST_WINDOWS_METALLIC, driver);
+       m_device->getGUIEnvironment()->setSkin(skin);
+       skin->drop();
 }
 
 RenderingEngine::~RenderingEngine()
 {
-       m_device->drop();
+       core.reset();
+       m_device->closeDevice();
        s_singleton = nullptr;
 }
 
-v2u32 RenderingEngine::getWindowSize() const
+v2u32 RenderingEngine::_getWindowSize() const
 {
+       if (core)
+               return core->getVirtualSize();
        return m_device->getVideoDriver()->getScreenSize();
 }
 
@@ -117,121 +167,161 @@ void RenderingEngine::setResizable(bool resize)
        m_device->setResizable(resize);
 }
 
-video::IVideoDriver *RenderingEngine::getVideoDriver()
+void RenderingEngine::removeMesh(const scene::IMesh* mesh)
 {
-       return m_device->getVideoDriver();
+       m_device->getSceneManager()->getMeshCache()->removeMesh(mesh);
 }
 
-bool RenderingEngine::print_video_modes()
+void RenderingEngine::cleanupMeshCache()
 {
-       IrrlichtDevice *nulldevice;
+       auto mesh_cache = m_device->getSceneManager()->getMeshCache();
+       while (mesh_cache->getMeshCount() != 0) {
+               if (scene::IAnimatedMesh *mesh = mesh_cache->getMeshByIndex(0))
+                       mesh_cache->removeMesh(mesh);
+       }
+}
 
-       bool vsync = g_settings->getBool("vsync");
-       u16 fsaa = g_settings->getU16("fsaa");
-       MyEventReceiver *receiver = new MyEventReceiver();
+bool RenderingEngine::setupTopLevelWindow(const std::string &name)
+{
+       // FIXME: It would make more sense for there to be a switch of some
+       // sort here that would call the correct toplevel setup methods for
+       // the environment Minetest is running in.
 
-       SIrrlichtCreationParameters params = SIrrlichtCreationParameters();
-       params.DriverType = video::EDT_NULL;
-       params.WindowSize = core::dimension2d<u32>(640, 480);
-       params.Bits = 24;
-       params.AntiAlias = fsaa;
-       params.Fullscreen = false;
-       params.Stencilbuffer = false;
-       params.Vsync = vsync;
-       params.EventReceiver = receiver;
-       params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu");
+       /* Setting Xorg properties for the top level window */
+       setupTopLevelXorgWindow(name);
 
-       nulldevice = createDeviceEx(params);
+       /* Setting general properties for the top level window */
+       verbosestream << "Client: Configuring general top level"
+               << " window properties"
+               << std::endl;
+       bool result = setWindowIcon();
 
-       if (!nulldevice) {
-               delete receiver;
-               return false;
+       return result;
+}
+
+void RenderingEngine::setupTopLevelXorgWindow(const std::string &name)
+{
+#ifdef XORG_USED
+       const video::SExposedVideoData exposedData = driver->getExposedVideoData();
+
+       Display *x11_dpl = reinterpret_cast<Display *>(exposedData.OpenGLLinux.X11Display);
+       if (x11_dpl == NULL) {
+               warningstream << "Client: Could not find X11 Display in ExposedVideoData"
+                       << std::endl;
+               return;
        }
 
-       std::cout << _("Available video modes (WxHxD):") << std::endl;
+       verbosestream << "Client: Configuring X11-specific top level"
+               << " window properties"
+               << std::endl;
 
-       video::IVideoModeList *videomode_list = nulldevice->getVideoModeList();
 
-       if (videomode_list != NULL) {
-               s32 videomode_count = videomode_list->getVideoModeCount();
-               core::dimension2d<u32> videomode_res;
-               s32 videomode_depth;
-               for (s32 i = 0; i < videomode_count; ++i) {
-                       videomode_res = videomode_list->getVideoModeResolution(i);
-                       videomode_depth = videomode_list->getVideoModeDepth(i);
-                       std::cout << videomode_res.Width << "x" << videomode_res.Height
-                                 << "x" << videomode_depth << std::endl;
-               }
+       Window x11_win = reinterpret_cast<Window>(exposedData.OpenGLLinux.X11Window);
 
-               std::cout << _("Active video mode (WxHxD):") << std::endl;
-               videomode_res = videomode_list->getDesktopResolution();
-               videomode_depth = videomode_list->getDesktopDepth();
-               std::cout << videomode_res.Width << "x" << videomode_res.Height << "x"
-                         << videomode_depth << std::endl;
-       }
+       // Set application name and class hints. For now name and class are the same.
+       XClassHint *classhint = XAllocClassHint();
+       classhint->res_name = const_cast<char *>(name.c_str());
+       classhint->res_class = const_cast<char *>(name.c_str());
 
-       nulldevice->drop();
-       delete receiver;
+       XSetClassHint(x11_dpl, x11_win, classhint);
+       XFree(classhint);
+
+       // FIXME: In the future WMNormalHints should be set ... e.g see the
+       // gtk/gdk code (gdk/x11/gdksurface-x11.c) for the setup_top_level
+       // method. But for now (as it would require some significant changes)
+       // leave the code as is.
 
-       return videomode_list != NULL;
+       // The following is borrowed from the above gdk source for setting top
+       // level windows. The source indicates and the Xlib docs suggest that
+       // this will set the WM_CLIENT_MACHINE and WM_LOCAL_NAME. This will not
+       // set the WM_CLIENT_MACHINE to a Fully Qualified Domain Name (FQDN) which is
+       // required by the Extended Window Manager Hints (EWMH) spec when setting
+       // the _NET_WM_PID (see further down) but running Minetest in an env
+       // where the window manager is on another machine from Minetest (therefore
+       // making the PID useless) is not expected to be a problem. Further
+       // more, using gtk/gdk as the model it would seem that not using a FQDN is
+       // not an issue for modern Xorg window managers.
+
+       verbosestream << "Client: Setting Xorg window manager Properties"
+               << std::endl;
+
+       XSetWMProperties (x11_dpl, x11_win, NULL, NULL, NULL, 0, NULL, NULL, NULL);
+
+       // Set the _NET_WM_PID window property according to the EWMH spec. _NET_WM_PID
+       // (in conjunction with WM_CLIENT_MACHINE) can be used by window managers to
+       // force a shutdown of an application if it doesn't respond to the destroy
+       // window message.
+
+       verbosestream << "Client: Setting Xorg _NET_WM_PID extended window manager property"
+               << std::endl;
+
+       Atom NET_WM_PID = XInternAtom(x11_dpl, "_NET_WM_PID", false);
+
+       pid_t pid = getpid();
+
+       XChangeProperty(x11_dpl, x11_win, NET_WM_PID,
+                       XA_CARDINAL, 32, PropModeReplace,
+                       reinterpret_cast<unsigned char *>(&pid),1);
+
+       // Set the WM_CLIENT_LEADER window property here. Minetest has only one
+       // window and that window will always be the leader.
+
+       verbosestream << "Client: Setting Xorg WM_CLIENT_LEADER property"
+               << std::endl;
+
+       Atom WM_CLIENT_LEADER = XInternAtom(x11_dpl, "WM_CLIENT_LEADER", false);
+
+       XChangeProperty (x11_dpl, x11_win, WM_CLIENT_LEADER,
+               XA_WINDOW, 32, PropModeReplace,
+               reinterpret_cast<unsigned char *>(&x11_win), 1);
+#endif
 }
 
-void RenderingEngine::setXorgClassHint(
-               const video::SExposedVideoData &video_data, const std::string &name)
+#ifdef _WIN32
+static bool getWindowHandle(irr::video::IVideoDriver *driver, HWND &hWnd)
 {
-#ifdef XORG_USED
-       if (video_data.OpenGLLinux.X11Display == NULL)
-               return;
-
-       XClassHint *classhint = XAllocClassHint();
-       classhint->res_name = (char *)name.c_str();
-       classhint->res_class = (char *)name.c_str();
+       const video::SExposedVideoData exposedData = driver->getExposedVideoData();
 
-       XSetClassHint((Display *)video_data.OpenGLLinux.X11Display,
-                       video_data.OpenGLLinux.X11Window, classhint);
-       XFree(classhint);
+       switch (driver->getDriverType()) {
+#if ENABLE_GLES
+       case video::EDT_OGLES1:
+       case video::EDT_OGLES2:
 #endif
+       case video::EDT_OPENGL:
+               hWnd = reinterpret_cast<HWND>(exposedData.OpenGLWin32.HWnd);
+               break;
+       default:
+               return false;
+       }
+
+       return true;
 }
+#endif
 
 bool RenderingEngine::setWindowIcon()
 {
 #if defined(XORG_USED)
 #if RUN_IN_PLACE
        return setXorgWindowIconFromPath(
-                       porting::path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
+                       porting::path_share + "/misc/dragonfire-xorg-icon-128.png");
 #else
        // We have semi-support for reading in-place data if we are
        // compiled with RUN_IN_PLACE. Don't break with this and
        // also try the path_share location.
        return setXorgWindowIconFromPath(
-                              ICON_DIR "/hicolor/128x128/apps/" PROJECT_NAME ".png") ||
-              setXorgWindowIconFromPath(porting::path_share + "/misc/" PROJECT_NAME
-                                                              "-xorg-icon-128.png");
+                              ICON_DIR "/hicolor/128x128/apps/dragonfire.png") ||
+              setXorgWindowIconFromPath(porting::path_share + "/misc/dragonfire-xorg-icon-128.png");
 #endif
 #elif defined(_WIN32)
-       const video::SExposedVideoData exposedData =
-                       m_device->getVideoDriver()->getExposedVideoData();
        HWND hWnd; // Window handle
-
-       switch (m_device->getVideoDriver()->getDriverType()) {
-       case video::EDT_DIRECT3D8:
-               hWnd = reinterpret_cast<HWND>(exposedData.D3D8.HWnd);
-               break;
-       case video::EDT_DIRECT3D9:
-               hWnd = reinterpret_cast<HWND>(exposedData.D3D9.HWnd);
-               break;
-       case video::EDT_OPENGL:
-               hWnd = reinterpret_cast<HWND>(exposedData.OpenGLWin32.HWnd);
-               break;
-       default:
+       if (!getWindowHandle(driver, hWnd))
                return false;
-       }
 
        // Load the ICON from resource file
        const HICON hicon = LoadIcon(GetModuleHandle(NULL),
                        MAKEINTRESOURCE(130) // The ID of the ICON defined in
                                             // winresource.rc
-                       );
+       );
 
        if (hicon) {
                SendMessage(hWnd, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(hicon));
@@ -249,14 +339,12 @@ bool RenderingEngine::setXorgWindowIconFromPath(const std::string &icon_file)
 {
 #ifdef XORG_USED
 
-       video::IVideoDriver *v_driver = m_device->getVideoDriver();
-
        video::IImageLoader *image_loader = NULL;
-       u32 cnt = v_driver->getImageLoaderCount();
+       u32 cnt = driver->getImageLoaderCount();
        for (u32 i = 0; i < cnt; i++) {
-               if (v_driver->getImageLoader(i)->isALoadableFileExtension(
+               if (driver->getImageLoader(i)->isALoadableFileExtension(
                                    icon_file.c_str())) {
-                       image_loader = v_driver->getImageLoader(i);
+                       image_loader = driver->getImageLoader(i);
                        break;
                }
        }
@@ -309,7 +397,7 @@ bool RenderingEngine::setXorgWindowIconFromPath(const std::string &icon_file)
        img->drop();
        icon_f->drop();
 
-       const video::SExposedVideoData &video_data = v_driver->getExposedVideoData();
+       const video::SExposedVideoData &video_data = driver->getExposedVideoData();
 
        Display *x11_dpl = (Display *)video_data.OpenGLLinux.X11Display;
 
@@ -338,11 +426,11 @@ bool RenderingEngine::setXorgWindowIconFromPath(const std::string &icon_file)
        Text will be removed when the screen is drawn the next time.
        Additionally, a progressbar can be drawn when percent is set between 0 and 100.
 */
-void RenderingEngine::_draw_load_screen(const std::wstring &text,
+void RenderingEngine::draw_load_screen(const std::wstring &text,
                gui::IGUIEnvironment *guienv, ITextureSource *tsrc, float dtime,
                int percent, bool clouds)
 {
-       v2u32 screensize = RenderingEngine::get_instance()->getWindowSize();
+       v2u32 screensize = getWindowSize();
 
        v2s32 textsize(g_fontengine->getTextWidth(text), g_fontengine->getLineHeight());
        v2s32 center(screensize.X / 2, screensize.Y / 2);
@@ -407,614 +495,77 @@ void RenderingEngine::_draw_load_screen(const std::wstring &text,
        guitext->remove();
 }
 
-std::vector<core::vector3d<u32>> RenderingEngine::getSupportedVideoModes()
+/*
+       Draws the menu scene including (optional) cloud background.
+*/
+void RenderingEngine::draw_menu_scene(gui::IGUIEnvironment *guienv,
+               float dtime, bool clouds)
 {
-       IrrlichtDevice *nulldevice = createDevice(video::EDT_NULL);
-       sanity_check(nulldevice);
-
-       std::vector<core::vector3d<u32>> mlist;
-       video::IVideoModeList *modelist = nulldevice->getVideoModeList();
-
-       s32 num_modes = modelist->getVideoModeCount();
-       for (s32 i = 0; i != num_modes; i++) {
-               core::dimension2d<u32> mode_res = modelist->getVideoModeResolution(i);
-               u32 mode_depth = (u32)modelist->getVideoModeDepth(i);
-               mlist.push_back(core::vector3d<u32>(
-                               mode_res.Width, mode_res.Height, mode_depth));
-       }
+       bool cloud_menu_background = clouds && g_settings->getBool("menu_clouds");
+       if (cloud_menu_background) {
+               g_menuclouds->step(dtime * 3);
+               g_menuclouds->render();
+               get_video_driver()->beginScene(
+                               true, true, video::SColor(255, 140, 186, 250));
+               g_menucloudsmgr->drawAll();
+       } else
+               get_video_driver()->beginScene(true, true, video::SColor(255, 0, 0, 0));
 
-       nulldevice->drop();
-       return mlist;
+       guienv->drawAll();
+       get_video_driver()->endScene();
 }
 
 std::vector<irr::video::E_DRIVER_TYPE> RenderingEngine::getSupportedVideoDrivers()
 {
+       // Only check these drivers.
+       // We do not support software and D3D in any capacity.
+       static const irr::video::E_DRIVER_TYPE glDrivers[4] = {
+               irr::video::EDT_NULL,
+               irr::video::EDT_OPENGL,
+               irr::video::EDT_OGLES1,
+               irr::video::EDT_OGLES2,
+       };
        std::vector<irr::video::E_DRIVER_TYPE> drivers;
 
-       for (int i = 0; i != irr::video::EDT_COUNT; i++) {
-               if (irr::IrrlichtDevice::isDriverSupported((irr::video::E_DRIVER_TYPE)i))
-                       drivers.push_back((irr::video::E_DRIVER_TYPE)i);
+       for (int i = 0; i < 4; i++) {
+               if (irr::IrrlichtDevice::isDriverSupported(glDrivers[i]))
+                       drivers.push_back(glDrivers[i]);
        }
 
        return drivers;
 }
 
-void RenderingEngine::_draw_scene(Camera *camera, Client *client, LocalPlayer *player,
-               Hud *hud, Minimap *mapper, gui::IGUIEnvironment *guienv,
-               const v2u32 &screensize, const video::SColor &skycolor, bool show_hud,
-               bool show_minimap)
+void RenderingEngine::initialize(Client *client, Hud *hud)
 {
-       bool draw_wield_tool =
-                       (show_hud && (player->hud_flags & HUD_FLAG_WIELDITEM_VISIBLE) &&
-                                       camera->getCameraMode() < CAMERA_MODE_THIRD);
-
-       bool draw_crosshair = ((player->hud_flags & HUD_FLAG_CROSSHAIR_VISIBLE) &&
-                              (camera->getCameraMode() != CAMERA_MODE_THIRD_FRONT));
-
-#ifdef HAVE_TOUCHSCREENGUI
-       try {
-               draw_crosshair = !g_settings->getBool("touchtarget");
-       } catch (SettingNotFoundException) {
-       }
-#endif
-
        const std::string &draw_mode = g_settings->get("3d_mode");
-
-       if (draw_mode == "anaglyph") {
-               draw_anaglyph_3d_mode(
-                               camera, show_hud, hud, draw_wield_tool, client, guienv);
-               draw_crosshair = false;
-       } else if (draw_mode == "interlaced") {
-               draw_interlaced_3d_mode(camera, show_hud, hud, screensize,
-                               draw_wield_tool, client, guienv, skycolor);
-               draw_crosshair = false;
-       } else if (draw_mode == "sidebyside") {
-               draw_sidebyside_3d_mode(camera, show_hud, hud, screensize,
-                               draw_wield_tool, client, guienv, skycolor);
-               show_hud = false;
-       } else if (draw_mode == "topbottom") {
-               draw_top_bottom_3d_mode(camera, show_hud, hud, screensize,
-                               draw_wield_tool, client, guienv, skycolor);
-               show_hud = false;
-       } else if (draw_mode == "pageflip") {
-               draw_pageflip_3d_mode(camera, show_hud, hud, screensize, draw_wield_tool,
-                               client, guienv, skycolor);
-               draw_crosshair = false;
-               show_hud = false;
-       } else {
-               draw_plain(camera, show_hud, hud, screensize, draw_wield_tool, client,
-                               guienv, skycolor);
-       }
-
-       /*
-               Post effects
-       */
-       client->getEnv().getClientMap().renderPostFx(camera->getCameraMode());
-
-       // TODO how to make those 3d too
-       if (show_hud) {
-               if (draw_crosshair)
-                       hud->drawCrosshair();
-
-               hud->drawHotbar(client->getPlayerItem());
-               hud->drawLuaElements(camera->getOffset());
-               camera->drawNametags();
-
-               if (mapper && show_minimap)
-                       mapper->drawMinimap();
-       }
-
-       guienv->drawAll();
-}
-
-void RenderingEngine::draw_anaglyph_3d_mode(Camera *camera, bool show_hud, Hud *hud,
-               bool draw_wield_tool, Client *client, gui::IGUIEnvironment *guienv)
-{
-
-       /* preserve old setup*/
-       irr::core::vector3df oldPosition = camera->getCameraNode()->getPosition();
-       irr::core::vector3df oldTarget = camera->getCameraNode()->getTarget();
-
-       irr::core::matrix4 startMatrix =
-                       camera->getCameraNode()->getAbsoluteTransformation();
-       irr::core::vector3df focusPoint =
-                       (camera->getCameraNode()->getTarget() -
-                                       camera->getCameraNode()->getAbsolutePosition())
-                                       .setLength(1) +
-                       camera->getCameraNode()->getAbsolutePosition();
-
-       // Left eye...
-       irr::core::vector3df leftEye;
-       irr::core::matrix4 leftMove;
-       leftMove.setTranslation(irr::core::vector3df(
-                       -g_settings->getFloat("3d_paralax_strength"), 0.0f, 0.0f));
-       leftEye = (startMatrix * leftMove).getTranslation();
-
-       // clear the depth buffer, and color
-       getVideoDriver()->beginScene(true, true, irr::video::SColor(0, 200, 200, 255));
-       getVideoDriver()->getOverrideMaterial().Material.ColorMask = irr::video::ECP_RED;
-       getVideoDriver()->getOverrideMaterial().EnableFlags = irr::video::EMF_COLOR_MASK;
-       getVideoDriver()->getOverrideMaterial().EnablePasses =
-                       irr::scene::ESNRP_SKY_BOX + irr::scene::ESNRP_SOLID +
-                       irr::scene::ESNRP_TRANSPARENT +
-                       irr::scene::ESNRP_TRANSPARENT_EFFECT + irr::scene::ESNRP_SHADOW;
-       camera->getCameraNode()->setPosition(leftEye);
-       camera->getCameraNode()->setTarget(focusPoint);
-       get_scene_manager()->drawAll();
-       getVideoDriver()->setTransform(video::ETS_WORLD, core::IdentityMatrix);
-       if (show_hud) {
-               hud->drawSelectionMesh();
-               if (draw_wield_tool)
-                       camera->drawWieldedTool(&leftMove);
-       }
-
-       guienv->drawAll();
-
-       // Right eye...
-       irr::core::vector3df rightEye;
-       irr::core::matrix4 rightMove;
-       rightMove.setTranslation(irr::core::vector3df(
-                       g_settings->getFloat("3d_paralax_strength"), 0.0f, 0.0f));
-       rightEye = (startMatrix * rightMove).getTranslation();
-
-       // clear the depth buffer
-       getVideoDriver()->clearZBuffer();
-       getVideoDriver()->getOverrideMaterial().Material.ColorMask =
-                       irr::video::ECP_GREEN + irr::video::ECP_BLUE;
-       getVideoDriver()->getOverrideMaterial().EnableFlags = irr::video::EMF_COLOR_MASK;
-       getVideoDriver()->getOverrideMaterial().EnablePasses =
-                       irr::scene::ESNRP_SKY_BOX + irr::scene::ESNRP_SOLID +
-                       irr::scene::ESNRP_TRANSPARENT +
-                       irr::scene::ESNRP_TRANSPARENT_EFFECT + irr::scene::ESNRP_SHADOW;
-       camera->getCameraNode()->setPosition(rightEye);
-       camera->getCameraNode()->setTarget(focusPoint);
-       get_scene_manager()->drawAll();
-       getVideoDriver()->setTransform(video::ETS_WORLD, core::IdentityMatrix);
-       if (show_hud) {
-               hud->drawSelectionMesh();
-               if (draw_wield_tool)
-                       camera->drawWieldedTool(&rightMove);
-       }
-
-       guienv->drawAll();
-
-       getVideoDriver()->getOverrideMaterial().Material.ColorMask = irr::video::ECP_ALL;
-       getVideoDriver()->getOverrideMaterial().EnableFlags = 0;
-       getVideoDriver()->getOverrideMaterial().EnablePasses = 0;
-       camera->getCameraNode()->setPosition(oldPosition);
-       camera->getCameraNode()->setTarget(oldTarget);
-}
-
-void RenderingEngine::init_texture(
-               const v2u32 &screensize, video::ITexture **texture, const char *name)
-{
-       if (*texture) {
-               getVideoDriver()->removeTexture(*texture);
-       }
-       *texture = getVideoDriver()->addRenderTargetTexture(
-                       core::dimension2d<u32>(screensize.X, screensize.Y), name,
-                       irr::video::ECF_A8R8G8B8);
-}
-
-video::ITexture *RenderingEngine::draw_image(const v2u32 &screensize, parallax_sign psign,
-               const irr::core::matrix4 &startMatrix,
-               const irr::core::vector3df &focusPoint, bool show_hud, Camera *camera,
-               Hud *hud, bool draw_wield_tool, Client *client,
-               gui::IGUIEnvironment *guienv, const video::SColor &skycolor)
-{
-       static video::ITexture *images[2] = {NULL, NULL};
-       static v2u32 last_screensize = v2u32(0, 0);
-
-       video::ITexture *image = NULL;
-
-       if (screensize != last_screensize) {
-               init_texture(screensize, &images[1], "mt_drawimage_img1");
-               init_texture(screensize, &images[0], "mt_drawimage_img2");
-               last_screensize = screensize;
-       }
-
-       if (psign == RIGHT)
-               image = images[1];
-       else
-               image = images[0];
-
-       getVideoDriver()->setRenderTarget(image, true, true,
-                       irr::video::SColor(255, skycolor.getRed(), skycolor.getGreen(),
-                                       skycolor.getBlue()));
-
-       irr::core::vector3df eye_pos;
-       irr::core::matrix4 movement;
-       movement.setTranslation(irr::core::vector3df(
-                       (int)psign * g_settings->getFloat("3d_paralax_strength"), 0.0f,
-                       0.0f));
-       eye_pos = (startMatrix * movement).getTranslation();
-
-       // clear the depth buffer
-       getVideoDriver()->clearZBuffer();
-       camera->getCameraNode()->setPosition(eye_pos);
-       camera->getCameraNode()->setTarget(focusPoint);
-       get_scene_manager()->drawAll();
-
-       getVideoDriver()->setTransform(video::ETS_WORLD, core::IdentityMatrix);
-
-       if (show_hud) {
-               hud->drawSelectionMesh();
-               if (draw_wield_tool)
-                       camera->drawWieldedTool(&movement);
-       }
-
-       guienv->drawAll();
-
-       /* switch back to real renderer */
-       getVideoDriver()->setRenderTarget(0, true, true,
-                       irr::video::SColor(0, skycolor.getRed(), skycolor.getGreen(),
-                                       skycolor.getBlue()));
-
-       return image;
+       core.reset(createRenderingCore(draw_mode, m_device, client, hud));
+       core->initialize();
 }
 
-video::ITexture *RenderingEngine::draw_hud(const v2u32 &screensize, bool show_hud,
-               Hud *hud, Client *client, bool draw_crosshair,
-               const video::SColor &skycolor, gui::IGUIEnvironment *guienv,
-               Camera *camera)
+void RenderingEngine::finalize()
 {
-       static video::ITexture *image = nullptr;
-       init_texture(screensize, &image, "mt_drawimage_hud");
-       getVideoDriver()->setRenderTarget(
-                       image, true, true, irr::video::SColor(255, 0, 0, 0));
-
-       if (show_hud) {
-               if (draw_crosshair)
-                       hud->drawCrosshair();
-               hud->drawHotbar(client->getPlayerItem());
-               hud->drawLuaElements(camera->getOffset());
-               camera->drawNametags();
-               guienv->drawAll();
-       }
-
-       getVideoDriver()->setRenderTarget(0, true, true,
-                       irr::video::SColor(0, skycolor.getRed(), skycolor.getGreen(),
-                                       skycolor.getBlue()));
-
-       return image;
+       core.reset();
 }
 
-void RenderingEngine::draw_interlaced_3d_mode(Camera *camera, bool show_hud, Hud *hud,
-               const v2u32 &screensize, bool draw_wield_tool, Client *client,
-               gui::IGUIEnvironment *guienv, const video::SColor &skycolor)
+void RenderingEngine::draw_scene(video::SColor skycolor, bool show_hud,
+               bool show_minimap, bool draw_wield_tool, bool draw_crosshair)
 {
-       /* save current info */
-       irr::core::vector3df oldPosition = camera->getCameraNode()->getPosition();
-       irr::core::vector3df oldTarget = camera->getCameraNode()->getTarget();
-       irr::core::matrix4 startMatrix =
-                       camera->getCameraNode()->getAbsoluteTransformation();
-       irr::core::vector3df focusPoint =
-                       (camera->getCameraNode()->getTarget() -
-                                       camera->getCameraNode()->getAbsolutePosition())
-                                       .setLength(1) +
-                       camera->getCameraNode()->getAbsolutePosition();
-
-       /* create left view */
-       video::ITexture *left_image = draw_image(screensize, LEFT, startMatrix,
-                       focusPoint, show_hud, camera, hud, draw_wield_tool, client,
-                       guienv, skycolor);
-
-       // Right eye...
-       irr::core::vector3df rightEye;
-       irr::core::matrix4 rightMove;
-       rightMove.setTranslation(irr::core::vector3df(
-                       g_settings->getFloat("3d_paralax_strength"), 0.0f, 0.0f));
-       rightEye = (startMatrix * rightMove).getTranslation();
-
-       // clear the depth buffer
-       getVideoDriver()->clearZBuffer();
-       camera->getCameraNode()->setPosition(rightEye);
-       camera->getCameraNode()->setTarget(focusPoint);
-       get_scene_manager()->drawAll();
-
-       getVideoDriver()->setTransform(video::ETS_WORLD, core::IdentityMatrix);
-
-       if (show_hud) {
-               hud->drawSelectionMesh();
-               if (draw_wield_tool)
-                       camera->drawWieldedTool(&rightMove);
-       }
-       guienv->drawAll();
-
-       for (unsigned int i = 0; i < screensize.Y; i += 2) {
-#if (IRRLICHT_VERSION_MAJOR >= 1) && (IRRLICHT_VERSION_MINOR >= 8)
-               getVideoDriver()->draw2DImage(left_image,
-                               irr::core::position2d<s32>(0, i),
-#else
-               getVideoDriver()->draw2DImage(left_image,
-                               irr::core::position2d<s32>(0, screensize.Y - i),
-#endif
-                               irr::core::rect<s32>(0, i, screensize.X, i + 1), 0,
-                               irr::video::SColor(255, 255, 255, 255), false);
-       }
-
-       /* cleanup */
-       camera->getCameraNode()->setPosition(oldPosition);
-       camera->getCameraNode()->setTarget(oldTarget);
+       core->draw(skycolor, show_hud, show_minimap, draw_wield_tool, draw_crosshair);
 }
 
-void RenderingEngine::draw_sidebyside_3d_mode(Camera *camera, bool show_hud, Hud *hud,
-               const v2u32 &screensize, bool draw_wield_tool, Client *client,
-               gui::IGUIEnvironment *guienv, const video::SColor &skycolor)
+const VideoDriverInfo &RenderingEngine::getVideoDriverInfo(irr::video::E_DRIVER_TYPE type)
 {
-       /* save current info */
-       irr::core::vector3df oldPosition = camera->getCameraNode()->getPosition();
-       irr::core::vector3df oldTarget = camera->getCameraNode()->getTarget();
-       irr::core::matrix4 startMatrix =
-                       camera->getCameraNode()->getAbsoluteTransformation();
-       irr::core::vector3df focusPoint =
-                       (camera->getCameraNode()->getTarget() -
-                                       camera->getCameraNode()->getAbsolutePosition())
-                                       .setLength(1) +
-                       camera->getCameraNode()->getAbsolutePosition();
-
-       /* create left view */
-       video::ITexture *left_image = draw_image(screensize, LEFT, startMatrix,
-                       focusPoint, show_hud, camera, hud, draw_wield_tool, client,
-                       guienv, skycolor);
-
-       /* create right view */
-       video::ITexture *right_image = draw_image(screensize, RIGHT, startMatrix,
-                       focusPoint, show_hud, camera, hud, draw_wield_tool, client,
-                       guienv, skycolor);
-
-       /* create hud overlay */
-       video::ITexture *hudtexture = draw_hud(screensize, show_hud, hud, client, false,
-                       skycolor, guienv, camera);
-       getVideoDriver()->makeColorKeyTexture(
-                       hudtexture, irr::video::SColor(255, 0, 0, 0));
-       // makeColorKeyTexture mirrors texture so we do it twice to get it right again
-       getVideoDriver()->makeColorKeyTexture(
-                       hudtexture, irr::video::SColor(255, 0, 0, 0));
-
-       draw2DImageFilterScaled(getVideoDriver(), left_image,
-                       irr::core::rect<s32>(0, 0, screensize.X / 2, screensize.Y),
-                       irr::core::rect<s32>(0, 0, screensize.X, screensize.Y), 0, 0,
-                       false);
-
-       draw2DImageFilterScaled(getVideoDriver(), hudtexture,
-                       irr::core::rect<s32>(0, 0, screensize.X / 2, screensize.Y),
-                       irr::core::rect<s32>(0, 0, screensize.X, screensize.Y), 0, 0,
-                       true);
-
-       draw2DImageFilterScaled(getVideoDriver(), right_image,
-                       irr::core::rect<s32>(
-                                       screensize.X / 2, 0, screensize.X, screensize.Y),
-                       irr::core::rect<s32>(0, 0, screensize.X, screensize.Y), 0, 0,
-                       false);
-
-       draw2DImageFilterScaled(getVideoDriver(), hudtexture,
-                       irr::core::rect<s32>(
-                                       screensize.X / 2, 0, screensize.X, screensize.Y),
-                       irr::core::rect<s32>(0, 0, screensize.X, screensize.Y), 0, 0,
-                       true);
-
-       left_image = nullptr;
-       right_image = nullptr;
-
-       /* cleanup */
-       camera->getCameraNode()->setPosition(oldPosition);
-       camera->getCameraNode()->setTarget(oldTarget);
-}
-
-void RenderingEngine::draw_top_bottom_3d_mode(Camera *camera, bool show_hud, Hud *hud,
-               const v2u32 &screensize, bool draw_wield_tool, Client *client,
-               gui::IGUIEnvironment *guienv, const video::SColor &skycolor)
-{
-       /* save current info */
-       irr::core::vector3df oldPosition = camera->getCameraNode()->getPosition();
-       irr::core::vector3df oldTarget = camera->getCameraNode()->getTarget();
-       irr::core::matrix4 startMatrix =
-                       camera->getCameraNode()->getAbsoluteTransformation();
-       irr::core::vector3df focusPoint =
-                       (camera->getCameraNode()->getTarget() -
-                                       camera->getCameraNode()->getAbsolutePosition())
-                                       .setLength(1) +
-                       camera->getCameraNode()->getAbsolutePosition();
-
-       /* create left view */
-       video::ITexture *left_image = draw_image(screensize, LEFT, startMatrix,
-                       focusPoint, show_hud, camera, hud, draw_wield_tool, client,
-                       guienv, skycolor);
-
-       /* create right view */
-       video::ITexture *right_image = draw_image(screensize, RIGHT, startMatrix,
-                       focusPoint, show_hud, camera, hud, draw_wield_tool, client,
-                       guienv, skycolor);
-
-       /* create hud overlay */
-       video::ITexture *hudtexture = draw_hud(screensize, show_hud, hud, client, false,
-                       skycolor, guienv, camera);
-       getVideoDriver()->makeColorKeyTexture(
-                       hudtexture, irr::video::SColor(255, 0, 0, 0));
-       // makeColorKeyTexture mirrors texture so we do it twice to get it right again
-       getVideoDriver()->makeColorKeyTexture(
-                       hudtexture, irr::video::SColor(255, 0, 0, 0));
-
-       draw2DImageFilterScaled(getVideoDriver(), left_image,
-                       irr::core::rect<s32>(0, 0, screensize.X, screensize.Y / 2),
-                       irr::core::rect<s32>(0, 0, screensize.X, screensize.Y), 0, 0,
-                       false);
-
-       draw2DImageFilterScaled(getVideoDriver(), hudtexture,
-                       irr::core::rect<s32>(0, 0, screensize.X, screensize.Y / 2),
-                       irr::core::rect<s32>(0, 0, screensize.X, screensize.Y), 0, 0,
-                       true);
-
-       draw2DImageFilterScaled(getVideoDriver(), right_image,
-                       irr::core::rect<s32>(
-                                       0, screensize.Y / 2, screensize.X, screensize.Y),
-                       irr::core::rect<s32>(0, 0, screensize.X, screensize.Y), 0, 0,
-                       false);
-
-       draw2DImageFilterScaled(getVideoDriver(), hudtexture,
-                       irr::core::rect<s32>(
-                                       0, screensize.Y / 2, screensize.X, screensize.Y),
-                       irr::core::rect<s32>(0, 0, screensize.X, screensize.Y), 0, 0,
-                       true);
-
-       left_image = NULL;
-       right_image = NULL;
-
-       /* cleanup */
-       camera->getCameraNode()->setPosition(oldPosition);
-       camera->getCameraNode()->setTarget(oldTarget);
-}
-
-void RenderingEngine::draw_pageflip_3d_mode(Camera *camera, bool show_hud, Hud *hud,
-               const v2u32 &screensize, bool draw_wield_tool, Client *client,
-               gui::IGUIEnvironment *guienv, const video::SColor &skycolor)
-{
-#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8
-       errorstream << "Pageflip 3D mode is not supported"
-                   << " with your Irrlicht version!" << std::endl;
-#else
-       /* preserve old setup*/
-       irr::core::vector3df oldPosition = camera->getCameraNode()->getPosition();
-       irr::core::vector3df oldTarget = camera->getCameraNode()->getTarget();
-
-       irr::core::matrix4 startMatrix =
-                       camera->getCameraNode()->getAbsoluteTransformation();
-       irr::core::vector3df focusPoint =
-                       (camera->getCameraNode()->getTarget() -
-                                       camera->getCameraNode()->getAbsolutePosition())
-                                       .setLength(1) +
-                       camera->getCameraNode()->getAbsolutePosition();
-
-       // Left eye...
-       getVideoDriver()->setRenderTarget(irr::video::ERT_STEREO_LEFT_BUFFER);
-
-       irr::core::vector3df leftEye;
-       irr::core::matrix4 leftMove;
-       leftMove.setTranslation(irr::core::vector3df(
-                       -g_settings->getFloat("3d_paralax_strength"), 0.0f, 0.0f));
-       leftEye = (startMatrix * leftMove).getTranslation();
-
-       // clear the depth buffer, and color
-       getVideoDriver()->beginScene(true, true, irr::video::SColor(200, 200, 200, 255));
-       camera->getCameraNode()->setPosition(leftEye);
-       camera->getCameraNode()->setTarget(focusPoint);
-       get_scene_manager()->drawAll();
-       getVideoDriver()->setTransform(video::ETS_WORLD, core::IdentityMatrix);
-
-       if (show_hud) {
-               hud->drawSelectionMesh();
-               if (draw_wield_tool)
-                       camera->drawWieldedTool(&leftMove);
-               hud->drawHotbar(client->getPlayerItem());
-               hud->drawLuaElements(camera->getOffset());
-               camera->drawNametags();
-       }
-
-       guienv->drawAll();
-
-       // Right eye...
-       getVideoDriver()->setRenderTarget(irr::video::ERT_STEREO_RIGHT_BUFFER);
-
-       irr::core::vector3df rightEye;
-       irr::core::matrix4 rightMove;
-       rightMove.setTranslation(irr::core::vector3df(
-                       g_settings->getFloat("3d_paralax_strength"), 0.0f, 0.0f));
-       rightEye = (startMatrix * rightMove).getTranslation();
-
-       // clear the depth buffer, and color
-       getVideoDriver()->beginScene(true, true, irr::video::SColor(200, 200, 200, 255));
-       camera->getCameraNode()->setPosition(rightEye);
-       camera->getCameraNode()->setTarget(focusPoint);
-       get_scene_manager()->drawAll();
-       getVideoDriver()->setTransform(video::ETS_WORLD, core::IdentityMatrix);
-
-       if (show_hud) {
-               hud->drawSelectionMesh();
-               if (draw_wield_tool)
-                       camera->drawWieldedTool(&rightMove);
-               hud->drawHotbar(client->getPlayerItem());
-               hud->drawLuaElements(camera->getOffset());
-               camera->drawNametags();
-       }
-
-       guienv->drawAll();
-
-       camera->getCameraNode()->setPosition(oldPosition);
-       camera->getCameraNode()->setTarget(oldTarget);
-#endif
-}
-
-// returns (size / coef), rounded upwards
-inline int scaledown(int coef, int size)
-{
-       return (size + coef - 1) / coef;
-}
-
-void RenderingEngine::draw_plain(Camera *camera, bool show_hud, Hud *hud,
-               const v2u32 &screensize, bool draw_wield_tool, Client *client,
-               gui::IGUIEnvironment *guienv, const video::SColor &skycolor)
-{
-       // Undersampling-specific stuff
-       static video::ITexture *image = NULL;
-       static v2u32 last_pixelated_size = v2u32(0, 0);
-       static thread_local int undersampling = g_settings->getU16("undersampling");
-       v2u32 pixelated_size;
-       v2u32 dest_size;
-       if (undersampling > 0) {
-               pixelated_size = v2u32(scaledown(undersampling, screensize.X),
-                               scaledown(undersampling, screensize.Y));
-               dest_size = v2u32(undersampling * pixelated_size.X,
-                               undersampling * pixelated_size.Y);
-               if (pixelated_size != last_pixelated_size) {
-                       init_texture(pixelated_size, &image, "mt_drawimage_img1");
-                       last_pixelated_size = pixelated_size;
-               }
-               getVideoDriver()->setRenderTarget(image, true, true, skycolor);
-       }
-
-       // Render
-       get_scene_manager()->drawAll();
-       getVideoDriver()->setTransform(video::ETS_WORLD, core::IdentityMatrix);
-       if (show_hud) {
-               hud->drawSelectionMesh();
-               if (draw_wield_tool) {
-                       camera->drawWieldedTool();
-               }
-       }
-
-       // Upscale lowres render
-       if (undersampling > 0) {
-               getVideoDriver()->setRenderTarget(0, true, true);
-               getVideoDriver()->draw2DImage(image,
-                               irr::core::rect<s32>(0, 0, dest_size.X, dest_size.Y),
-                               irr::core::rect<s32>(0, 0, pixelated_size.X,
-                                               pixelated_size.Y));
-       }
-}
-
-const char *RenderingEngine::getVideoDriverName(irr::video::E_DRIVER_TYPE type)
-{
-       static const char *driver_ids[] = {
-                       "null", "software", "burningsvideo", "direct3d8", "direct3d9",
-                       "opengl", "ogles1", "ogles2",
+       static const std::unordered_map<int, VideoDriverInfo> driver_info_map = {
+               {(int)video::EDT_NULL,   {"null",   "NULL Driver"}},
+               {(int)video::EDT_OPENGL, {"opengl", "OpenGL"}},
+               {(int)video::EDT_OGLES1, {"ogles1", "OpenGL ES1"}},
+               {(int)video::EDT_OGLES2, {"ogles2", "OpenGL ES2"}},
        };
-
-       return driver_ids[type];
-}
-
-const char *RenderingEngine::getVideoDriverFriendlyName(irr::video::E_DRIVER_TYPE type)
-{
-       static const char *driver_names[] = {
-                       "NULL Driver", "Software Renderer", "Burning's Video",
-                       "Direct3D 8", "Direct3D 9", "OpenGL", "OpenGL ES1", "OpenGL ES2",
-       };
-
-       return driver_names[type];
+       return driver_info_map.at((int)type);
 }
 
 #ifndef __ANDROID__
-#ifdef XORG_USED
+#if defined(XORG_USED)
 
 static float calcDisplayDensity()
 {
@@ -1025,20 +576,17 @@ static float calcDisplayDensity()
 
                if (x11display != NULL) {
                        /* try x direct */
-                       float dpi_height = floor(
-                                       DisplayHeight(x11display, 0) /
-                                                       (DisplayHeightMM(x11display, 0) *
-                                                                       0.039370) +
-                                       0.5);
-                       float dpi_width = floor(
-                                       DisplayWidth(x11display, 0) /
-                                                       (DisplayWidthMM(x11display, 0) *
-                                                                       0.039370) +
-                                       0.5);
-
+                       int dh = DisplayHeight(x11display, 0);
+                       int dw = DisplayWidth(x11display, 0);
+                       int dh_mm = DisplayHeightMM(x11display, 0);
+                       int dw_mm = DisplayWidthMM(x11display, 0);
                        XCloseDisplay(x11display);
 
-                       return std::max(dpi_height, dpi_width) / 96.0;
+                       if (dh_mm != 0 && dw_mm != 0) {
+                               float dpi_height = floor(dh / (dh_mm * 0.039370) + 0.5);
+                               float dpi_width = floor(dw / (dw_mm * 0.039370) + 0.5);
+                               return std::max(dpi_height, dpi_width) / 96.0;
+                       }
                }
        }
 
@@ -1049,15 +597,45 @@ static float calcDisplayDensity()
 float RenderingEngine::getDisplayDensity()
 {
        static float cached_display_density = calcDisplayDensity();
-       return cached_display_density;
+       return cached_display_density * g_settings->getFloat("display_density_factor");
+}
+
+#elif defined(_WIN32)
+
+
+static float calcDisplayDensity(irr::video::IVideoDriver *driver)
+{
+       HWND hWnd;
+       if (getWindowHandle(driver, hWnd)) {
+               HDC hdc = GetDC(hWnd);
+               float dpi = GetDeviceCaps(hdc, LOGPIXELSX);
+               ReleaseDC(hWnd, hdc);
+               return dpi / 96.0f;
+       }
+
+       /* return manually specified dpi */
+       return g_settings->getFloat("screen_dpi") / 96.0f;
 }
 
-#else  // XORG_USED
 float RenderingEngine::getDisplayDensity()
 {
-       return g_settings->getFloat("screen_dpi") / 96.0;
+       static bool cached = false;
+       static float display_density;
+       if (!cached) {
+               display_density = calcDisplayDensity(get_video_driver());
+               cached = true;
+       }
+       return display_density * g_settings->getFloat("display_density_factor");
+}
+
+#else
+
+float RenderingEngine::getDisplayDensity()
+{
+       return (g_settings->getFloat("screen_dpi") / 96.0) * g_settings->getFloat("display_density_factor");
 }
-#endif // XORG_USED
+
+#endif
 
 v2u32 RenderingEngine::getDisplaySize()
 {
@@ -1069,4 +647,15 @@ v2u32 RenderingEngine::getDisplaySize()
 
        return deskres;
 }
+
+#else // __ANDROID__
+float RenderingEngine::getDisplayDensity()
+{
+       return porting::getDisplayDensity();
+}
+
+v2u32 RenderingEngine::getDisplaySize()
+{
+       return porting::getDisplaySize();
+}
 #endif // __ANDROID__