]> git.lizzy.rs Git - dragonfireclient.git/commitdiff
Disable HW stereo for IrrLicht 1.9 (not supported anymore)
authornumber Zero <numzer0@yandex.ru>
Mon, 5 Nov 2018 12:22:13 +0000 (15:22 +0300)
committersfan5 <sfan5@live.de>
Sun, 11 Nov 2018 17:08:15 +0000 (18:08 +0100)
src/client/render/factory.cpp
src/client/render/pageflip.cpp
src/client/render/pageflip.h

index 3aabc5db917ec0aa36803de249f88c3945f4c8ff..30f9480fcf44d343437aff8f9eaab13b72385230 100644 (file)
@@ -35,8 +35,10 @@ RenderingCore *createRenderingCore(const std::string &stereo_mode, IrrlichtDevic
                return new RenderingCoreAnaglyph(device, client, hud);
        if (stereo_mode == "interlaced")
                return new RenderingCoreInterlaced(device, client, hud);
+#ifdef STEREO_PAGEFLIP_SUPPORTED
        if (stereo_mode == "pageflip")
                return new RenderingCorePageflip(device, client, hud);
+#endif
        if (stereo_mode == "sidebyside")
                return new RenderingCoreSideBySide(device, client, hud);
        if (stereo_mode == "topbottom")
index 5d81a257c32d9c9337738723397346e597580f0d..f3a2190558c3d1252756a5213065695d3f31f8ef 100644 (file)
@@ -20,6 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "pageflip.h"
 
+#ifdef STEREO_PAGEFLIP_SUPPORTED
+
 void RenderingCorePageflip::initTextures()
 {
        hud = driver->addRenderTargetTexture(
@@ -53,3 +55,5 @@ void RenderingCorePageflip::resetEye()
        driver->setRenderTarget(video::ERT_FRAME_BUFFER, false, false, skycolor);
        RenderingCoreStereo::resetEye();
 }
+
+#endif // STEREO_PAGEFLIP_SUPPORTED
index cc94370508894b599284a5fa7fd16007a1ac17ea..17711b0f45cf5e27c737cacaebeb5877153d6d35 100644 (file)
@@ -21,6 +21,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #pragma once
 #include "stereo.h"
 
+// The support is absent in 1.9.0 (dropped in r5068)
+#if (IRRLICHT_VERSION_MAJOR == 1) && (IRRLICHT_VERSION_MINOR <= 8)
+#define STEREO_PAGEFLIP_SUPPORTED
+
 class RenderingCorePageflip : public RenderingCoreStereo
 {
 protected:
@@ -35,3 +39,5 @@ class RenderingCorePageflip : public RenderingCoreStereo
        using RenderingCoreStereo::RenderingCoreStereo;
        void drawAll() override;
 };
+
+#endif