From 80e61e0ca0aacb3fc7cd100a7ccf4b34d9150d18 Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Wed, 23 Jul 2014 10:01:29 +0200
Subject: [PATCH 001/248] Adding save Button for random GP

---
 src/states_screens/grand_prix_lose.cpp | 23 ++++++++++++++++++++++-
 src/states_screens/grand_prix_win.cpp  | 21 +++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/states_screens/grand_prix_lose.cpp b/src/states_screens/grand_prix_lose.cpp
index f9bc459fd..5e604de8b 100644
--- a/src/states_screens/grand_prix_lose.cpp
+++ b/src/states_screens/grand_prix_lose.cpp
@@ -26,6 +26,7 @@
 #include "graphics/irr_driver.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"
+#include "guiengine/widgets/button_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
 #include "io/file_manager.hpp"
 #include "items/item_manager.hpp"
@@ -142,6 +143,23 @@ void GrandPrixLose::init()
 
     World::getWorld()->setPhase(WorldStatus::RACE_PHASE);
 
+    if (race_manager->getGrandPrix().getId() == "random")
+    {
+        core::stringw text = _("Save Grand Prix");
+
+        typedef GUIEngine::ButtonWidget Button;
+        Button* save_button = new Button();
+        save_button->m_properties[GUIEngine::PROP_ID] = "save gp";
+        Button* c = getWidget<Button>("continue");
+        save_button->m_x = c->m_x + c->m_w + 20;
+        save_button->m_y = c->m_y;
+        save_button->m_w = GUIEngine::getFont()->getDimension(text.c_str()).Width + 30;
+        save_button->m_h = c->m_h;
+        save_button->setText(text);
+        save_button->add();
+        manualAddWidget(save_button);
+    }
+
     m_phase = 1;
     m_global_time = 0.0f;
 }   // init
@@ -177,7 +195,7 @@ void GrandPrixLose::onUpdate(float dt)
             }
         }
     }
-    
+
     // ---- title
     const int w = irr_driver->getFrameSize().Width;
     const int h = irr_driver->getFrameSize().Height;
@@ -202,6 +220,9 @@ void GrandPrixLose::eventCallback(GUIEngine::Widget* widget,
     {
         ((CutsceneWorld*)World::getWorld())->abortCutscene();
     }
+    else if (name == "save_gp")
+    {
+    }
 }   // eventCallback
 
 // -------------------------------------------------------------------------------------
diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp
index 97a0b835f..8d702ffb7 100644
--- a/src/states_screens/grand_prix_win.cpp
+++ b/src/states_screens/grand_prix_win.cpp
@@ -28,6 +28,7 @@
 #include "graphics/irr_driver.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"
+#include "guiengine/widgets/button_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
 #include "io/file_manager.hpp"
 #include "items/item_manager.hpp"
@@ -185,6 +186,23 @@ void GrandPrixWin::init()
     else
     {
         m_unlocked_label = NULL;
+
+        if (race_manager->getGrandPrix().getId() == "random")
+        {
+            core::stringw text = _("Save Grand Prix");
+
+            typedef GUIEngine::ButtonWidget Button;
+            Button* save_button = new Button();
+            save_button->m_properties[GUIEngine::PROP_ID] = "save gp";
+            Button* c = getWidget<Button>("continue");
+            save_button->m_x = c->m_x + c->m_w + 20;
+            save_button->m_y = c->m_y;
+            save_button->m_w = GUIEngine::getFont()->getDimension(text.c_str()).Width + 30;
+            save_button->m_h = c->m_h;
+            save_button->setText(text);
+            save_button->add();
+            manualAddWidget(save_button);
+        }
     }
 
     m_global_time = 0.0f;
@@ -335,6 +353,9 @@ void GrandPrixWin::eventCallback(GUIEngine::Widget* widget,
     {
         ((CutsceneWorld*)World::getWorld())->abortCutscene();
     }
+    else if (name == "save_gp")
+    {
+    }
 }   // eventCallback
 
 // -------------------------------------------------------------------------------------

From 02d21053fc676c99a80ebb65ab36fc88022925e1 Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Wed, 23 Jul 2014 15:28:57 +0200
Subject: [PATCH 002/248] begining with grand_prix_cutscene.cpp (first
 compiling prototype)

---
 src/guiengine/engine.hpp                   |  2 +-
 src/race/race_manager.cpp                  |  1 +
 src/states_screens/grand_prix_cutscene.cpp | 39 ++++++++++++++++++++++
 src/states_screens/grand_prix_cutscene.hpp | 36 ++++++++++++++++++++
 src/states_screens/grand_prix_lose.cpp     |  7 +---
 src/states_screens/grand_prix_lose.hpp     | 10 +++---
 src/states_screens/grand_prix_win.cpp      |  1 +
 src/states_screens/grand_prix_win.hpp      |  7 ++--
 8 files changed, 90 insertions(+), 13 deletions(-)
 create mode 100644 src/states_screens/grand_prix_cutscene.cpp
 create mode 100644 src/states_screens/grand_prix_cutscene.hpp

diff --git a/src/guiengine/engine.hpp b/src/guiengine/engine.hpp
index 5dcfce20d..9669503c7 100644
--- a/src/guiengine/engine.hpp
+++ b/src/guiengine/engine.hpp
@@ -170,7 +170,7 @@ namespace GUIEngine
     inline Skin*                      getSkin()          { return Private::g_skin;           }
 
     Screen*                           getScreenNamed(const char* name);
-    
+
     /** \return the height of the title font in pixels */
     int   getTitleFontHeight();
 
diff --git a/src/race/race_manager.cpp b/src/race/race_manager.cpp
index 2626530b4..e540b71d7 100644
--- a/src/race/race_manager.cpp
+++ b/src/race/race_manager.cpp
@@ -46,6 +46,7 @@
 #include "network/protocol_manager.hpp"
 #include "network/network_world.hpp"
 #include "network/protocols/start_game_protocol.hpp"
+#include "states_screens/grand_prix_cutscene.hpp"
 #include "states_screens/grand_prix_lose.hpp"
 #include "states_screens/grand_prix_win.hpp"
 #include "states_screens/kart_selection.hpp"
diff --git a/src/states_screens/grand_prix_cutscene.cpp b/src/states_screens/grand_prix_cutscene.cpp
new file mode 100644
index 000000000..31312b94c
--- /dev/null
+++ b/src/states_screens/grand_prix_cutscene.cpp
@@ -0,0 +1,39 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014 konstin
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "guiengine/scalable_font.hpp"
+#include "states_screens/grand_prix_cutscene.hpp"
+
+typedef GUIEngine::ButtonWidget Button;
+
+void GrandPrixCutscene::saveGPButton()
+{
+    if (race_manager->getGrandPrix().getId() == "random")
+    {
+        core::stringw text = _("Save Grand Prix");
+        Button* save_button = new Button();
+        save_button->m_properties[GUIEngine::PROP_ID] = "save gp";
+        Button* c = getWidget<Button>("continue");
+        save_button->m_x = c->m_x + c->m_w + 20;
+        save_button->m_y = c->m_y;
+        save_button->m_w = GUIEngine::getFont()->getDimension(text.c_str()).Width + 30;
+        save_button->m_h = c->m_h;
+        save_button->setText(text);
+        save_button->add();
+        manualAddWidget(save_button);
+    }
+}
diff --git a/src/states_screens/grand_prix_cutscene.hpp b/src/states_screens/grand_prix_cutscene.hpp
new file mode 100644
index 000000000..b5b7f1c00
--- /dev/null
+++ b/src/states_screens/grand_prix_cutscene.hpp
@@ -0,0 +1,36 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014 konstin
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_GRAND_PRIX_CUTSCENE_HPP
+#define HEADER_GRAND_PRIX_CUTSCENE_HPP
+
+#include "guiengine/screen.hpp"
+#include "guiengine/widgets/button_widget.hpp"
+#include "race/race_manager.hpp"
+
+#include <string>
+
+class GrandPrixCutscene: public GUIEngine::CutsceneScreen
+{
+    friend class GUIEngine::ScreenSingleton<GrandPrixCutscene>;
+public:
+    GrandPrixCutscene(const char * filename) : CutsceneScreen(filename) {}
+protected:
+    void saveGPButton();
+};
+
+#endif
diff --git a/src/states_screens/grand_prix_lose.cpp b/src/states_screens/grand_prix_lose.cpp
index 5e604de8b..da2b66304 100644
--- a/src/states_screens/grand_prix_lose.cpp
+++ b/src/states_screens/grand_prix_lose.cpp
@@ -35,6 +35,7 @@
 #include "modes/cutscene_world.hpp"
 #include "modes/overworld.hpp"
 #include "modes/world.hpp"
+#include "race/race_manager.hpp"
 #include "states_screens/feature_unlocked.hpp"
 #include "states_screens/main_menu_screen.hpp"
 #include "states_screens/state_manager.hpp"
@@ -83,12 +84,6 @@ DEFINE_SCREEN_SINGLETON( GrandPrixLose );
 
 // -------------------------------------------------------------------------------------
 
-GrandPrixLose::GrandPrixLose() : CutsceneScreen("grand_prix_lose.stkgui")
-{
-}   // GrandPrixLose
-
-// -------------------------------------------------------------------------------------
-
 void GrandPrixLose::onCutsceneEnd()
 {
     TrackObjectManager* tobjman = World::getWorld()->getTrack()->getTrackObjectManager();
diff --git a/src/states_screens/grand_prix_lose.hpp b/src/states_screens/grand_prix_lose.hpp
index bf30dfc70..585d55c02 100644
--- a/src/states_screens/grand_prix_lose.hpp
+++ b/src/states_screens/grand_prix_lose.hpp
@@ -21,6 +21,7 @@
 
 #include "guiengine/screen.hpp"
 #include "karts/kart_model.hpp"
+#include "states_screens/grand_prix_cutscene.hpp"
 
 #include <vector>
 #include <string>
@@ -33,11 +34,13 @@ class TrackObject;
   * \brief Screen shown at the end of a Grand Prix
   * \ingroup states_screens
   */
-class GrandPrixLose : public GUIEngine::CutsceneScreen, public GUIEngine::ScreenSingleton<GrandPrixLose>
+class GrandPrixLose :
+    public GrandPrixCutscene,
+    public GUIEngine::ScreenSingleton<GrandPrixLose>
 {
     friend class GUIEngine::ScreenSingleton<GrandPrixLose>;
 
-    GrandPrixLose();
+    GrandPrixLose(): GrandPrixCutscene("grand_prix_lose.stkgui") {};
 
     /** Global evolution of time */
     float m_global_time;
@@ -52,11 +55,10 @@ class GrandPrixLose : public GUIEngine::CutsceneScreen, public GUIEngine::Screen
     float m_kart_x, m_kart_y, m_kart_z;
 
 public:
-
     virtual void onCutsceneEnd() OVERRIDE;
 
     virtual bool onEscapePressed() OVERRIDE;
-    
+
     /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void loadedFromFile() OVERRIDE;
 
diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp
index 8d702ffb7..81b312c74 100644
--- a/src/states_screens/grand_prix_win.cpp
+++ b/src/states_screens/grand_prix_win.cpp
@@ -36,6 +36,7 @@
 #include "karts/kart_properties_manager.hpp"
 #include "modes/cutscene_world.hpp"
 #include "modes/world.hpp"
+#include "race/race_manager.hpp"
 #include "states_screens/feature_unlocked.hpp"
 #include "states_screens/state_manager.hpp"
 #include "tracks/track.hpp"
diff --git a/src/states_screens/grand_prix_win.hpp b/src/states_screens/grand_prix_win.hpp
index a702f134d..51b9d600d 100644
--- a/src/states_screens/grand_prix_win.hpp
+++ b/src/states_screens/grand_prix_win.hpp
@@ -22,6 +22,7 @@
 #include "audio/sfx_base.hpp"
 #include "guiengine/screen.hpp"
 #include "karts/kart_model.hpp"
+#include "states_screens/grand_prix_cutscene.hpp"
 
 namespace irr { namespace scene { class ISceneNode; class ICameraSceneNode; class ILightSceneNode; class IMeshSceneNode; } }
 namespace GUIEngine { class LabelWidget; }
@@ -32,7 +33,9 @@ class TrackObject;
   * \brief Screen shown at the end of a Grand Prix
   * \ingroup states_screens
   */
-class GrandPrixWin : public GUIEngine::CutsceneScreen, public GUIEngine::ScreenSingleton<GrandPrixWin>
+class GrandPrixWin :
+    public GUIEngine::CutsceneScreen,
+    public GUIEngine::ScreenSingleton<GrandPrixWin>
 {
     friend class GUIEngine::ScreenSingleton<GrandPrixWin>;
 
@@ -56,7 +59,7 @@ class GrandPrixWin : public GUIEngine::CutsceneScreen, public GUIEngine::ScreenS
     GUIEngine::LabelWidget* m_unlocked_label;
 
     int m_phase;
-    
+
     float m_kart_x[3], m_kart_y[3], m_kart_z[3];
     //float m_podium_x[3], m_podium_z[3];
     float m_kart_rotation[3];

From 1d8b4c352def39e12a7683178b50cd95cf62537e Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Wed, 23 Jul 2014 15:33:09 +0200
Subject: [PATCH 003/248] deriving GPWIn

---
 src/states_screens/grand_prix_win.cpp | 8 +-------
 src/states_screens/grand_prix_win.hpp | 8 ++------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp
index 81b312c74..cea594f52 100644
--- a/src/states_screens/grand_prix_win.cpp
+++ b/src/states_screens/grand_prix_win.cpp
@@ -68,7 +68,7 @@ DEFINE_SCREEN_SINGLETON( GrandPrixWin );
 
 // -------------------------------------------------------------------------------------
 
-GrandPrixWin::GrandPrixWin() : CutsceneScreen("grand_prix_win.stkgui")
+GrandPrixWin::GrandPrixWin() : GrandPrixCutscene("grand_prix_win.stkgui")
 {
     m_kart_node[0] = NULL;
     m_kart_node[1] = NULL;
@@ -120,12 +120,6 @@ void GrandPrixWin::onCutsceneEnd()
 
 // -------------------------------------------------------------------------------------
 
-void GrandPrixWin::loadedFromFile()
-{
-}   // loadedFromFile
-
-// -------------------------------------------------------------------------------------
-
 void GrandPrixWin::init()
 {
     std::vector<std::string> parts;
diff --git a/src/states_screens/grand_prix_win.hpp b/src/states_screens/grand_prix_win.hpp
index 51b9d600d..e2e15a260 100644
--- a/src/states_screens/grand_prix_win.hpp
+++ b/src/states_screens/grand_prix_win.hpp
@@ -34,7 +34,7 @@ class TrackObject;
   * \ingroup states_screens
   */
 class GrandPrixWin :
-    public GUIEngine::CutsceneScreen,
+    public GrandPrixCutscene,
     public GUIEngine::ScreenSingleton<GrandPrixWin>
 {
     friend class GUIEngine::ScreenSingleton<GrandPrixWin>;
@@ -50,9 +50,6 @@ class GrandPrixWin :
 
     TrackObject* m_kart_node[3];
 
-    //irr::scene::IMeshSceneNode* m_podium_step[3];
-    //irr::scene::ISceneNode* m_kart_node[3];
-
     /** A copy of the kart model for each kart used. */
     std::vector<KartModel*> m_all_kart_models;
 
@@ -61,7 +58,6 @@ class GrandPrixWin :
     int m_phase;
 
     float m_kart_x[3], m_kart_y[3], m_kart_z[3];
-    //float m_podium_x[3], m_podium_z[3];
     float m_kart_rotation[3];
 
 public:
@@ -71,7 +67,7 @@ public:
     virtual bool onEscapePressed() OVERRIDE;
 
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile() OVERRIDE;
+    virtual void loadedFromFile() OVERRIDE {};
 
     /** \brief implement optional callback from parent class GUIEngine::Screen */
     void onUpdate(float dt) OVERRIDE;

From e4f7b6041c8c43a1993eeb43896493f4f9cb469a Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Wed, 23 Jul 2014 16:43:25 +0200
Subject: [PATCH 004/248] use parent to remove copy+paste code

---
 src/states_screens/grand_prix_cutscene.cpp | 39 +++++++++++++++++-
 src/states_screens/grand_prix_cutscene.hpp |  7 ++++
 src/states_screens/grand_prix_lose.cpp     | 47 +---------------------
 src/states_screens/grand_prix_lose.hpp     |  9 -----
 src/states_screens/grand_prix_win.cpp      | 46 +--------------------
 src/states_screens/grand_prix_win.hpp      |  9 -----
 6 files changed, 47 insertions(+), 110 deletions(-)

diff --git a/src/states_screens/grand_prix_cutscene.cpp b/src/states_screens/grand_prix_cutscene.cpp
index 31312b94c..484d9403c 100644
--- a/src/states_screens/grand_prix_cutscene.cpp
+++ b/src/states_screens/grand_prix_cutscene.cpp
@@ -16,12 +16,16 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "guiengine/scalable_font.hpp"
+#include "guiengine/widgets/button_widget.hpp"
+#include "modes/cutscene_world.hpp"
 #include "states_screens/grand_prix_cutscene.hpp"
 
 typedef GUIEngine::ButtonWidget Button;
 
+/** A Button to save the GP if it was a random one */
 void GrandPrixCutscene::saveGPButton()
 {
+    #ifdef IMPLEMENTATION_FINISHED
     if (race_manager->getGrandPrix().getId() == "random")
     {
         core::stringw text = _("Save Grand Prix");
@@ -36,4 +40,37 @@ void GrandPrixCutscene::saveGPButton()
         save_button->add();
         manualAddWidget(save_button);
     }
-}
+    #endif
+}   // saveGPButton
+
+// ----------------------------------------------------------------------------
+
+
+void GrandPrixCutscene::eventCallback(GUIEngine::Widget* widget,
+                                      const std::string& name,
+                                      const int playerID)
+{
+    if (name == "continue")
+    {
+        ((CutsceneWorld*)World::getWorld())->abortCutscene();
+    }
+    else if (name == "save_gp")
+    {
+    }
+}   // eventCallback
+
+// ----------------------------------------------------------------------------
+
+bool GrandPrixCutscene::onEscapePressed()
+{
+    ((CutsceneWorld*)World::getWorld())->abortCutscene();
+    return false;
+}   // onEscapePressed
+
+// ----------------------------------------------------------------------------
+
+void GrandPrixCutscene::tearDown()
+{
+    Screen::tearDown();
+}   // tearDown
+
diff --git a/src/states_screens/grand_prix_cutscene.hpp b/src/states_screens/grand_prix_cutscene.hpp
index b5b7f1c00..8abeb9289 100644
--- a/src/states_screens/grand_prix_cutscene.hpp
+++ b/src/states_screens/grand_prix_cutscene.hpp
@@ -31,6 +31,13 @@ public:
     GrandPrixCutscene(const char * filename) : CutsceneScreen(filename) {}
 protected:
     void saveGPButton();
+
+    // implement callbacks from parent class GUIEngine::Screen
+    void eventCallback(GUIEngine::Widget* widget,
+                       const std::string& name,
+                       const int playerID) OVERRIDE;
+    bool onEscapePressed() OVERRIDE;
+    void tearDown() OVERRIDE;
 };
 
 #endif
diff --git a/src/states_screens/grand_prix_lose.cpp b/src/states_screens/grand_prix_lose.cpp
index da2b66304..b61d9d1bb 100644
--- a/src/states_screens/grand_prix_lose.cpp
+++ b/src/states_screens/grand_prix_lose.cpp
@@ -109,14 +109,6 @@ void GrandPrixLose::onCutsceneEnd()
 
 // -------------------------------------------------------------------------------------
 
-bool GrandPrixLose::onEscapePressed()
-{
-    ((CutsceneWorld*)World::getWorld())->abortCutscene();
-    return false;
-}
-
-// -------------------------------------------------------------------------------------
-
 void GrandPrixLose::loadedFromFile()
 {
     m_kart_node[0] = NULL;
@@ -138,22 +130,7 @@ void GrandPrixLose::init()
 
     World::getWorld()->setPhase(WorldStatus::RACE_PHASE);
 
-    if (race_manager->getGrandPrix().getId() == "random")
-    {
-        core::stringw text = _("Save Grand Prix");
-
-        typedef GUIEngine::ButtonWidget Button;
-        Button* save_button = new Button();
-        save_button->m_properties[GUIEngine::PROP_ID] = "save gp";
-        Button* c = getWidget<Button>("continue");
-        save_button->m_x = c->m_x + c->m_w + 20;
-        save_button->m_y = c->m_y;
-        save_button->m_w = GUIEngine::getFont()->getDimension(text.c_str()).Width + 30;
-        save_button->m_h = c->m_h;
-        save_button->setText(text);
-        save_button->add();
-        manualAddWidget(save_button);
-    }
+    saveGPButton();
 
     m_phase = 1;
     m_global_time = 0.0f;
@@ -161,13 +138,6 @@ void GrandPrixLose::init()
 
 // -------------------------------------------------------------------------------------
 
-void GrandPrixLose::tearDown()
-{
-    Screen::tearDown();
-}   // tearDown
-
-// -------------------------------------------------------------------------------------
-
 void GrandPrixLose::onUpdate(float dt)
 {
     m_global_time += dt;
@@ -207,21 +177,6 @@ void GrandPrixLose::onUpdate(float dt)
 
 // -------------------------------------------------------------------------------------
 
-void GrandPrixLose::eventCallback(GUIEngine::Widget* widget,
-                                            const std::string& name,
-                                            const int playerID)
-{
-    if (name == "continue")
-    {
-        ((CutsceneWorld*)World::getWorld())->abortCutscene();
-    }
-    else if (name == "save_gp")
-    {
-    }
-}   // eventCallback
-
-// -------------------------------------------------------------------------------------
-
 void GrandPrixLose::setKarts(std::vector<std::string> ident_arg)
 {
     TrackObjectManager* tobjman = World::getWorld()->getTrack()->getTrackObjectManager();
diff --git a/src/states_screens/grand_prix_lose.hpp b/src/states_screens/grand_prix_lose.hpp
index 585d55c02..4a8fa97d0 100644
--- a/src/states_screens/grand_prix_lose.hpp
+++ b/src/states_screens/grand_prix_lose.hpp
@@ -57,8 +57,6 @@ class GrandPrixLose :
 public:
     virtual void onCutsceneEnd() OVERRIDE;
 
-    virtual bool onEscapePressed() OVERRIDE;
-
     /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void loadedFromFile() OVERRIDE;
 
@@ -68,13 +66,6 @@ public:
     /** \brief implement callback from parent class GUIEngine::Screen */
     void init() OVERRIDE;
 
-    /** \brief implement callback from parent class GUIEngine::Screen */
-    void tearDown() OVERRIDE;
-
-    /** \brief implement callback from parent class GUIEngine::Screen */
-    void eventCallback(GUIEngine::Widget* widget, const std::string& name,
-                       const int playerID) OVERRIDE;
-
     /** \brief set which karts lost this GP */
     void setKarts(std::vector<std::string> ident);
 };
diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp
index cea594f52..145fb89c7 100644
--- a/src/states_screens/grand_prix_win.cpp
+++ b/src/states_screens/grand_prix_win.cpp
@@ -182,22 +182,7 @@ void GrandPrixWin::init()
     {
         m_unlocked_label = NULL;
 
-        if (race_manager->getGrandPrix().getId() == "random")
-        {
-            core::stringw text = _("Save Grand Prix");
-
-            typedef GUIEngine::ButtonWidget Button;
-            Button* save_button = new Button();
-            save_button->m_properties[GUIEngine::PROP_ID] = "save gp";
-            Button* c = getWidget<Button>("continue");
-            save_button->m_x = c->m_x + c->m_w + 20;
-            save_button->m_y = c->m_y;
-            save_button->m_w = GUIEngine::getFont()->getDimension(text.c_str()).Width + 30;
-            save_button->m_h = c->m_h;
-            save_button->setText(text);
-            save_button->add();
-            manualAddWidget(save_button);
-        }
+        saveGPButton();
     }
 
     m_global_time = 0.0f;
@@ -208,21 +193,6 @@ void GrandPrixWin::init()
 
 // -------------------------------------------------------------------------------------
 
-bool GrandPrixWin::onEscapePressed()
-{
-    ((CutsceneWorld*)World::getWorld())->abortCutscene();
-    return false;
-}
-
-// -------------------------------------------------------------------------------------
-
-void GrandPrixWin::tearDown()
-{
-    Screen::tearDown();
-}   // tearDown
-
-// -------------------------------------------------------------------------------------
-
 void GrandPrixWin::onUpdate(float dt)
 {
     m_global_time += dt;
@@ -338,20 +308,6 @@ void GrandPrixWin::onUpdate(float dt)
                                     true/* center h */, true /* center v */ );
 }   // onUpdate
 
-// -------------------------------------------------------------------------------------
-
-void GrandPrixWin::eventCallback(GUIEngine::Widget* widget,
-                                            const std::string& name,
-                                            const int playerID)
-{
-    if (name == "continue")
-    {
-        ((CutsceneWorld*)World::getWorld())->abortCutscene();
-    }
-    else if (name == "save_gp")
-    {
-    }
-}   // eventCallback
 
 // -------------------------------------------------------------------------------------
 
diff --git a/src/states_screens/grand_prix_win.hpp b/src/states_screens/grand_prix_win.hpp
index e2e15a260..140cf12a8 100644
--- a/src/states_screens/grand_prix_win.hpp
+++ b/src/states_screens/grand_prix_win.hpp
@@ -64,8 +64,6 @@ public:
 
     virtual void onCutsceneEnd() OVERRIDE;
 
-    virtual bool onEscapePressed() OVERRIDE;
-
     /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void loadedFromFile() OVERRIDE {};
 
@@ -75,13 +73,6 @@ public:
     /** \brief implement callback from parent class GUIEngine::Screen */
     void init() OVERRIDE;
 
-    /** \brief implement callback from parent class GUIEngine::Screen */
-    void tearDown() OVERRIDE;
-
-    /** \brief implement callback from parent class GUIEngine::Screen */
-    void eventCallback(GUIEngine::Widget* widget, const std::string& name,
-                       const int playerID) OVERRIDE;
-
     /** \pre must be called after pushing the screen, but before onUpdate had the chance to be invoked */
     void setKarts(const std::string idents[3]);
 };

From b6d7834c85420a1a29a1958a982fa2b7a3599739 Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Wed, 23 Jul 2014 21:25:31 +0200
Subject: [PATCH 005/248] removing unnecessary codes and compiler warnings

---
 src/states_screens/grand_prix_lose.cpp |  6 +--
 src/states_screens/grand_prix_win.cpp  | 61 ++++++--------------------
 src/states_screens/grand_prix_win.hpp  |  2 +-
 3 files changed, 15 insertions(+), 54 deletions(-)

diff --git a/src/states_screens/grand_prix_lose.cpp b/src/states_screens/grand_prix_lose.cpp
index b61d9d1bb..aeaa67c51 100644
--- a/src/states_screens/grand_prix_lose.cpp
+++ b/src/states_screens/grand_prix_lose.cpp
@@ -49,7 +49,6 @@
 #include <ICameraSceneNode.h>
 #include <ILightSceneNode.h>
 #include <IMeshSceneNode.h>
-//#include <iostream>
 
 using namespace irr::core;
 using namespace irr::gui;
@@ -86,7 +85,6 @@ DEFINE_SCREEN_SINGLETON( GrandPrixLose );
 
 void GrandPrixLose::onCutsceneEnd()
 {
-    TrackObjectManager* tobjman = World::getWorld()->getTrack()->getTrackObjectManager();
     if (m_kart_node[0] != NULL)
         m_kart_node[0]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
     if (m_kart_node[1] != NULL)
@@ -121,9 +119,7 @@ void GrandPrixLose::loadedFromFile()
 
 void GrandPrixLose::init()
 {
-    std::vector<std::string> parts;
-    parts.push_back("gplose");
-    ((CutsceneWorld*)World::getWorld())->setParts(parts);
+    ((CutsceneWorld*)World::getWorld())->setParts({"gplose"});
     CutsceneWorld::setUseDuration(false);
 
     Screen::init();
diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp
index 145fb89c7..26555190b 100644
--- a/src/states_screens/grand_prix_win.cpp
+++ b/src/states_screens/grand_prix_win.cpp
@@ -70,24 +70,15 @@ DEFINE_SCREEN_SINGLETON( GrandPrixWin );
 
 GrandPrixWin::GrandPrixWin() : GrandPrixCutscene("grand_prix_win.stkgui")
 {
-    m_kart_node[0] = NULL;
-    m_kart_node[1] = NULL;
-    m_kart_node[2] = NULL;
-
-    m_podium_steps[0] = NULL;
-    m_podium_steps[1] = NULL;
-    m_podium_steps[2] = NULL;
-
+    for (int i = 0; i < 3; i++)
+    {
+        m_kart_node[i] = NULL;
+        m_podium_steps[i] = NULL;
+    }
 }   // GrandPrixWin
 
 // -------------------------------------------------------------------------------------
 
-GrandPrixWin::~GrandPrixWin()
-{
-}
-
-// -------------------------------------------------------------------------------------
-
 void GrandPrixWin::onCutsceneEnd()
 {
     for (unsigned int i = 0; i<m_all_kart_models.size(); i++)
@@ -101,30 +92,20 @@ void GrandPrixWin::onCutsceneEnd()
         m_unlocked_label = NULL;
     }
 
-    TrackObjectManager* tobjman = World::getWorld()->getTrack()->getTrackObjectManager();
-    if (m_kart_node[0] != NULL)
-        m_kart_node[0]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
-    if (m_kart_node[1] != NULL)
-        m_kart_node[1]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
-    if (m_kart_node[2] != NULL)
-        m_kart_node[2]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
-
-    m_kart_node[0] = NULL;
-    m_kart_node[1] = NULL;
-    m_kart_node[2] = NULL;
-
-    m_podium_steps[0] = NULL;
-    m_podium_steps[1] = NULL;
-    m_podium_steps[2] = NULL;
+    for (int i = 0; i < 3; i++)
+    {
+        if (m_kart_node[i] != NULL)
+            m_kart_node[i]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
+        m_kart_node[i] = NULL;
+        m_podium_steps[i] = NULL;
+    }
 }
 
 // -------------------------------------------------------------------------------------
 
 void GrandPrixWin::init()
 {
-    std::vector<std::string> parts;
-    parts.push_back("gpwin");
-    ((CutsceneWorld*)World::getWorld())->setParts(parts);
+    ((CutsceneWorld*)World::getWorld())->setParts({"gpwin"});
     CutsceneWorld::setUseDuration(false);
 
     Screen::init();
@@ -181,7 +162,6 @@ void GrandPrixWin::init()
     else
     {
         m_unlocked_label = NULL;
-
         saveGPButton();
     }
 
@@ -211,17 +191,11 @@ void GrandPrixWin::onUpdate(float dt)
                 if (fabsf(m_kart_z[k] - KARTS_DEST_Z) > dt)
                 {
                     if (m_kart_z[k] < KARTS_DEST_Z - dt)
-                    {
                         m_kart_z[k] += dt;
-                    }
                     else if (m_kart_z[k] > KARTS_DEST_Z + dt)
-                    {
                         m_kart_z[k] -= dt;
-                    }
                     else
-                    {
                         m_kart_z[k] = KARTS_DEST_Z;
-                    }
                     karts_not_yet_done++;
                 }
 
@@ -233,9 +207,7 @@ void GrandPrixWin::onUpdate(float dt)
         } // end for
 
         if (karts_not_yet_done == 0)
-        {
             m_phase = 2;
-        }
     }
 
     // ---- Karts Rotate
@@ -291,7 +263,6 @@ void GrandPrixWin::onUpdate(float dt)
                 }
             }
         } // end for
-
     }
 
 
@@ -357,17 +328,11 @@ void GrandPrixWin::setKarts(const std::string idents_arg[3])
         if (meshPresentation != NULL)
         {
             if (meshPresentation->getModelFile() == "gpwin_podium1.b3d")
-            {
                 m_podium_steps[0] = currObj;
-            }
             else if (meshPresentation->getModelFile() == "gpwin_podium2.b3d")
-            {
                 m_podium_steps[1] = currObj;
-            }
             else if (meshPresentation->getModelFile() == "gpwin_podium3.b3d")
-            {
                 m_podium_steps[2] = currObj;
-            }
         }
     }
 
diff --git a/src/states_screens/grand_prix_win.hpp b/src/states_screens/grand_prix_win.hpp
index 140cf12a8..0ed900434 100644
--- a/src/states_screens/grand_prix_win.hpp
+++ b/src/states_screens/grand_prix_win.hpp
@@ -41,7 +41,7 @@ class GrandPrixWin :
 
     GrandPrixWin();
 
-    virtual ~GrandPrixWin();
+    virtual ~GrandPrixWin() {};
 
     /** Global evolution of time */
     double m_global_time;

From 7978c25fc5a7c31d9c3e86a942759de2ef0cfca8 Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Wed, 23 Jul 2014 21:49:53 +0200
Subject: [PATCH 006/248] more improvements

---
 src/race/race_manager.cpp              | 32 ++++++++++----------------
 src/states_screens/grand_prix_lose.cpp | 26 ++++++++-------------
 src/states_screens/grand_prix_lose.hpp | 14 ++++-------
 src/states_screens/grand_prix_win.cpp  |  3 ++-
 src/states_screens/grand_prix_win.hpp  | 14 ++++-------
 5 files changed, 31 insertions(+), 58 deletions(-)

diff --git a/src/race/race_manager.cpp b/src/race/race_manager.cpp
index e540b71d7..f99e69fc6 100644
--- a/src/race/race_manager.cpp
+++ b/src/race/race_manager.cpp
@@ -679,16 +679,17 @@ void RaceManager::exitRace(bool delete_world)
             }
         }
 
+        if (delete_world) World::deleteWorld();
+        delete_world = false;
+
+        StateManager::get()->enterGameState();
+        race_manager->setMinorMode(RaceManager::MINOR_MODE_CUTSCENE);
+        race_manager->setNumKarts(0);
+        race_manager->setNumPlayers(0);
+        race_manager->setNumLocalPlayers(0);
+
         if (someHumanPlayerWon)
         {
-            if (delete_world) World::deleteWorld();
-            delete_world = false;
-
-            StateManager::get()->enterGameState();
-            race_manager->setMinorMode(RaceManager::MINOR_MODE_CUTSCENE);
-            race_manager->setNumKarts(0);
-            race_manager->setNumPlayers(0);
-            race_manager->setNumLocalPlayers(0);
             race_manager->startSingleRace("gpwin", 999, false);
             GrandPrixWin* scene = GrandPrixWin::getInstance();
             StateManager::get()->pushScreen(scene);
@@ -696,14 +697,6 @@ void RaceManager::exitRace(bool delete_world)
         }
         else
         {
-            if (delete_world) World::deleteWorld();
-            delete_world = false;
-
-            StateManager::get()->enterGameState();
-            race_manager->setMinorMode(RaceManager::MINOR_MODE_CUTSCENE);
-            race_manager->setNumKarts(0);
-            race_manager->setNumPlayers(0);
-            race_manager->setNumLocalPlayers(0);
             race_manager->startSingleRace("gplose", 999, false);
             GrandPrixLose* scene = GrandPrixLose::getInstance();
             StateManager::get()->pushScreen(scene);
@@ -714,10 +707,9 @@ void RaceManager::exitRace(bool delete_world)
             }
             else
             {
-                std::cerr << "RaceManager::exitRace() : what's going on?? no winners and no losers??\n";
-                std::vector<std::string> karts;
-                karts.push_back(UserConfigParams::m_default_kart);
-                scene->setKarts(karts);
+                Log::error("RaceManager", "There are no winners and no losers."
+                           "This should have never happend\n");
+                scene->setKarts({UserConfigParams::m_default_kart});
             }
         }
     }
diff --git a/src/states_screens/grand_prix_lose.cpp b/src/states_screens/grand_prix_lose.cpp
index aeaa67c51..29dd4afef 100644
--- a/src/states_screens/grand_prix_lose.cpp
+++ b/src/states_screens/grand_prix_lose.cpp
@@ -85,25 +85,18 @@ DEFINE_SCREEN_SINGLETON( GrandPrixLose );
 
 void GrandPrixLose::onCutsceneEnd()
 {
-    if (m_kart_node[0] != NULL)
-        m_kart_node[0]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
-    if (m_kart_node[1] != NULL)
-        m_kart_node[1]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
-    if (m_kart_node[2] != NULL)
-        m_kart_node[2]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
-    if (m_kart_node[3] != NULL)
-        m_kart_node[3]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
+    for (int i = 0; i < 3; i++)
+    {
+        if (m_kart_node[i] != NULL)
+            m_kart_node[i]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
+        m_kart_node[i] = NULL;
+    }
 
     for (unsigned int i = 0; i<m_all_kart_models.size(); i++)
         delete m_all_kart_models[i];
 
     m_all_kart_models.clear();
-
-    m_kart_node[0] = NULL;
-    m_kart_node[1] = NULL;
-    m_kart_node[2] = NULL;
-    m_kart_node[3] = NULL;
-}
+}   // onCutsceneEnd
 
 // -------------------------------------------------------------------------------------
 
@@ -179,9 +172,7 @@ void GrandPrixLose::setKarts(std::vector<std::string> ident_arg)
 
     assert(ident_arg.size() > 0);
     if ((int)ident_arg.size() > MAX_KART_COUNT)
-    {
         ident_arg.resize(MAX_KART_COUNT);
-    }
 
     // (there is at least one kart so kart node 0 is sure to be set)
     m_kart_node[1] = NULL;
@@ -219,7 +210,8 @@ void GrandPrixLose::setKarts(std::vector<std::string> ident_arg)
         }
         else
         {
-            fprintf(stderr, "[GrandPrixLose] WARNING: could not find a kart named '%s'\n", ident_arg[n].c_str());
+            Log::warn("GrandPrixLose", "A kart named '%s' could not be found\n",
+                      ident_arg[n].c_str());
             m_kart_node[n] = NULL;
         }// if kart !=NULL
     }
diff --git a/src/states_screens/grand_prix_lose.hpp b/src/states_screens/grand_prix_lose.hpp
index 4a8fa97d0..a1cd0d6a4 100644
--- a/src/states_screens/grand_prix_lose.hpp
+++ b/src/states_screens/grand_prix_lose.hpp
@@ -55,17 +55,11 @@ class GrandPrixLose :
     float m_kart_x, m_kart_y, m_kart_z;
 
 public:
-    virtual void onCutsceneEnd() OVERRIDE;
-
-    /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile() OVERRIDE;
-
-    /** \brief implement optional callback from parent class GUIEngine::Screen */
-    void onUpdate(float dt) OVERRIDE;
-
-    /** \brief implement callback from parent class GUIEngine::Screen */
+    // implement callbacks from parent class GUIEngine::Screen
     void init() OVERRIDE;
-
+    void loadedFromFile() OVERRIDE;
+    void onCutsceneEnd() OVERRIDE;
+    void onUpdate(float dt) OVERRIDE;
     /** \brief set which karts lost this GP */
     void setKarts(std::vector<std::string> ident);
 };
diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp
index 26555190b..eaad5ef02 100644
--- a/src/states_screens/grand_prix_win.cpp
+++ b/src/states_screens/grand_prix_win.cpp
@@ -236,7 +236,8 @@ void GrandPrixWin::onUpdate(float dt)
             }
         } // end for
 
-        if (karts_not_yet_done == 0) m_phase = 3;
+        if (karts_not_yet_done == 0)
+            m_phase = 3;
     }
 
     // ---- Podium Rises
diff --git a/src/states_screens/grand_prix_win.hpp b/src/states_screens/grand_prix_win.hpp
index 0ed900434..06e999d12 100644
--- a/src/states_screens/grand_prix_win.hpp
+++ b/src/states_screens/grand_prix_win.hpp
@@ -61,17 +61,11 @@ class GrandPrixWin :
     float m_kart_rotation[3];
 
 public:
-
-    virtual void onCutsceneEnd() OVERRIDE;
-
-    /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile() OVERRIDE {};
-
-    /** \brief implement optional callback from parent class GUIEngine::Screen */
-    void onUpdate(float dt) OVERRIDE;
-
-    /** \brief implement callback from parent class GUIEngine::Screen */
+    // implement callbacks from parent class GUIEngine::Screen
     void init() OVERRIDE;
+    void loadedFromFile() OVERRIDE {};
+    void onCutsceneEnd() OVERRIDE;
+    void onUpdate(float dt) OVERRIDE;
 
     /** \pre must be called after pushing the screen, but before onUpdate had the chance to be invoked */
     void setKarts(const std::string idents[3]);

From eae71b3df9a1b4b907ecdae548459fa604796f15 Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Thu, 24 Jul 2014 08:41:45 +0200
Subject: [PATCH 007/248] remove C++11

---
 src/race/race_manager.cpp              | 4 +++-
 src/states_screens/grand_prix_lose.cpp | 4 +++-
 src/states_screens/grand_prix_win.cpp  | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/race/race_manager.cpp b/src/race/race_manager.cpp
index f99e69fc6..92e4e29fc 100644
--- a/src/race/race_manager.cpp
+++ b/src/race/race_manager.cpp
@@ -709,7 +709,9 @@ void RaceManager::exitRace(bool delete_world)
             {
                 Log::error("RaceManager", "There are no winners and no losers."
                            "This should have never happend\n");
-                scene->setKarts({UserConfigParams::m_default_kart});
+                std::vector<std::string> karts;
+                karts.push_back(UserConfigParams::m_default_kart);
+                scene->setKarts(karts);
             }
         }
     }
diff --git a/src/states_screens/grand_prix_lose.cpp b/src/states_screens/grand_prix_lose.cpp
index bedea517a..2eb64c908 100644
--- a/src/states_screens/grand_prix_lose.cpp
+++ b/src/states_screens/grand_prix_lose.cpp
@@ -112,7 +112,9 @@ void GrandPrixLose::loadedFromFile()
 
 void GrandPrixLose::init()
 {
-    ((CutsceneWorld*)World::getWorld())->setParts({"gplose"});
+    std::vector<std::string> parts;
+    parts.push_back("gplose");
+    ((CutsceneWorld*)World::getWorld())->setParts(parts);
     CutsceneWorld::setUseDuration(false);
 
     Screen::init();
diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp
index eaad5ef02..7446c4280 100644
--- a/src/states_screens/grand_prix_win.cpp
+++ b/src/states_screens/grand_prix_win.cpp
@@ -105,7 +105,9 @@ void GrandPrixWin::onCutsceneEnd()
 
 void GrandPrixWin::init()
 {
-    ((CutsceneWorld*)World::getWorld())->setParts({"gpwin"});
+    std::vector<std::string> parts;
+    parts.push_back("gpwin");
+    ((CutsceneWorld*)World::getWorld())->setParts(parts);
     CutsceneWorld::setUseDuration(false);
 
     Screen::init();

From 58a8a4ff3107b2d7e0f5801be192d6cfe18a5474 Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Fri, 25 Jul 2014 13:02:47 +0200
Subject: [PATCH 008/248] fix index

---
 src/states_screens/grand_prix_lose.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/states_screens/grand_prix_lose.cpp b/src/states_screens/grand_prix_lose.cpp
index 2eb64c908..be86e77e9 100644
--- a/src/states_screens/grand_prix_lose.cpp
+++ b/src/states_screens/grand_prix_lose.cpp
@@ -85,7 +85,7 @@ DEFINE_SCREEN_SINGLETON( GrandPrixLose );
 
 void GrandPrixLose::onCutsceneEnd()
 {
-    for (int i = 0; i < 3; i++)
+    for (int i = 0; i < 4; i++)
     {
         if (m_kart_node[i] != NULL)
             m_kart_node[i]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();

From fb50c9c33874278d6f0f3ce7cafcea13c591b959 Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Wed, 30 Jul 2014 14:58:53 +0200
Subject: [PATCH 009/248] moving the button to xml

---
 data/gui/grand_prix_lose.stkgui            |  7 ++++---
 data/gui/grand_prix_win.stkgui             |  8 +++++---
 src/states_screens/grand_prix_cutscene.cpp | 18 ++++--------------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/data/gui/grand_prix_lose.stkgui b/data/gui/grand_prix_lose.stkgui
index 743196dae..e08bb49f4 100644
--- a/data/gui/grand_prix_lose.stkgui
+++ b/data/gui/grand_prix_lose.stkgui
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <spacer width="10" proportion="1"/>
-        <button id="continue" x="20" width="250" align="left" text="Continue"/>
+    <div x="2%" y="2%" width="96%" height="96%" layout="horizontal-row">
+        <button id="continue" width="250" align="bottom" text="Continue"/>
+        <spacer width="20"/>
+        <button id="save"     width="250" align="bottom" text="Save Grand Prix"/>
     </div>
 </stkgui>
diff --git a/data/gui/grand_prix_win.stkgui b/data/gui/grand_prix_win.stkgui
index 743196dae..05d24c048 100644
--- a/data/gui/grand_prix_win.stkgui
+++ b/data/gui/grand_prix_win.stkgui
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <spacer width="10" proportion="1"/>
-        <button id="continue" x="20" width="250" align="left" text="Continue"/>
+    <div x="2%" y="2%" width="96%" height="96%" layout="horizontal-row">
+        <button id="continue" width="250" align="bottom" text="Continue"/>
+        <spacer width="20"/>
+        <button id="save"     width="250" align="bottom" text="Save Grand Prix"/>
     </div>
 </stkgui>
+
diff --git a/src/states_screens/grand_prix_cutscene.cpp b/src/states_screens/grand_prix_cutscene.cpp
index 484d9403c..533ac78d3 100644
--- a/src/states_screens/grand_prix_cutscene.cpp
+++ b/src/states_screens/grand_prix_cutscene.cpp
@@ -26,20 +26,10 @@ typedef GUIEngine::ButtonWidget Button;
 void GrandPrixCutscene::saveGPButton()
 {
     #ifdef IMPLEMENTATION_FINISHED
-    if (race_manager->getGrandPrix().getId() == "random")
-    {
-        core::stringw text = _("Save Grand Prix");
-        Button* save_button = new Button();
-        save_button->m_properties[GUIEngine::PROP_ID] = "save gp";
-        Button* c = getWidget<Button>("continue");
-        save_button->m_x = c->m_x + c->m_w + 20;
-        save_button->m_y = c->m_y;
-        save_button->m_w = GUIEngine::getFont()->getDimension(text.c_str()).Width + 30;
-        save_button->m_h = c->m_h;
-        save_button->setText(text);
-        save_button->add();
-        manualAddWidget(save_button);
-    }
+    if (race_manager->getGrandPrix().getId() != "random")
+        getWidget<Button>("save")->setVisible(false);
+    #else
+    getWidget<Button>("save")->setVisible(false);
     #endif
 }   // saveGPButton
 

From 98d3728a4e059e98f75a4d08a6eca5460d98c935 Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Wed, 30 Jul 2014 16:06:44 +0200
Subject: [PATCH 010/248] finish the save gp button

---
 .../dialogs/enter_gp_name_dialog.cpp          | 16 +++-----
 src/states_screens/grand_prix_cutscene.cpp    | 37 ++++++++++++++++---
 src/states_screens/grand_prix_cutscene.hpp    |  7 +++-
 .../grand_prix_editor_screen.hpp              |  2 +-
 4 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/states_screens/dialogs/enter_gp_name_dialog.cpp b/src/states_screens/dialogs/enter_gp_name_dialog.cpp
index e75c64abc..7d68bf09b 100644
--- a/src/states_screens/dialogs/enter_gp_name_dialog.cpp
+++ b/src/states_screens/dialogs/enter_gp_name_dialog.cpp
@@ -84,17 +84,13 @@ void EnterGPNameDialog::onEnterPressedInternal()
     if (name.size() > 0 && name != "Random Grand Prix")
     {
         // check for duplicate names
-        for (unsigned int i = 0; i < grand_prix_manager->getNumberOfGrandPrix(); i++)
+        if (grand_prix_manager->existsName(name))
         {
-            const GrandPrixData* gp = grand_prix_manager->getGrandPrix(i);
-            if (gp->getName() == name)
-            {
-                LabelWidget* label = getWidget<LabelWidget>("title");
-                assert(label != NULL);
-                label->setText(_("Another grand prix with this name already exists."), false);
-                sfx_manager->quickSound("anvil");
-                return;
-            }
+            LabelWidget* label = getWidget<LabelWidget>("title");
+            assert(label != NULL);
+            label->setText(_("Another grand prix with this name already exists."), false);
+            sfx_manager->quickSound("anvil");
+            return;
         }
 
         // It's unsafe to delete from inside the event handler so we do it
diff --git a/src/states_screens/grand_prix_cutscene.cpp b/src/states_screens/grand_prix_cutscene.cpp
index 533ac78d3..b4032adf2 100644
--- a/src/states_screens/grand_prix_cutscene.cpp
+++ b/src/states_screens/grand_prix_cutscene.cpp
@@ -18,23 +18,47 @@
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/widgets/button_widget.hpp"
 #include "modes/cutscene_world.hpp"
+#include "race/grand_prix_data.hpp"
+#include "race/grand_prix_manager.hpp"
+#include "race/race_manager.hpp"
 #include "states_screens/grand_prix_cutscene.hpp"
+#include "tracks/track_manager.hpp"
+
+#include <string>
+#include <vector>
 
 typedef GUIEngine::ButtonWidget Button;
 
-/** A Button to save the GP if it was a random one */
+/** A Button to save the GP if it was a random GP */
 void GrandPrixCutscene::saveGPButton()
 {
-    #ifdef IMPLEMENTATION_FINISHED
     if (race_manager->getGrandPrix().getId() != "random")
         getWidget<Button>("save")->setVisible(false);
-    #else
-    getWidget<Button>("save")->setVisible(false);
-    #endif
 }   // saveGPButton
 
 // ----------------------------------------------------------------------------
 
+/** \brief Creates a new GP with the same content as the current and saves it
+ *  The GP that the race_manager provides can't be used because we need some
+ *  functions and settings that the GP manager only gives us through
+ *  createNewGP(). */
+void GrandPrixCutscene::onNewGPWithName(const irr::core::stringw& name)
+{
+    // Create a new gp with the corre
+    GrandPrixData* gp = grand_prix_manager->createNewGP(name);
+    const GrandPrixData current_gp = race_manager->getGrandPrix();
+    std::vector<std::string> tracks  = current_gp.getTrackNames();
+    std::vector<int>         laps    = current_gp.getLaps();
+    std::vector<bool>        reverse = current_gp.getReverse();
+    for (unsigned int i = 0; i < laps.size(); i++)
+        gp->addTrack(track_manager->getTrack(tracks[i]), laps[i], reverse[i]);
+    gp->writeToFile();
+
+    // Avoid double-save
+    getWidget<Button>("save")->setVisible(false);
+}   // onNewGPWithName
+
+// ----------------------------------------------------------------------------
 
 void GrandPrixCutscene::eventCallback(GUIEngine::Widget* widget,
                                       const std::string& name,
@@ -44,8 +68,9 @@ void GrandPrixCutscene::eventCallback(GUIEngine::Widget* widget,
     {
         ((CutsceneWorld*)World::getWorld())->abortCutscene();
     }
-    else if (name == "save_gp")
+    else if (name == "save")
     {
+        new EnterGPNameDialog(this, 0.5f, 0.4f);
     }
 }   // eventCallback
 
diff --git a/src/states_screens/grand_prix_cutscene.hpp b/src/states_screens/grand_prix_cutscene.hpp
index 8abeb9289..d85834b7b 100644
--- a/src/states_screens/grand_prix_cutscene.hpp
+++ b/src/states_screens/grand_prix_cutscene.hpp
@@ -21,10 +21,12 @@
 #include "guiengine/screen.hpp"
 #include "guiengine/widgets/button_widget.hpp"
 #include "race/race_manager.hpp"
+#include "states_screens/dialogs/enter_gp_name_dialog.hpp"
 
 #include <string>
 
-class GrandPrixCutscene: public GUIEngine::CutsceneScreen
+class GrandPrixCutscene: public GUIEngine::CutsceneScreen,
+                         public EnterGPNameDialog::INewGPListener
 {
     friend class GUIEngine::ScreenSingleton<GrandPrixCutscene>;
 public:
@@ -32,6 +34,9 @@ public:
 protected:
     void saveGPButton();
 
+    /** implement callback from INewGPListener */
+    void onNewGPWithName(const irr::core::stringw& name);
+
     // implement callbacks from parent class GUIEngine::Screen
     void eventCallback(GUIEngine::Widget* widget,
                        const std::string& name,
diff --git a/src/states_screens/grand_prix_editor_screen.hpp b/src/states_screens/grand_prix_editor_screen.hpp
index 4d763846b..318acf0c0 100644
--- a/src/states_screens/grand_prix_editor_screen.hpp
+++ b/src/states_screens/grand_prix_editor_screen.hpp
@@ -18,8 +18,8 @@
 #ifndef HEADER_GRAND_PRIX_EDITOR_SCREEN_HPP
 #define HEADER_GRAND_PRIX_EDITOR_SCREEN_HPP
 
-#include "dialogs/enter_gp_name_dialog.hpp"
 #include "guiengine/screen.hpp"
+#include "states_screens/dialogs/enter_gp_name_dialog.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"
 
 

From e7d3ab4be27ee0a0f107316d8ab6ba867244ef06 Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Wed, 30 Jul 2014 16:17:40 +0200
Subject: [PATCH 011/248] fix compilation

---
 src/race/grand_prix_manager.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/race/grand_prix_manager.hpp b/src/race/grand_prix_manager.hpp
index d4800204a..5eabbb719 100644
--- a/src/race/grand_prix_manager.hpp
+++ b/src/race/grand_prix_manager.hpp
@@ -45,8 +45,6 @@ private:
     /** Generates a new unique indentifier for a user defined grand prix */
     std::string generateId();
 
-    bool existsName(const irr::core::stringw& name) const;
-
 public:
                    GrandPrixManager();
                   ~GrandPrixManager();
@@ -54,6 +52,7 @@ public:
     GrandPrixData* getGrandPrix(const int i) const { return m_gp_data[i];     }
     GrandPrixData* getGrandPrix(const std::string& s) const;
     unsigned int   getNumberOfGrandPrix()    const { return m_gp_data.size(); }
+    bool existsName(const irr::core::stringw& name) const;
     void           checkConsistency();
 
     // Methods for the gp editor

From 5fc44d25cdaea77250878d31b41b24844ad4ff54 Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Sun, 3 Aug 2014 13:56:53 +0200
Subject: [PATCH 012/248] correct invisibility settings

---
 src/states_screens/grand_prix_win.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp
index 7446c4280..92e15dd6f 100644
--- a/src/states_screens/grand_prix_win.cpp
+++ b/src/states_screens/grand_prix_win.cpp
@@ -115,6 +115,7 @@ void GrandPrixWin::init()
     World::getWorld()->setPhase(WorldStatus::RACE_PHASE);
 
 
+    saveGPButton();
     if (PlayerManager::getCurrentPlayer()->getRecentlyCompletedChallenges().size() > 0)
     {
         const core::dimension2d<u32>& frame_size = GUIEngine::getDriver()->getCurrentRenderTargetSize();
@@ -164,7 +165,6 @@ void GrandPrixWin::init()
     else
     {
         m_unlocked_label = NULL;
-        saveGPButton();
     }
 
     m_global_time = 0.0f;

From f3d0d3cf4e9d519b2496ac52b91a8a51958f555d Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Sat, 9 Aug 2014 19:56:01 +0200
Subject: [PATCH 013/248] better comments

---
 src/states_screens/grand_prix_cutscene.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/states_screens/grand_prix_cutscene.cpp b/src/states_screens/grand_prix_cutscene.cpp
index b4032adf2..850852aec 100644
--- a/src/states_screens/grand_prix_cutscene.cpp
+++ b/src/states_screens/grand_prix_cutscene.cpp
@@ -44,7 +44,7 @@ void GrandPrixCutscene::saveGPButton()
  *  createNewGP(). */
 void GrandPrixCutscene::onNewGPWithName(const irr::core::stringw& name)
 {
-    // Create a new gp with the corre
+    // create a new GP with the correct filename and a unique id
     GrandPrixData* gp = grand_prix_manager->createNewGP(name);
     const GrandPrixData current_gp = race_manager->getGrandPrix();
     std::vector<std::string> tracks  = current_gp.getTrackNames();
@@ -54,7 +54,7 @@ void GrandPrixCutscene::onNewGPWithName(const irr::core::stringw& name)
         gp->addTrack(track_manager->getTrack(tracks[i]), laps[i], reverse[i]);
     gp->writeToFile();
 
-    // Avoid double-save
+    // Avoid double-save which can have bad side-effects
     getWidget<Button>("save")->setVisible(false);
 }   // onNewGPWithName
 

From cbd77b469c639343b29a131d21a324056d6988dc Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Fri, 15 Aug 2014 22:06:05 +0200
Subject: [PATCH 014/248] Do not use srgb fbo if ubo workaround is enabled.

---
 src/graphics/post_processing.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 354e01583..dacba3fab 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -784,6 +784,10 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
         PROFILER_POP_CPU_MARKER();
     }
 
+    // Workaround a bug with srgb fbo on sandy bridge windows
+    if (irr_driver->needUBOWorkaround())
+        return in_fbo;
+
     glEnable(GL_FRAMEBUFFER_SRGB);
     irr_driver->getFBO(FBO_MLAA_COLORS).Bind();
     renderPassThrough(in_fbo->getRTT()[0]);

From 5f6d0bd63c9554e304a0837624761781cf24156e Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Sat, 16 Aug 2014 00:19:45 +0200
Subject: [PATCH 015/248] Use stream storage for ubo

---
 src/graphics/shaders.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 289a68f76..d299b4668 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -294,7 +294,7 @@ static void initShadowVPMUBO()
 {
     glGenBuffers(1, &SharedObject::ViewProjectionMatrixesUBO);
     glBindBuffer(GL_UNIFORM_BUFFER, SharedObject::ViewProjectionMatrixesUBO);
-    glBufferData(GL_UNIFORM_BUFFER, (16 * 8 + 2) * sizeof(float), 0, GL_STATIC_DRAW);
+    glBufferData(GL_UNIFORM_BUFFER, (16 * 8 + 2) * sizeof(float), 0, GL_STREAM_DRAW);
     glBindBuffer(GL_UNIFORM_BUFFER, 0);
 }
 

From 8b81d0ac3f4a973bd3581aa140bdcf53bb64f679 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Sat, 16 Aug 2014 00:33:47 +0200
Subject: [PATCH 016/248] Map UBO to change its value.

---
 src/graphics/render.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 28544dc33..ad3dcad4f 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -584,7 +584,8 @@ void IrrDriver::computeCameraMatrix(scene::ICameraSceneNode * const camnode, siz
         50.,
     };
 
-    float *tmp = new float[18 * 8];
+    glBindBuffer(GL_UNIFORM_BUFFER, SharedObject::ViewProjectionMatrixesUBO);
+    float *tmp = (float *) glMapBufferRange(GL_UNIFORM_BUFFER, 0, (16 * 8 + 2) * sizeof(float), GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
 
     memcpy(tmp, irr_driver->getViewMatrix().pointer(), 16 * sizeof(float));
     memcpy(&tmp[16], irr_driver->getProjMatrix().pointer(), 16 * sizeof(float));
@@ -710,10 +711,7 @@ void IrrDriver::computeCameraMatrix(scene::ICameraSceneNode * const camnode, siz
 
     tmp[128] = float(width);
     tmp[129] = float(height);
-
-    glBindBuffer(GL_UNIFORM_BUFFER, SharedObject::ViewProjectionMatrixesUBO);
-    glBufferSubData(GL_UNIFORM_BUFFER, 0, (16 * 8 + 2) * sizeof(float), tmp);
-    delete []tmp;
+    glUnmapBuffer(GL_UNIFORM_BUFFER);
 }
 
 

From af3399269110faf203269c65c6a9c40960c6395e Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Fri, 15 Aug 2014 18:34:59 -0400
Subject: [PATCH 017/248] Remove accidentally added file

---
 src/patch | 66 -------------------------------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 src/patch

diff --git a/src/patch b/src/patch
deleted file mode 100644
index 937f74c5b..000000000
--- a/src/patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
-index f9d6cd9..f243d2a 100644
---- a/src/karts/kart.cpp
-+++ b/src/karts/kart.cpp
-@@ -1098,7 +1098,7 @@ void Kart::update(float dt)
- 
-     // TODO: hiker said this probably will be moved to btKart or so when updating bullet engine.
-     // Neutralize any yaw change if the kart leaves the ground, so the kart falls more or less
--    // straight after jumping, but still allowing some "boat shake" (roll and pitch).
-+    // straight after jumping, but still allowing some "boat shake" (roIll and pitch).
-     // Otherwise many non perfect jumps end in a total roll over or a serious change of
-     // direction, sometimes 90 or even full U turn (real but less fun for a karting game).
-     // As side effect steering becames a bit less responsive (any wheel on air), but not too bad.
-@@ -2023,30 +2023,6 @@ void Kart::updatePhysics(float dt)
-     m_max_speed->setMinSpeed(min_speed);
-     m_max_speed->update(dt);
- 
--    // If the kart is flying, keep its up-axis aligned to gravity (which in
--    // turn typically means the kart is parallel to the ground). This avoids
--    // that the kart rotates in mid-air and lands on its side.
--    if(m_vehicle->getNumWheelsOnGround()==0)
--    {
--        btVector3 kart_up = getTrans().getBasis().getColumn(1);  // up vector
--        btVector3 terrain_up = m_body->getGravity();
--        float g = World::getWorld()->getTrack()->getGravity();
--        // Normalize the gravity, g is the length of the vector
--        btVector3 new_up = 0.9f * kart_up + 0.1f * terrain_up/-g;
--        // Get the rotation (hpr) based on current heading.
--        Vec3 rotation(getHeading(), new_up);
--        btMatrix3x3 m;
--        m.setEulerZYX(rotation.getX(), rotation.getY(), rotation.getZ());
--        // We can't use getXYZ() for the position here, since the position is
--        // based on interpolation, while the actual center-of-mass-transform
--        // is based on the actual value every 1/60 of a second (using getXYZ()
--        // would result in the kart being pushed ahead a bit, making it jump
--        // much further, depending on fps)
--        btTransform new_trans(m, m_body->getCenterOfMassTransform().getOrigin());
--        //setTrans(new_trans);
--        m_body->setCenterOfMassTransform(new_trans);
--    }
--
-     // To avoid tunneling (which can happen on long falls), clamp the
-     // velocity in Y direction. Tunneling can happen if the Y velocity
-     // is larger than the maximum suspension travel (per frame), since then
-diff --git a/src/physics/btKart.cpp b/src/physics/btKart.cpp
-index bdb8f55..2aa0096 100644
---- a/src/physics/btKart.cpp
-+++ b/src/physics/btKart.cpp
-@@ -387,6 +387,17 @@ void btKart::updateVehicle( btScalar step )
-         if(m_wheelInfo[i].m_raycastInfo.m_isInContact)
-             m_num_wheels_on_ground++;
-     }
-+
-+    // If the kart is flying, try to keep it parallel to the ground.
-+    if(m_num_wheels_on_ground==0)
-+    {
-+        btVector3 kart_up    = getChassisWorldTransform().getBasis().getColumn(1);
-+        btVector3 terrain_up(0,1,0);
-+        btVector3 axis = kart_up.cross(terrain_up);
-+        // Times 10 gives a nicely balanced feeling.
-+        m_chassisBody->applyTorqueImpulse(axis * 10);
-+    }
-+
-     // Work around: make sure that either both wheels on one axis
-     // are on ground, or none of them. This avoids the problem of
-     // the kart suddenly getting additional angular velocity because

From 6d5651f35788483f7f0e5fbe51b426e6cff922c3 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 16 Aug 2014 09:44:00 +1000
Subject: [PATCH 018/248] Test to see if the physics work better.

---
 src/karts/kart.cpp            | 24 ++++++++++++++++++++----
 src/karts/kart_properties.cpp |  2 +-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index d97a2cf7a..8f25083ff 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -606,10 +606,26 @@ void Kart::createPhysics()
                 if (y == -1)
                 {
                     int index = (x + 1) / 2 + 1 - z;  // get index of wheel
-                    float f = getKartProperties()->getPhysicalWheelPosition();
-                    wheel_pos[index] = p*(orig_factor*(1.0f-f) + bevel_factor*f);
-                    wheel_pos[index].setY(0);
-                }  // if z==-1
+                    if(true)
+                    {
+                        const Vec3 cs = getKartProperties()->getGravityCenterShift();
+                        wheel_pos[index].setX(x*0.5f*getKartWidth()+cs.getX());
+                        float radius = getKartProperties()->getWheelRadius();
+                        // Set the connection point so that a maximum compressed wheel
+                        // (susp. length=0) will still poke a little bit out under the
+                        // kart
+                        wheel_pos[index].setY(radius - 0.05f);
+                        wheel_pos[index].setZ((0.5f*getKartLength() - radius)* z
+                                               + cs.getZ());
+
+                    }
+                    else
+                    {
+                        float f = getKartProperties()->getPhysicalWheelPosition();
+                        wheel_pos[index] = p*(orig_factor*(1.0f - f) + bevel_factor*f);
+                        wheel_pos[index].setY(0);
+                    }
+                }  // if y==-1
             }   // for x
         }   // for z
     }   // for y
diff --git a/src/karts/kart_properties.cpp b/src/karts/kart_properties.cpp
index 9882e257b..d65819e5a 100644
--- a/src/karts/kart_properties.cpp
+++ b/src/karts/kart_properties.cpp
@@ -273,7 +273,7 @@ void KartProperties::load(const std::string &filename, const std::string &node)
     }
 
     //FIXME: magix 0.25 factor to keep it compatible with previous tourning
-    m_wheel_base = fabsf( m_kart_model->getLength()-0.25f);
+    m_wheel_base = fabsf( m_kart_model->getLength() - (true ? 0 : -0.25f));
 
     // Now convert the turn radius into turn angle:
     for(unsigned int i=0; i<m_turn_angle_at_speed.size(); i++)

From 8c525ab2d43c4317bf059d5c72d9fe65866e06f1 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 16 Aug 2014 10:20:24 +1000
Subject: [PATCH 019/248] Make the physics settings configurable, but default
 to use the old settings for now.

---
 data/stk_config.xml           |  7 +++++--
 src/karts/kart.cpp            |  6 ++++--
 src/karts/kart_properties.cpp | 11 +++++++++--
 src/karts/kart_properties.hpp | 10 ++++++++--
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/data/stk_config.xml b/data/stk_config.xml
index f6b5c9223..b45b46a6e 100644
--- a/data/stk_config.xml
+++ b/data/stk_config.xml
@@ -415,11 +415,14 @@
          physical-wheel-position: Defines where the 'physical' (raycast)
            wheel will be located. It's a weight factor with 0 = being
            at the widest side of the bevel, 1 = at the front and
-           narrowest part of the kart.  -->
+           narrowest part of the kart. If the value is less than 0, the old
+           physics settings are used which places the raycast wheels
+           outside of the chassis and results in more stable physical
+           behaviour of the karts. -->
     <collision impulse-type="normal" 
                impulse="3000" impulse-time="0.1" terrain-impulse="8000"
                restitution="1.0" bevel-factor="0.5 0.0 0.7"
-               physical-wheel-position="0.5" />
+               physical-wheel-position="-1" />
 			 
      <!-- If a kart starts within the specified time after 'go',
           it receives the corresponding bonus from 'boost'. Those
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 8f25083ff..577f75b8e 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -606,7 +606,10 @@ void Kart::createPhysics()
                 if (y == -1)
                 {
                     int index = (x + 1) / 2 + 1 - z;  // get index of wheel
-                    if(true)
+                    float f = getKartProperties()->getPhysicalWheelPosition();
+                    // f < 0 indicates to use the old physics position, i.e. 
+                    // to place the wheels outside of the chassis
+                    if(f<0)
                     {
                         const Vec3 cs = getKartProperties()->getGravityCenterShift();
                         wheel_pos[index].setX(x*0.5f*getKartWidth()+cs.getX());
@@ -621,7 +624,6 @@ void Kart::createPhysics()
                     }
                     else
                     {
-                        float f = getKartProperties()->getPhysicalWheelPosition();
                         wheel_pos[index] = p*(orig_factor*(1.0f - f) + bevel_factor*f);
                         wheel_pos[index].setY(0);
                     }
diff --git a/src/karts/kart_properties.cpp b/src/karts/kart_properties.cpp
index d65819e5a..3b61b2764 100644
--- a/src/karts/kart_properties.cpp
+++ b/src/karts/kart_properties.cpp
@@ -272,8 +272,15 @@ void KartProperties::load(const std::string &filename, const std::string &node)
         m_gravity_center_shift.setZ(0);
     }
 
-    //FIXME: magix 0.25 factor to keep it compatible with previous tourning
-    m_wheel_base = fabsf( m_kart_model->getLength() - (true ? 0 : -0.25f));
+    if(m_physical_wheel_position < 0)
+        m_wheel_base = fabsf(m_kart_model->getLength() );
+    else
+    {
+        // The new (atm unused) physical position results in steering to be
+        // not sharp enough - therefore decrease the wheel base somewhat to
+        // approximate the behaviour of the old steering.
+        m_wheel_base = fabsf(m_kart_model->getLength() - 0.25f);
+    }
 
     // Now convert the turn radius into turn angle:
     for(unsigned int i=0; i<m_turn_angle_at_speed.size(); i++)
diff --git a/src/karts/kart_properties.hpp b/src/karts/kart_properties.hpp
index af99a7736..4b39a375a 100644
--- a/src/karts/kart_properties.hpp
+++ b/src/karts/kart_properties.hpp
@@ -152,7 +152,11 @@ private:
 
     /** The position of the physical wheel is a weighted average of the
      *  two ends of the beveled shape. This determines the weight: 0 = 
-     *  a the widest end, 1 = at the narrowest front end. */
+     *  a the widest end, 1 = at the narrowest front end. If the value is 
+     *  < 0, the old physics settings are used which places the raycast
+     *  wheels outside of the chassis - but result in a more stable
+     *  physics behaviour (which is therefore atm still the default).
+     */
     float m_physical_wheel_position;
 
     /** Time a kart is moved upwards after when it is rescued. */
@@ -916,7 +920,9 @@ public:
     // ------------------------------------------------------------------------
     /** Returns position of the physical wheel is a weighted average of the
      *  two ends of the beveled shape. This determines the weight: 0 = 
-     *  a the widest end, 1 = at the narrowest, front end. */
+     *  a the widest end, 1 = at the narrowest, front end. If the value is <0,
+     *  the old physics position is picked, which placed the raycast wheels
+     *  outside of the chassis, but gives more stable physics. */
     const float getPhysicalWheelPosition() const 
     {
         return m_physical_wheel_position; 

From 990a297154e5a57daf90bda0d6dda1469114e7cd Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Fri, 15 Aug 2014 22:55:05 +0200
Subject: [PATCH 020/248] Get real width and height of best fit resolution only
 if resolutions list is not empty.

---
 src/graphics/irr_driver.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 756280e98..5bcf11334 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -328,8 +328,8 @@ void IrrDriver::initDevice()
 
         } // end if firstTime
 
-        const core::dimension2d<u32> ssize = m_device->getVideoModeList()
-                                                     ->getDesktopResolution();
+        video::IVideoModeList* modes = m_device->getVideoModeList();
+        const core::dimension2d<u32> ssize = modes->getDesktopResolution();
         if (UserConfigParams::m_width > (int)ssize.Width ||
             UserConfigParams::m_height > (int)ssize.Height)
         {
@@ -339,11 +339,14 @@ void IrrDriver::initDevice()
             UserConfigParams::m_height = (int)ssize.Height;
         }
 
-        core::dimension2d<u32> res = core::dimension2du(UserConfigParams::m_width, UserConfigParams::m_height);
-        res = m_device->getVideoModeList()->getVideoModeResolution(res, res);
-
-        if (res.Width > 0 && res.Height > 0)
+        core::dimension2d<u32> res = core::dimension2du(UserConfigParams::m_width, 
+                                                    UserConfigParams::m_height);
+        
+        
+        if (modes->getVideoModeCount() > 0)
         {
+            res = modes->getVideoModeResolution(res, res);
+
             UserConfigParams::m_width = res.Width;
             UserConfigParams::m_height = res.Height;
         }

From a9bd12bfabdc26ea49d149c6225f30dcfb034a32 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sat, 16 Aug 2014 12:20:25 +0200
Subject: [PATCH 021/248] xrandr: use primary output if window manager reports
 this information

---
 lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
index f780938da..c3884657d 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
@@ -1605,6 +1605,8 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 				XRROutputInfo *output = NULL;
 				XRRCrtcInfo* crtc = NULL;
 				crtc_x = crtc_y = -1;
+				
+				RROutput primary_id = XRRGetOutputPrimary(display, DefaultRootWindow(display));
 		
 				for (int i = 0; i < res->noutput; i++) 
 				{
@@ -1625,6 +1627,14 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 						continue;
 					}
 					
+					if (res->outputs[i] == primary_id)
+					{
+						output_id = res->outputs[i];
+						crtc_x = crtc->x;
+						crtc_y = crtc->y;	
+						break;
+					}
+					
 					if (crtc_x == -1 || crtc->x < crtc_x)
 					{
 						crtc_x = crtc->x;
@@ -1641,7 +1651,7 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 					XRRFreeCrtcInfo(crtc);
 					XRRFreeOutputInfo(output);
 				}
-				
+
 				output = XRRGetOutputInfo(display, res, output_id);
 				crtc = XRRGetCrtcInfo(display, res, output->crtc);
 

From 3e3a27252acc9b2bb1fadeae18d47e3cbdd1305e Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sat, 16 Aug 2014 16:02:22 +0200
Subject: [PATCH 022/248] xrandr: fixed memory leak

---
 lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
index c3884657d..13f254236 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
@@ -1629,9 +1629,12 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 					
 					if (res->outputs[i] == primary_id)
 					{
-						output_id = res->outputs[i];
 						crtc_x = crtc->x;
 						crtc_y = crtc->y;	
+						output_id = res->outputs[i];
+						
+						XRRFreeCrtcInfo(crtc);
+						XRRFreeOutputInfo(output);
 						break;
 					}
 					

From 5ed8358505b4f75d70bca8e8fb6d18d77730b70f Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sat, 16 Aug 2014 15:26:39 -0400
Subject: [PATCH 023/248] Misc fixes, null crash on invalid billboards, some
 non-weather particle emitters incorrectly created with Y randomization

---
 src/graphics/particle_emitter.cpp | 2 +-
 src/graphics/stkbillboard.cpp     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/graphics/particle_emitter.cpp b/src/graphics/particle_emitter.cpp
index 266bdda45..201921afe 100644
--- a/src/graphics/particle_emitter.cpp
+++ b/src/graphics/particle_emitter.cpp
@@ -450,7 +450,7 @@ void ParticleEmitter::setParticleType(const ParticleKind* type)
         else
         {
             if (m_is_glsl)
-                m_node = ParticleSystemProxy::addParticleNode(m_is_glsl, true);
+                m_node = ParticleSystemProxy::addParticleNode(m_is_glsl, false);
             else
                 m_node = irr_driver->addParticleNode();
             
diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stkbillboard.cpp
index d2713f032..b04d65e5e 100644
--- a/src/graphics/stkbillboard.cpp
+++ b/src/graphics/stkbillboard.cpp
@@ -47,6 +47,8 @@ void STKBillboard::render()
     core::vector3df pos = getAbsolutePosition();
     glBindVertexArray(billboardvao);
     video::ITexture *tex = Material.getTexture(0);
+    if (tex == NULL)
+        return;
     compressTexture(tex, true, true);
     GLuint texid = getTextureGLuint(tex);
     setTexture(0, texid, GL_LINEAR, GL_LINEAR);

From 9992f3afa66722254b537b89e1841edc5aadb8fc Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sat, 16 Aug 2014 15:42:35 -0400
Subject: [PATCH 024/248] bugfix

---
 src/guiengine/widgets/button_widget.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/guiengine/widgets/button_widget.cpp b/src/guiengine/widgets/button_widget.cpp
index feb18af83..01016b2be 100644
--- a/src/guiengine/widgets/button_widget.cpp
+++ b/src/guiengine/widgets/button_widget.cpp
@@ -43,6 +43,8 @@ void ButtonWidget::add()
     m_id = m_element->getID();
     m_element->setTabOrder(m_id);
     m_element->setTabGroup(false);
+    if (!m_is_visible)
+        m_element->setVisible(false);
 }
 
 // -----------------------------------------------------------------------------

From fcb80cdb2c1543ebe00cb21d568ad13b55c04d31 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 17 Aug 2014 19:33:45 -0400
Subject: [PATCH 025/248] Update thunderbird to have new-engine-friendly
 traffic light animation

---
 src/graphics/referee.cpp | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/graphics/referee.cpp b/src/graphics/referee.cpp
index ced299263..e757851f2 100644
--- a/src/graphics/referee.cpp
+++ b/src/graphics/referee.cpp
@@ -36,7 +36,6 @@ Vec3                  Referee::m_st_start_offset       = Vec3(-2, 2, 2);
 Vec3                  Referee::m_st_start_rotation     = Vec3(0, 180, 0);
 Vec3                  Referee::m_st_scale              = Vec3(1, 1, 1);
 scene::IAnimatedMesh *Referee::m_st_referee_mesh       = NULL;
-video::ITexture      *Referee::m_st_traffic_lights[3]  = {NULL, NULL, NULL};
 
 // ----------------------------------------------------------------------------
 /** Loads the static mesh.
@@ -93,23 +92,6 @@ void Referee::init()
                         * RAD_TO_DEGREE;
     m_st_start_rotation.setY(m_st_start_rotation.getY()+angle_to_kart);
 
-    std::vector<std::string> colors;
-    node->get("colors", &colors);
-
-    if(colors.size()>3)
-        Log::warn("referee", "Too many colors for referee defined, "
-                             "only first three will be used.");
-    if(colors.size()<3)
-    {
-        Log::fatal("referee",
-                   "Not enough colors for referee defined, aborting.");
-    }
-    for(unsigned int i=0; i<3; i++)
-    {
-        m_st_traffic_lights[i] = irr_driver->getTexture(FileManager::MODEL, colors[i]);
-    }
-
-
     for(unsigned int i=0; i<m_st_referee_mesh->getMeshBufferCount(); i++)
     {
         scene::IMeshBuffer *mb = m_st_referee_mesh->getMeshBuffer(i);
@@ -119,7 +101,7 @@ void Referee::init()
 
         std::string name=StringUtils::getBasename(t->getName()
                                                   .getInternalName().c_str());
-        if(name==colors[0] || name==colors[1] ||name==colors[2] )
+        if (name == "traffic_light.png")
         {
             m_st_traffic_buffer = i;
             break;
@@ -232,9 +214,12 @@ void Referee::removeFromSceneGraph()
  */
 void Referee::selectReadySetGo(int rsg)
 {
-    if(m_st_traffic_buffer<0) return;
-    video::SMaterial &m = m_scene_node->getMesh()->getMeshBuffer(m_st_traffic_buffer)->getMaterial();
-    m.setTexture(0, m_st_traffic_lights[rsg]);
+    if (m_st_traffic_buffer < 0)
+        return;
+    video::SMaterial &m = m_scene_node->getMaterial(m_st_traffic_buffer); // m_scene_node->getMesh()->getMeshBuffer(m_st_traffic_buffer)->getMaterial();
+
+    core::matrix4* matrix = &m.getTextureMatrix(0);
+    matrix->setTextureTranslate(0.0f, rsg*0.333f);
 
     // disable lighting, we need to see the traffic light even if facing away
     // from the sun

From b2a936c8cd75c3b1db3667fc584a7b4dc9826ebb Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 18 Aug 2014 22:42:27 +1000
Subject: [PATCH 026/248] Fix crash caused when downloading requests for icons
 were still executing at game end.

---
 src/main.cpp                   | 5 ++++-
 src/online/request_manager.cpp | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 8bc70861a..5f883661e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1436,7 +1436,6 @@ static void cleanSuperTuxKart()
     Referee::cleanup();
     if(ReplayPlay::get())       ReplayPlay::destroy();
     if(race_manager)            delete race_manager;
-    if(addons_manager)          delete addons_manager;
     if(grand_prix_manager)      delete grand_prix_manager;
     if(highscore_manager)       delete highscore_manager;
     if(attachment_manager)      delete attachment_manager;
@@ -1476,6 +1475,10 @@ static void cleanSuperTuxKart()
     }
     Online::RequestManager::deallocate();
 
+    // The addons manager might still be called from a currenty running request
+    // in the request manager, so it can not be deleted earlier.
+    if(addons_manager)  delete addons_manager;
+
     // FIXME: do we need to wait for threads there, can they be
     // moved further up?
     Online::ServersManager::deallocate();
diff --git a/src/online/request_manager.cpp b/src/online/request_manager.cpp
index 7dea5ab8e..a8ab28ee5 100644
--- a/src/online/request_manager.cpp
+++ b/src/online/request_manager.cpp
@@ -221,7 +221,9 @@ namespace Online
 
             me->m_request_queue.unlock();
             me->m_current_request->execute();
-            me->addResult(me->m_current_request);
+            // This test is necessary in case that execute() was aborted
+            // (otherwise the assert in addResult will be triggered).
+            if (!me->getAbort()) me->addResult(me->m_current_request);
             me->m_request_queue.lock();
         } // while handle all requests
 

From fe62df253dc4825091e2f3665e826df6389aabfc Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 18 Aug 2014 22:43:26 +1000
Subject: [PATCH 027/248] Exit quicker if a request is being executed when stk
 is quit.

---
 src/online/request.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/online/request.cpp b/src/online/request.cpp
index 48919a159..b3d919242 100644
--- a/src/online/request.cpp
+++ b/src/online/request.cpp
@@ -60,9 +60,14 @@ namespace Online
     void Request::execute()
     {
         assert(isBusy());
+        // Abort as early as possible if abort is requested
+        if(RequestManager::get()->getAbort()) return;
         prepareOperation();
+        if(RequestManager::get()->getAbort()) return;
         operation();
+        if(RequestManager::get()->getAbort()) return;
         setExecuted();
+        if(RequestManager::get()->getAbort()) return;
         afterOperation();
     }   // execute
 

From 2f6424c3a2f561d2773c04575b858c05a8bc7d1c Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Mon, 18 Aug 2014 15:11:51 +0200
Subject: [PATCH 028/248] replace unecessary NULL-checks

---
 .../grand_prix_editor_screen.cpp              | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/states_screens/grand_prix_editor_screen.cpp b/src/states_screens/grand_prix_editor_screen.cpp
index 784408889..64bb9449f 100644
--- a/src/states_screens/grand_prix_editor_screen.cpp
+++ b/src/states_screens/grand_prix_editor_screen.cpp
@@ -205,6 +205,9 @@ void GrandPrixEditorScreen::loadGPList()
     // Reset GP list everytime (accounts for locking changes, etc.)
     gplist_widget->clearItems();
 
+    // ensures that no GP and no track is NULL
+    grand_prix_manager->checkConsistency();
+
     // Build GP list
     for (unsigned int i = 0; i < grand_prix_manager->getNumberOfGrandPrix(); i++)
     {
@@ -215,23 +218,7 @@ void GrandPrixEditorScreen::loadGPList()
         for (unsigned int t=0; t<tracks.size(); t++)
         {
             Track* track = track_manager->getTrack(tracks[t]);
-            if (track == NULL)
-            {
-                Log::warn("GrandPrixEditor",
-                    "Grand Prix '%s' refers to track '%s', which does not exist\n",
-                    gp->getId().c_str(), tracks[t].c_str());
-            }
-            else
-            {
-                sshot_files.push_back(track->getScreenshotFile());
-            }
-        }
-        if (sshot_files.size() == 0)
-        {
-            Log::warn("GrandPrixEditor",
-                "Grand Prix '%s' does not contain any valid track\n",
-                gp->getId().c_str());
-            sshot_files.push_back("gui/main_help.png");
+            sshot_files.push_back(track->getScreenshotFile());
         }
 
         gplist_widget->addAnimatedItem(translations->fribidize(gp->getName()), gp->getId(),

From e400b5c212034b2e011c057f65219629cb068dd8 Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Mon, 18 Aug 2014 15:15:22 +0200
Subject: [PATCH 029/248] improve readability

---
 src/states_screens/edit_gp_screen.cpp | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/states_screens/edit_gp_screen.cpp b/src/states_screens/edit_gp_screen.cpp
index 8ce3a6490..a9a3b66d4 100644
--- a/src/states_screens/edit_gp_screen.cpp
+++ b/src/states_screens/edit_gp_screen.cpp
@@ -103,20 +103,17 @@ void EditGPScreen::eventCallback(GUIEngine::Widget* widget, const std::string& n
                 setModified(true);
             }
         }
-        else if (m_action == "add" || m_action == "edit")
+        else if (m_action == "edit")
         {
-            if (m_action == "edit")
-            {
-                edit();
-            }
-            else
-            {
-                EditTrackScreen* edit = EditTrackScreen::getInstance();
-                assert(edit != NULL);
-                //By default, 3 laps and no reversing
-                edit->setSelection(NULL, 3, false);
-                StateManager::get()->pushScreen(edit);
-            }
+            edit();
+        }
+        else if (m_action == "add")
+        {
+            EditTrackScreen* edit = EditTrackScreen::getInstance();
+            assert(edit != NULL);
+            //By default, 3 laps and no reversing
+            edit->setSelection(NULL, 3, false);
+            StateManager::get()->pushScreen(edit);
         }
         else if (m_action == "remove")
         {

From 33686e9abc73c07b525eb217e1f5263ee537cacf Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Mon, 18 Aug 2014 15:16:53 +0200
Subject: [PATCH 030/248] make gp editor use default number of laps

---
 src/states_screens/edit_track_screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/states_screens/edit_track_screen.cpp b/src/states_screens/edit_track_screen.cpp
index a01bfc7c4..ed2667c2d 100644
--- a/src/states_screens/edit_track_screen.cpp
+++ b/src/states_screens/edit_track_screen.cpp
@@ -234,7 +234,7 @@ void EditTrackScreen::selectTrack(const std::string& id)
         tracks->setSelection("", PLAYER_ID_GAME_MASTER, true);
         selected_track->setText(_("Select a track"), true);
 
-        laps->setValue(3);
+        laps->setValue(m_track->getDefaultNumberOfLaps());
 
         reverse->setVisible(true);
         reverse->setState(false);

From 0dc34b2c0de9edd04bf588cedca8950ab4d6334c Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 18 Aug 2014 20:55:27 +0200
Subject: [PATCH 031/248] xrandr: few more checks

- try to run in windowed mode if no output was found
 - close display correctly in case of no output
 - add few warnings
---
 .../source/Irrlicht/CIrrDeviceLinux.cpp       | 78 +++++++++----------
 1 file changed, 35 insertions(+), 43 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
index 13f254236..5989cd35b 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
@@ -340,8 +340,9 @@ bool CIrrDeviceLinux::switchToFullscreen(bool reset)
 	{
 		XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display));
 
-		if (!res)
+		if (!res || output_id == BadRRMode)
 		{
+			os::Printer::log("Could not get video output. Try to run in windowed mode.", ELL_WARNING);
 			CreationParams.Fullscreen = false;
 			return CreationParams.Fullscreen;
 		}
@@ -349,31 +350,28 @@ bool CIrrDeviceLinux::switchToFullscreen(bool reset)
 		XRROutputInfo* output = XRRGetOutputInfo(display, res, output_id);
 		XRRCrtcInfo* crtc = XRRGetCrtcInfo(display, res, output->crtc);
 		float refresh_rate, refresh_rate_new;
-		unsigned int mode0_width = -1, mode0_height = -1;
+		core::dimension2d<u32> mode0_size = core::dimension2d<u32>(0, 0);
 
 		for (int i = 0; i < res->nmode; i++)
 		{
 			const XRRModeInfo* mode = &res->modes[i];
-			unsigned int w, h;
-			
+			core::dimension2d<u32> size;
+
 			if (crtc->rotation & (XRANDR_ROTATION_LEFT|XRANDR_ROTATION_RIGHT))
 			{
-				w = mode->height;
-				h = mode->width;
+				size = core::dimension2d<u32>(mode->height, mode->width);
 			} 
 			else 
 			{
-				w = mode->width;
-				h = mode->height;
+				size = core::dimension2d<u32>(mode->width, mode->height);
 			}
 			
 			if (bestMode == -1 && mode->id == output->modes[0])
 			{
-				mode0_width = w;
-				mode0_height = h;
+				mode0_size = size;
 			}
 
-			if (bestMode == -1 && w == Width && h == Height)
+			if (bestMode == -1 && size.Width == Width && size.Height == Height)
 			{
 				for (int j = 0; j < output->nmode; j++)
 				{
@@ -385,7 +383,7 @@ bool CIrrDeviceLinux::switchToFullscreen(bool reset)
 					}
 				}
 			}
-			else if (bestMode != -1 && w == Width && h == Height)
+			else if (bestMode != -1 && size.Width == Width && size.Height == Height)
 			{
 				refresh_rate_new = (mode->dotClock * 1000.0) / (mode->hTotal * mode->vTotal);
 
@@ -408,8 +406,8 @@ bool CIrrDeviceLinux::switchToFullscreen(bool reset)
 		if (bestMode == -1)
 		{
 			bestMode = 0;
-			Width = mode0_width;
-			Height = mode0_height;
+			Width = mode0_size.Width;
+			Height = mode0_size.Height;
 		}
 
 		Status s = XRRSetCrtcConfig(display, res, output->crtc, CurrentTime,
@@ -1595,16 +1593,17 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 			else
 			#endif
 			#ifdef _IRR_LINUX_X11_RANDR_
-			if (XRRQueryExtension(display, &eventbase, &errorbase))
+			while (XRRQueryExtension(display, &eventbase, &errorbase))
 			{
+				XRROutputInfo* output = NULL;
+				XRRCrtcInfo* crtc = NULL;
+				crtc_x = crtc_y = -1;
+				output_id = BadRRMode;
+
 				XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display));
 
 				if (!res)
-					return &VideoModeList;
-
-				XRROutputInfo *output = NULL;
-				XRRCrtcInfo* crtc = NULL;
-				crtc_x = crtc_y = -1;
+					break;
 				
 				RROutput primary_id = XRRGetOutputPrimary(display, DefaultRootWindow(display));
 		
@@ -1654,40 +1653,35 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 					XRRFreeCrtcInfo(crtc);
 					XRRFreeOutputInfo(output);
 				}
+				
+				if (output_id == BadRRMode)
+				{
+					os::Printer::log("Could not get video output.", ELL_WARNING);
+					break;
+				}
 
 				output = XRRGetOutputInfo(display, res, output_id);
 				crtc = XRRGetCrtcInfo(display, res, output->crtc);
 
-				if (crtc == NULL)
-				{
-					XRRFreeCrtcInfo(crtc);
-					XRRFreeOutputInfo(output);
-					XRRFreeScreenResources(res);
-					return &VideoModeList;
-				}
-
 				for (int i = 0; i < res->nmode; i++)
 				{
 					const XRRModeInfo* mode = &res->modes[i];
-					unsigned int w, h;
+					core::dimension2d<u32> size;
 
 					if (crtc->rotation & (XRANDR_ROTATION_LEFT|XRANDR_ROTATION_RIGHT))
 					{
-						w = mode->height;
-						h = mode->width;
+						size = core::dimension2d<u32>(mode->height, mode->width);
 					} 
 					else 
 					{
-						w = mode->width;
-						h = mode->height;
+						size = core::dimension2d<u32>(mode->width, mode->height);
 					}
 
 					for (int j = 0; j < output->nmode; j++)
 					{            
 						if (mode->id == output->modes[j])
 						{
-							VideoModeList.addMode(core::dimension2d<u32>(
-									w, h), defaultDepth);
+							VideoModeList.addMode(size, defaultDepth);
 							break;
 						}
 					}
@@ -1695,21 +1689,19 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 					if (mode->id == crtc->mode)
 					{
 						old_mode = crtc->mode;
-						VideoModeList.setDesktop(defaultDepth,
-							core::dimension2d<u32>(w, h));
+						VideoModeList.setDesktop(defaultDepth, size);
 					}
 				}
-
+				
 				XRRFreeCrtcInfo(crtc);
 				XRRFreeOutputInfo(output);
-				XRRFreeScreenResources(res);
+				XRRFreeScreenResources(res);	
+							
+				break;
 			}
-			else
 			#endif
-			{
-				os::Printer::log("VidMode or RandR X11 extension requireed for VideoModeList." , ELL_WARNING);
-			}
 		}
+	
 		if (display && temporaryDisplay)
 		{
 			XCloseDisplay(display);

From da90ea491e25261519421452be97ff8a9822414a Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 19 Aug 2014 01:36:06 +0200
Subject: [PATCH 032/248] Unlit material supports tex matrix

---
 src/graphics/render_geometry.cpp | 2 +-
 src/graphics/shaders.cpp         | 2 +-
 src/graphics/shaders.hpp         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index e589d9453..0496fbc44 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -394,7 +394,7 @@ void IrrDriver::renderSolidSecondPass()
             TexUnit(MeshShader::GrassPass2Shader::getInstance()->TU_Albedo, true)
         ), ListMatGrass::getInstance());
 
-        renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 1>(TexUnits(
+        renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(MeshShader::ObjectUnlitShader::getInstance()->TU_tex, true)
         ), ListMatUnlit::getInstance());
 
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index d299b4668..deafb7575 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -813,7 +813,7 @@ namespace MeshShader
         Program = LoadProgram(
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_unlit.frag").c_str());
-        AssignUniforms("ModelMatrix");
+        AssignUniforms("ModelMatrix", "TextureMatrix");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 606070ff4..3f9babc24 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -261,7 +261,7 @@ public:
     DetailledObjectPass2Shader();
 };
 
-class ObjectUnlitShader : public ShaderHelperSingleton<ObjectUnlitShader, core::matrix4>
+class ObjectUnlitShader : public ShaderHelperSingleton<ObjectUnlitShader, core::matrix4, core::matrix4>
 {
 public:
     GLuint TU_tex;

From 9af41a5166a2eafea3919d4ba30af4e92031e3b6 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Mon, 18 Aug 2014 20:01:45 -0400
Subject: [PATCH 033/248] Add actual light under thunderbird

---
 src/graphics/light.hpp           |  1 +
 src/graphics/referee.cpp         | 35 ++++++++++++++++++++++++++++++++
 src/graphics/referee.hpp         |  2 ++
 src/graphics/render_lighting.cpp |  3 +++
 4 files changed, 41 insertions(+)

diff --git a/src/graphics/light.hpp b/src/graphics/light.hpp
index 8af5d7009..1ecb3c119 100644
--- a/src/graphics/light.hpp
+++ b/src/graphics/light.hpp
@@ -59,6 +59,7 @@ public:
     float getEnergy() const { return m_energy; }
     float getEffectiveEnergy() const { return m_energy_multiplier * m_energy; }
     core::vector3df getColor() const { return core::vector3df(m_color[0], m_color[1], m_color[2]); }
+    void setColor(float r, float g, float b) { m_color[0] = r; m_color[1] = g; m_color[2] = b; }
 
     float getEnergyMultiplier() const { return m_energy_multiplier; }
     void setEnergyMultiplier(float newval) { m_energy_multiplier = newval; }
diff --git a/src/graphics/referee.cpp b/src/graphics/referee.cpp
index e757851f2..8dc78b7e1 100644
--- a/src/graphics/referee.cpp
+++ b/src/graphics/referee.cpp
@@ -19,6 +19,7 @@
 #include "graphics/referee.hpp"
 
 #include "graphics/irr_driver.hpp"
+#include "graphics/light.hpp"
 #include "graphics/mesh_tools.hpp"
 #include "karts/abstract_kart.hpp"
 #include "io/file_manager.hpp"
@@ -148,6 +149,16 @@ Referee::Referee()
                                m_st_last_start_frame);
 
     irr_driver->applyObjectPassShader(m_scene_node);
+
+    if (irr_driver->isGLSL() && UserConfigParams::m_dynamic_lights)
+    {
+        m_light = irr_driver->addLight(core::vector3df(0.0f, 0.0f, 0.6f), 0.7f, 2.0f,
+            0.7f /* r */, 0.0 /* g */, 0.0f /* b */, false /* sun */, m_scene_node);
+    }
+    else
+    {
+        m_light = NULL;
+    }
 }   // Referee
 
 // ----------------------------------------------------------------------------
@@ -194,6 +205,9 @@ void Referee::attachToSceneNode()
     if(!m_scene_node->getParent())
         m_scene_node->setParent(irr_driver->getSceneManager()
                                           ->getRootSceneNode());
+
+    if (m_light != NULL)
+        m_light->setVisible(true);
 }   // attachToSceneNode
 
 // ----------------------------------------------------------------------------
@@ -205,6 +219,8 @@ void Referee::removeFromSceneGraph()
 {
     if(isAttached())
         irr_driver->removeNode(m_scene_node);
+    if (m_light != NULL)
+        m_light->setVisible(false);
 }   // removeFromSceneGraph
 
 // ----------------------------------------------------------------------------
@@ -218,9 +234,28 @@ void Referee::selectReadySetGo(int rsg)
         return;
     video::SMaterial &m = m_scene_node->getMaterial(m_st_traffic_buffer); // m_scene_node->getMesh()->getMeshBuffer(m_st_traffic_buffer)->getMaterial();
 
+    //if (irr_driver->isGLSL() && UserConfigParams::m_dynamic_lights)
+    //    m.MaterialType = irr_driver->getShader(ES_OBJECT_UNLIT);
+
     core::matrix4* matrix = &m.getTextureMatrix(0);
     matrix->setTextureTranslate(0.0f, rsg*0.333f);
 
+    if (m_light != NULL)
+    {
+        if (rsg == 0)
+        {
+            ((LightNode*)m_light)->setColor(0.6f, 0.0f, 0.0f);
+        }
+        else if (rsg == 1)
+        {
+            ((LightNode*)m_light)->setColor(0.7f, 0.23f, 0.0f);
+        }
+        else if (rsg == 2)
+        {
+            ((LightNode*)m_light)->setColor(0.0f, 0.6f, 0.0f);
+        }
+    }
+
     // disable lighting, we need to see the traffic light even if facing away
     // from the sun
     m.AmbientColor  = video::SColor(255, 255, 255, 255);
diff --git a/src/graphics/referee.hpp b/src/graphics/referee.hpp
index 93941f051..754d5ef86 100644
--- a/src/graphics/referee.hpp
+++ b/src/graphics/referee.hpp
@@ -79,6 +79,8 @@ private:
     /** The scene node for an instance of the referee. */
     scene::IAnimatedMeshSceneNode *m_scene_node;
 
+    scene::ISceneNode* m_light;
+
 public:
                 Referee();
                 Referee(const AbstractKart &kart);
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index d53416f87..0067a857f 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -68,6 +68,9 @@ unsigned IrrDriver::UpdateLightsInfo(scene::ICameraSceneNode * const camnode, fl
     std::vector<LightNode *> BucketedLN[15];
     for (unsigned int i = 0; i < lightcount; i++)
     {
+        if (!m_lights[i]->isVisible())
+            continue;
+
         if (!m_lights[i]->isPointLight())
         {
             m_lights[i]->render();

From bdd7951c462f6d853313d73b020591831f040ce4 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Mon, 18 Aug 2014 09:21:58 +0200
Subject: [PATCH 034/248] Split animated meshes list from the others

---
 src/graphics/render_geometry.cpp | 31 +++++++++++++++++++++++++++++++
 src/graphics/stkanimatedmesh.cpp |  8 ++++----
 src/graphics/stkmesh.hpp         | 11 +++++++++++
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 0496fbc44..b18b339aa 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -222,6 +222,10 @@ void IrrDriver::renderSolidFirstPass()
     ListInstancedMatAlphaRef::getInstance()->clear();
     ListInstancedMatGrass::getInstance()->clear();
     ListInstancedMatNormalMap::getInstance()->clear();
+    AnimatedListMatDefault::getInstance()->clear();
+    AnimatedListMatAlphaRef::getInstance()->clear();
+    AnimatedListMatDetails::getInstance()->clear();
+    AnimatedListMatUnlit::getInstance()->clear();
     // Add a 30 ms timeout
     GLenum reason = glClientWaitSync(m_sync, GL_SYNC_FLUSH_COMMANDS_BIT, 30000000);
 /*    switch (reason)
@@ -260,6 +264,11 @@ void IrrDriver::renderSolidFirstPass()
             TexUnit(MeshShader::NormalMapShader::getInstance()->TU_normalmap, false)
         ), ListMatNormalMap::getInstance());
 
+        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_STANDARD, 2, 1>(object_pass1_texunits, AnimatedListMatDefault::getInstance());
+        renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(MeshShader::ObjectRefPass1Shader::getInstance()->TU_tex, true)), AnimatedListMatAlphaRef::getInstance());
+        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_2TCOORDS, 2, 1>(object_pass1_texunits, AnimatedListMatDetails::getInstance());
+        renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(object_pass1_texunits, AnimatedListMatUnlit::getInstance());
+
         renderInstancedMeshes1stPass<MeshShader::InstancedObjectPass1Shader, video::EVT_STANDARD>(
                     TexUnits(TexUnit(MeshShader::InstancedObjectPass1Shader::getInstance()->TU_tex, true)),
                     ListInstancedMatDefault::getInstance());
@@ -376,10 +385,16 @@ void IrrDriver::renderSolidSecondPass()
         renderMeshes2ndPass<MeshShader::ObjectPass2Shader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(MeshShader::ObjectPass2Shader::getInstance()->TU_Albedo, true)
         ), ListMatDefault::getInstance());
+        renderMeshes2ndPass<MeshShader::ObjectPass2Shader, video::EVT_STANDARD, 3, 1>(TexUnits(
+            TexUnit(MeshShader::ObjectPass2Shader::getInstance()->TU_Albedo, true)
+            ), AnimatedListMatDefault::getInstance());
 
         renderMeshes2ndPass<MeshShader::ObjectRefPass2Shader, video::EVT_STANDARD, 3, 1 >(TexUnits(
             TexUnit(MeshShader::ObjectRefPass2Shader::getInstance()->TU_Albedo, true)
         ), ListMatAlphaRef::getInstance());
+        renderMeshes2ndPass<MeshShader::ObjectRefPass2Shader, video::EVT_STANDARD, 3, 1 >(TexUnits(
+            TexUnit(MeshShader::ObjectRefPass2Shader::getInstance()->TU_Albedo, true)
+            ), AnimatedListMatAlphaRef::getInstance());
 
         renderMeshes2ndPass<MeshShader::SphereMapShader, video::EVT_STANDARD, 2, 1>(TexUnits(
             TexUnit(MeshShader::SphereMapShader::getInstance()->TU_tex, true)
@@ -389,6 +404,10 @@ void IrrDriver::renderSolidSecondPass()
             TexUnit(MeshShader::DetailledObjectPass2Shader::getInstance()->TU_Albedo, true),
             TexUnit(MeshShader::DetailledObjectPass2Shader::getInstance()->TU_detail, true)
         ), ListMatDetails::getInstance());
+        renderMeshes2ndPass<MeshShader::DetailledObjectPass2Shader, video::EVT_2TCOORDS, 1>(TexUnits(
+            TexUnit(MeshShader::DetailledObjectPass2Shader::getInstance()->TU_Albedo, true),
+            TexUnit(MeshShader::DetailledObjectPass2Shader::getInstance()->TU_detail, true)
+            ), AnimatedListMatDetails::getInstance());
 
         renderMeshes2ndPass<MeshShader::GrassPass2Shader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(MeshShader::GrassPass2Shader::getInstance()->TU_Albedo, true)
@@ -397,6 +416,9 @@ void IrrDriver::renderSolidSecondPass()
         renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(MeshShader::ObjectUnlitShader::getInstance()->TU_tex, true)
         ), ListMatUnlit::getInstance());
+        renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 1>(TexUnits(
+            TexUnit(MeshShader::ObjectUnlitShader::getInstance()->TU_tex, true)
+            ), AnimatedListMatUnlit::getInstance());
 
         renderMeshes2ndPass<MeshShader::SplattingShader, video::EVT_2TCOORDS, 1>(TexUnits(
             TexUnit(8, true),
@@ -715,6 +737,10 @@ void IrrDriver::renderShadows()
     ListInstancedMatAlphaRef::getInstance()->clear();
     ListInstancedMatGrass::getInstance()->clear();
     ListInstancedMatNormalMap::getInstance()->clear();
+    AnimatedListMatDefault::getInstance()->clear();
+    AnimatedListMatAlphaRef::getInstance()->clear();
+    AnimatedListMatDetails::getInstance()->clear();
+    AnimatedListMatUnlit::getInstance()->clear();
     m_scene_manager->drawAll(scene::ESNRP_SOLID);
 
     std::vector<GLuint> noTexUnits;
@@ -727,6 +753,11 @@ void IrrDriver::renderShadows()
     renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ MeshShader::RefShadowShader::getInstance()->TU_tex }, ListMatUnlit::getInstance());
     renderShadow<MeshShader::GrassShadowShader, EVT_STANDARD, 3, 1>(std::vector<GLuint>{ MeshShader::GrassShadowShader::getInstance()->TU_tex }, ListMatGrass::getInstance());
 
+    renderShadow<MeshShader::ShadowShader, EVT_STANDARD, 1>(noTexUnits, AnimatedListMatDefault::getInstance());
+    renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ MeshShader::RefShadowShader::getInstance()->TU_tex }, AnimatedListMatAlphaRef::getInstance());
+    renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ MeshShader::RefShadowShader::getInstance()->TU_tex }, AnimatedListMatUnlit::getInstance());
+    renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, AnimatedListMatDetails::getInstance());
+
     renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, ListInstancedMatDefault::getInstance());
     renderInstancedShadow<MeshShader::InstancedRefShadowShader>(std::vector<GLuint>{ MeshShader::InstancedRefShadowShader::getInstance()->TU_tex }, ListInstancedMatAlphaRef::getInstance());
     renderInstancedShadow<MeshShader::InstancedGrassShadowShader, 2>(std::vector<GLuint>{ MeshShader::InstancedGrassShadowShader::getInstance()->TU_tex }, ListInstancedMatGrass::getInstance());
diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stkanimatedmesh.cpp
index 3c4aacc04..e88550d38 100644
--- a/src/graphics/stkanimatedmesh.cpp
+++ b/src/graphics/stkanimatedmesh.cpp
@@ -146,16 +146,16 @@ void STKAnimatedMesh::render()
 
         GLMesh* mesh;
         for_in(mesh, MeshSolidMaterial[MAT_DEFAULT])
-            pushVector(ListMatDefault::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
+            pushVector(AnimatedListMatDefault::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
 
         for_in(mesh, MeshSolidMaterial[MAT_ALPHA_REF])
-            pushVector(ListMatAlphaRef::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
+            pushVector(AnimatedListMatAlphaRef::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
 
         for_in(mesh, MeshSolidMaterial[MAT_DETAIL])
-            pushVector(ListMatDetails::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
+            pushVector(AnimatedListMatDetails::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
 
         for_in(mesh, MeshSolidMaterial[MAT_UNLIT])
-            pushVector(ListMatUnlit::getInstance(), mesh, AbsoluteTransformation, core::matrix4::EM4CONST_IDENTITY, mesh->TextureMatrix);
+            pushVector(AnimatedListMatUnlit::getInstance(), mesh, AbsoluteTransformation, core::matrix4::EM4CONST_IDENTITY, mesh->TextureMatrix);
 
         return;
     }
diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stkmesh.hpp
index d95933029..43f42c5a3 100644
--- a/src/graphics/stkmesh.hpp
+++ b/src/graphics/stkmesh.hpp
@@ -65,9 +65,15 @@ class MeshList : public Singleton<T>, public std::vector<STK::Tuple<Args...> >
 class ListMatDefault : public MeshList<ListMatDefault, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
+class AnimatedListMatDefault : public MeshList<AnimatedListMatDefault, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
+{};
+
 class ListMatAlphaRef : public MeshList<ListMatAlphaRef, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
+class AnimatedListMatAlphaRef : public MeshList<AnimatedListMatAlphaRef, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
+{};
+
 class ListMatNormalMap : public MeshList<ListMatNormalMap, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
@@ -83,9 +89,14 @@ class ListMatSplatting : public MeshList<ListMatSplatting, GLMesh *, core::matri
 class ListMatUnlit : public MeshList<ListMatUnlit, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
+class AnimatedListMatUnlit : public MeshList<AnimatedListMatUnlit, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
+{};
+
 class ListMatDetails : public MeshList<ListMatDetails, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
+class AnimatedListMatDetails : public MeshList<AnimatedListMatDetails, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
+{};
 
 class ListBlendTransparent : public MeshList<ListBlendTransparent, GLMesh *, core::matrix4, core::matrix4>
 {};

From da843cc8c143841cef72ad26cacf8ddc5ab76ee9 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sat, 16 Aug 2014 21:13:23 +0200
Subject: [PATCH 035/248] Add sampler object support

---
 src/graphics/glwrap.cpp | 8 ++++++++
 src/graphics/glwrap.hpp | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 7387b9d8f..0cd8d2449 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -83,6 +83,10 @@ PFNGLTEXSTORAGE2DPROC glTexStorage2D;
 PFNGLTEXSTORAGE3DPROC glTexStorage3D;
 PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
 PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
+PFNGLGENSAMPLERSPROC glGenSamplers;
+PFNGLBINDSAMPLERPROC glBindSampler;
+PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
+PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
 #endif
 
 static bool is_gl_init = false;
@@ -249,6 +253,10 @@ void initGL()
     glTexStorage3D = (PFNGLTEXSTORAGE3DPROC)IRR_OGL_LOAD_EXTENSION("glTexStorage3D");
     glBindImageTexture = (PFNGLBINDIMAGETEXTUREPROC)IRR_OGL_LOAD_EXTENSION("glBindImageTexture");
     glDispatchCompute = (PFNGLDISPATCHCOMPUTEPROC)IRR_OGL_LOAD_EXTENSION("glDispatchCompute");
+    glGenSamplers = (PFNGLGENSAMPLERSPROC)IRR_OGL_LOAD_EXTENSION("glGenSamplers");
+    glBindSampler = (PFNGLBINDSAMPLERPROC)IRR_OGL_LOAD_EXTENSION("glBindSampler");
+    glSamplerParameterf = (PFNGLSAMPLERPARAMETERFPROC)IRR_OGL_LOAD_EXTENSION("glSamplerParameterf");
+    glSamplerParameteri = (PFNGLSAMPLERPARAMETERIPROC)IRR_OGL_LOAD_EXTENSION("glSamplerParameteri");
 #ifdef DEBUG
     glDebugMessageCallbackARB = (PFNGLDEBUGMESSAGECALLBACKARBPROC)IRR_OGL_LOAD_EXTENSION("glDebugMessageCallbackARB");
 #endif
diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index 2ed1994e1..9c63f79f2 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -108,6 +108,10 @@ extern PFNGLTEXSTORAGE2DPROC glTexStorage2D;
 extern PFNGLTEXSTORAGE3DPROC glTexStorage3D;
 extern PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
 extern PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
+extern PFNGLGENSAMPLERSPROC glGenSamplers;
+extern PFNGLBINDSAMPLERPROC glBindSampler;
+extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
+extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
 #ifdef DEBUG
 extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
 #endif

From bd7ec06d49fb3d594841160dab50ecaa3c43f81a Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Tue, 19 Aug 2014 16:52:43 +0200
Subject: [PATCH 036/248] Fix build

---
 src/graphics/render_geometry.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index b18b339aa..9f23b18fc 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -416,7 +416,7 @@ void IrrDriver::renderSolidSecondPass()
         renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(MeshShader::ObjectUnlitShader::getInstance()->TU_tex, true)
         ), ListMatUnlit::getInstance());
-        renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 1>(TexUnits(
+        renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(MeshShader::ObjectUnlitShader::getInstance()->TU_tex, true)
             ), AnimatedListMatUnlit::getInstance());
 

From 30c91217a7afb47ce75cc0ff62877f7afad4b701 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 19 Aug 2014 03:10:02 +0200
Subject: [PATCH 037/248] Factorize gl headers include in a separate file.

It should avoid conflict with Xorg headers
---
 src/graphics/gl_headers.hpp | 115 ++++++++++++++++++++++++++++++++++++
 src/graphics/glwrap.hpp     | 108 +--------------------------------
 src/graphics/shaders.cpp    |   5 ++
 src/graphics/shaders.hpp    |  31 ++++------
 4 files changed, 133 insertions(+), 126 deletions(-)
 create mode 100644 src/graphics/gl_headers.hpp

diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp
new file mode 100644
index 000000000..21d092693
--- /dev/null
+++ b/src/graphics/gl_headers.hpp
@@ -0,0 +1,115 @@
+#ifndef GL_HEADER_HPP
+#define GL_HEADER_HPP
+
+#if defined(__APPLE__)
+#    include <OpenGL/gl.h>
+#    include <OpenGL/gl3.h>
+#    define OGL32CTX
+#    ifdef GL_ARB_instanced_arrays
+#        define glVertexAttribDivisor glVertexAttribDivisorARB
+#    endif
+#    ifndef GL_TEXTURE_SWIZZLE_RGBA
+#        define GL_TEXTURE_SWIZZLE_RGBA 0x8E46
+#    endif
+#elif defined(ANDROID)
+#    include <GLES/gl.h>
+#elif defined(WIN32)
+#    define _WINSOCKAPI_
+// has to be included before gl.h because of WINGDIAPI and APIENTRY definitions
+#    include <windows.h>
+#    include <GL/gl.h>
+#    include "../../lib/irrlicht/source/Irrlicht/glext.h"
+#else
+#define GL_GLEXT_PROTOTYPES
+#define DEBUG_OUTPUT_DECLARED
+#    include <GL/gl.h>
+#    include <GL/glext.h>
+#endif
+
+#ifdef WIN32
+extern PFNGLGENTRANSFORMFEEDBACKSPROC glGenTransformFeedbacks;
+extern PFNGLBINDTRANSFORMFEEDBACKPROC glBindTransformFeedback;
+extern PFNGLDRAWTRANSFORMFEEDBACKPROC glDrawTransformFeedback;
+extern PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback;
+extern PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback;
+extern PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings;
+extern PFNGLBINDBUFFERBASEPROC glBindBufferBase;
+extern PFNGLGENBUFFERSPROC glGenBuffers;
+extern PFNGLBINDBUFFERPROC glBindBuffer;
+extern PFNGLBUFFERDATAPROC glBufferData;
+extern PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;
+extern PFNGLCREATESHADERPROC glCreateShader;
+extern PFNGLCOMPILESHADERPROC glCompileShader;
+extern PFNGLSHADERSOURCEPROC glShaderSource;
+extern PFNGLCREATEPROGRAMPROC glCreateProgram;
+extern PFNGLATTACHSHADERPROC glAttachShader;
+extern PFNGLLINKPROGRAMPROC glLinkProgram;
+extern PFNGLUSEPROGRAMPROC glUseProgram;
+extern PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
+extern PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
+extern PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
+extern PFNGLUNIFORMMATRIX4FVPROC glUniformMatrix4fv;
+extern PFNGLUNIFORM1FPROC glUniform1f;
+extern PFNGLUNIFORM3FPROC glUniform3f;
+extern PFNGLUNIFORM1FVPROC glUniform1fv;
+extern PFNGLUNIFORM4FVPROC glUniform4fv;
+extern PFNGLDELETESHADERPROC glDeleteShader;
+extern PFNGLGETSHADERIVPROC glGetShaderiv;
+extern PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
+extern PFNGLACTIVETEXTUREPROC glActiveTexture;
+extern PFNGLUNIFORM2FPROC glUniform2f;
+extern PFNGLUNIFORM1IPROC glUniform1i;
+extern PFNGLUNIFORM3IPROC glUniform3i;
+extern PFNGLUNIFORM4IPROC glUniform4i;
+extern PFNGLGETPROGRAMIVPROC glGetProgramiv;
+extern PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;
+extern PFNGLGETATTRIBLOCATIONPROC glGetAttribLocation;
+extern PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;
+extern PFNGLBLENDEQUATIONPROC glBlendEquation;
+extern PFNGLVERTEXATTRIBDIVISORPROC glVertexAttribDivisor;
+extern PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
+extern PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
+extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
+extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
+extern PFNGLDELETEBUFFERSPROC glDeleteBuffers;
+extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
+extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
+extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
+extern PFNGLTEXBUFFERPROC glTexBuffer;
+extern PFNGLBUFFERSUBDATAPROC glBufferSubData;
+extern PFNGLMAPBUFFERPROC glMapBuffer;
+extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
+extern PFNGLUNMAPBUFFERPROC glUnmapBuffer;
+extern PFNGLFENCESYNCPROC glFenceSync;
+extern PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
+extern PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer;
+extern PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers;
+extern PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers;
+extern PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
+extern PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D;
+extern PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture;
+extern PFNGLTEXIMAGE3DPROC glTexImage3D;
+extern PFNGLGENERATEMIPMAPPROC glGenerateMipmap;
+extern PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus;
+extern PFNGLTEXIMAGE2DMULTISAMPLEPROC glTexImage2DMultisample;
+extern PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
+extern PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
+extern PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
+extern PFNGLBLENDCOLORPROC glBlendColor;
+extern PFNGLCOMPRESSEDTEXIMAGE2DPROC glCompressedTexImage2D;
+extern PFNGLGETCOMPRESSEDTEXIMAGEPROC glGetCompressedTexImage;
+extern PFNGLTEXSTORAGE1DPROC glTexStorage1D;
+extern PFNGLTEXSTORAGE2DPROC glTexStorage2D;
+extern PFNGLTEXSTORAGE3DPROC glTexStorage3D;
+extern PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
+extern PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
+extern PFNGLGENSAMPLERSPROC glGenSamplers;
+extern PFNGLBINDSAMPLERPROC glBindSampler;
+extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
+extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
+#ifdef DEBUG
+extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
+#endif
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index 9c63f79f2..dea33ae85 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -1,28 +1,7 @@
 #ifndef GLWRAP_HEADER_H
 #define GLWRAP_HEADER_H
 
-#if defined(__APPLE__)
-#    include <OpenGL/gl.h>
-#    include <OpenGL/gl3.h>
-#    define OGL32CTX
-#    ifdef GL_ARB_instanced_arrays
-#        define glVertexAttribDivisor glVertexAttribDivisorARB
-#    endif
-#    ifndef GL_TEXTURE_SWIZZLE_RGBA
-#        define GL_TEXTURE_SWIZZLE_RGBA 0x8E46
-#    endif
-#elif defined(ANDROID)
-#    include <GLES/gl.h>
-#elif defined(WIN32)
-#    define _WINSOCKAPI_
-// has to be included before gl.h because of WINGDIAPI and APIENTRY definitions
-#    include <windows.h>
-#    include <GL/gl.h>
-#else
-#define GL_GLEXT_PROTOTYPES
-#define DEBUG_OUTPUT_DECLARED
-#    include <GL/gl.h>
-#endif
+#include "gl_headers.hpp"
 
 #include <vector>
 #include "irr_driver.hpp"
@@ -31,91 +10,6 @@
 // already includes glext.h, which defines useful GL constants.
 // COpenGLDriver has already loaded the extension GL functions we use (e.g glBeginQuery)
 #include "../../lib/irrlicht/source/Irrlicht/COpenGLDriver.h"
-#ifdef WIN32
-extern PFNGLGENTRANSFORMFEEDBACKSPROC glGenTransformFeedbacks;
-extern PFNGLBINDTRANSFORMFEEDBACKPROC glBindTransformFeedback;
-extern PFNGLDRAWTRANSFORMFEEDBACKPROC glDrawTransformFeedback;
-extern PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback;
-extern PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback;
-extern PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings;
-extern PFNGLBINDBUFFERBASEPROC glBindBufferBase;
-extern PFNGLGENBUFFERSPROC glGenBuffers;
-extern PFNGLBINDBUFFERPROC glBindBuffer;
-extern PFNGLBUFFERDATAPROC glBufferData;
-extern PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;
-extern PFNGLCREATESHADERPROC glCreateShader;
-extern PFNGLCOMPILESHADERPROC glCompileShader;
-extern PFNGLSHADERSOURCEPROC glShaderSource;
-extern PFNGLCREATEPROGRAMPROC glCreateProgram;
-extern PFNGLATTACHSHADERPROC glAttachShader;
-extern PFNGLLINKPROGRAMPROC glLinkProgram;
-extern PFNGLUSEPROGRAMPROC glUseProgram;
-extern PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
-extern PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
-extern PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
-extern PFNGLUNIFORMMATRIX4FVPROC glUniformMatrix4fv;
-extern PFNGLUNIFORM1FPROC glUniform1f;
-extern PFNGLUNIFORM3FPROC glUniform3f;
-extern PFNGLUNIFORM1FVPROC glUniform1fv;
-extern PFNGLUNIFORM4FVPROC glUniform4fv;
-extern PFNGLDELETESHADERPROC glDeleteShader;
-extern PFNGLGETSHADERIVPROC glGetShaderiv;
-extern PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
-extern PFNGLACTIVETEXTUREPROC glActiveTexture;
-extern PFNGLUNIFORM2FPROC glUniform2f;
-extern PFNGLUNIFORM1IPROC glUniform1i;
-extern PFNGLUNIFORM3IPROC glUniform3i;
-extern PFNGLUNIFORM4IPROC glUniform4i;
-extern PFNGLGETPROGRAMIVPROC glGetProgramiv;
-extern PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;
-extern PFNGLGETATTRIBLOCATIONPROC glGetAttribLocation;
-extern PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;
-extern PFNGLBLENDEQUATIONPROC glBlendEquation;
-extern PFNGLVERTEXATTRIBDIVISORPROC glVertexAttribDivisor;
-extern PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
-extern PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
-extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
-extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
-extern PFNGLDELETEBUFFERSPROC glDeleteBuffers;
-extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
-extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
-extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
-extern PFNGLTEXBUFFERPROC glTexBuffer;
-extern PFNGLBUFFERSUBDATAPROC glBufferSubData;
-extern PFNGLMAPBUFFERPROC glMapBuffer;
-extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
-extern PFNGLUNMAPBUFFERPROC glUnmapBuffer;
-extern PFNGLFENCESYNCPROC glFenceSync;
-extern PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
-extern PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer;
-extern PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers;
-extern PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers;
-extern PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
-extern PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D;
-extern PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture;
-extern PFNGLTEXIMAGE3DPROC glTexImage3D;
-extern PFNGLGENERATEMIPMAPPROC glGenerateMipmap;
-extern PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus;
-extern PFNGLTEXIMAGE2DMULTISAMPLEPROC glTexImage2DMultisample;
-extern PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
-extern PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
-extern PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
-extern PFNGLBLENDCOLORPROC glBlendColor;
-extern PFNGLCOMPRESSEDTEXIMAGE2DPROC glCompressedTexImage2D;
-extern PFNGLGETCOMPRESSEDTEXIMAGEPROC glGetCompressedTexImage;
-extern PFNGLTEXSTORAGE1DPROC glTexStorage1D;
-extern PFNGLTEXSTORAGE2DPROC glTexStorage2D;
-extern PFNGLTEXSTORAGE3DPROC glTexStorage3D;
-extern PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
-extern PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
-extern PFNGLGENSAMPLERSPROC glGenSamplers;
-extern PFNGLBINDSAMPLERPROC glBindSampler;
-extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
-extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
-#ifdef DEBUG
-extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
-#endif
-#endif
 
 
 void initGL();
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index deafb7575..e572257ee 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -600,6 +600,11 @@ bool needsUBO()
     return irr_driver->needUBOWorkaround();
 }
 
+unsigned getGLSLVersion()
+{
+    return irr_driver->getGLSLVersion();
+}
+
 namespace MeshShader
 {
     // Solid Normal and depth pass shaders
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 3f9babc24..7c60455ee 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -23,7 +23,8 @@
 #include "config/user_config.hpp"
 #include "utils/singleton.hpp"
 
-typedef unsigned int    GLuint;
+#include "gl_headers.hpp"
+
 using namespace irr;
 class ParticleSystemProxy;
 
@@ -51,14 +52,10 @@ public:
 };
 }
 
-void glUniformMatrix4fvWraper(GLuint, size_t, unsigned, const float *mat);
-void glUniform3fWraper(GLuint, float, float, float);
-void glUniform4iWraper(GLuint, int, int, int, int);
-void glUniform2fWraper(GLuint a, float b, float c);
-void glUniform1fWrapper(GLuint, float);
-void glUniform1iWrapper(GLuint, int);
 bool needsUBO();
 
+unsigned getGLSLVersion();
+
 struct UniformHelper
 {
     template<unsigned N = 0>
@@ -69,31 +66,28 @@ struct UniformHelper
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, const core::matrix4 &mat, Args... arg)
     {
-#ifndef GL_FALSE
-#define GL_FALSE 0
-#endif
-        glUniformMatrix4fvWraper(uniforms[N], 1, GL_FALSE, mat.pointer());
+        glUniformMatrix4fv(uniforms[N], 1, GL_FALSE, mat.pointer());
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, const video::SColorf &col, Args... arg)
     {
-        glUniform3fWraper(uniforms[N], col.r, col.g, col.b);
+        glUniform3f(uniforms[N], col.r, col.g, col.b);
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, const video::SColor &col, Args... arg)
     {
-        glUniform4iWraper(uniforms[N], col.getRed(), col.getGreen(), col.getBlue(), col.getAlpha());
+        glUniform4i(uniforms[N], col.getRed(), col.getGreen(), col.getBlue(), col.getAlpha());
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, const core::vector3df &v, Args... arg)
     {
-        glUniform3fWraper(uniforms[N], v.X, v.Y, v.Z);
+        glUniform3f(uniforms[N], v.X, v.Y, v.Z);
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
@@ -101,35 +95,34 @@ struct UniformHelper
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, const core::vector2df &v, Args... arg)
     {
-        glUniform2fWraper(uniforms[N], v.X, v.Y);
+        glUniform2f(uniforms[N], v.X, v.Y);
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, const core::dimension2df &v, Args... arg)
     {
-        glUniform2fWraper(uniforms[N], v.Width, v.Height);
+        glUniform2f(uniforms[N], v.Width, v.Height);
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, float f, Args... arg)
     {
-        glUniform1fWrapper(uniforms[N], f);
+        glUniform1f(uniforms[N], f);
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, int f, Args... arg)
     {
-        glUniform1iWrapper(uniforms[N], f);
+        glUniform1i(uniforms[N], f);
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
 };
 
 void bypassUBO(GLuint Program);
-GLuint getUniformLocation(GLuint program, const char* name);
 
 template<typename T, typename... Args>
 class ShaderHelperSingleton : public Singleton<T>

From 5128ab920b6c66d5756cea6ec608c3c2cfc4293e Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Tue, 19 Aug 2014 16:52:43 +0200
Subject: [PATCH 038/248] Fix build

---
 src/graphics/render_geometry.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index b18b339aa..9f23b18fc 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -416,7 +416,7 @@ void IrrDriver::renderSolidSecondPass()
         renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(MeshShader::ObjectUnlitShader::getInstance()->TU_tex, true)
         ), ListMatUnlit::getInstance());
-        renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 1>(TexUnits(
+        renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(MeshShader::ObjectUnlitShader::getInstance()->TU_tex, true)
             ), AnimatedListMatUnlit::getInstance());
 

From 4641854c49ed0c18a436664466dcc419f3c4ce5d Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 19 Aug 2014 03:10:02 +0200
Subject: [PATCH 039/248] Factorize gl headers include in a separate file.

It should avoid conflict with Xorg headers
---
 src/graphics/gl_headers.hpp | 115 ++++++++++++++++++++++++++++++++++++
 src/graphics/glwrap.hpp     | 108 +--------------------------------
 src/graphics/shaders.cpp    |   5 ++
 src/graphics/shaders.hpp    |  31 ++++------
 4 files changed, 133 insertions(+), 126 deletions(-)
 create mode 100644 src/graphics/gl_headers.hpp

diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp
new file mode 100644
index 000000000..21d092693
--- /dev/null
+++ b/src/graphics/gl_headers.hpp
@@ -0,0 +1,115 @@
+#ifndef GL_HEADER_HPP
+#define GL_HEADER_HPP
+
+#if defined(__APPLE__)
+#    include <OpenGL/gl.h>
+#    include <OpenGL/gl3.h>
+#    define OGL32CTX
+#    ifdef GL_ARB_instanced_arrays
+#        define glVertexAttribDivisor glVertexAttribDivisorARB
+#    endif
+#    ifndef GL_TEXTURE_SWIZZLE_RGBA
+#        define GL_TEXTURE_SWIZZLE_RGBA 0x8E46
+#    endif
+#elif defined(ANDROID)
+#    include <GLES/gl.h>
+#elif defined(WIN32)
+#    define _WINSOCKAPI_
+// has to be included before gl.h because of WINGDIAPI and APIENTRY definitions
+#    include <windows.h>
+#    include <GL/gl.h>
+#    include "../../lib/irrlicht/source/Irrlicht/glext.h"
+#else
+#define GL_GLEXT_PROTOTYPES
+#define DEBUG_OUTPUT_DECLARED
+#    include <GL/gl.h>
+#    include <GL/glext.h>
+#endif
+
+#ifdef WIN32
+extern PFNGLGENTRANSFORMFEEDBACKSPROC glGenTransformFeedbacks;
+extern PFNGLBINDTRANSFORMFEEDBACKPROC glBindTransformFeedback;
+extern PFNGLDRAWTRANSFORMFEEDBACKPROC glDrawTransformFeedback;
+extern PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback;
+extern PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback;
+extern PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings;
+extern PFNGLBINDBUFFERBASEPROC glBindBufferBase;
+extern PFNGLGENBUFFERSPROC glGenBuffers;
+extern PFNGLBINDBUFFERPROC glBindBuffer;
+extern PFNGLBUFFERDATAPROC glBufferData;
+extern PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;
+extern PFNGLCREATESHADERPROC glCreateShader;
+extern PFNGLCOMPILESHADERPROC glCompileShader;
+extern PFNGLSHADERSOURCEPROC glShaderSource;
+extern PFNGLCREATEPROGRAMPROC glCreateProgram;
+extern PFNGLATTACHSHADERPROC glAttachShader;
+extern PFNGLLINKPROGRAMPROC glLinkProgram;
+extern PFNGLUSEPROGRAMPROC glUseProgram;
+extern PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
+extern PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
+extern PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
+extern PFNGLUNIFORMMATRIX4FVPROC glUniformMatrix4fv;
+extern PFNGLUNIFORM1FPROC glUniform1f;
+extern PFNGLUNIFORM3FPROC glUniform3f;
+extern PFNGLUNIFORM1FVPROC glUniform1fv;
+extern PFNGLUNIFORM4FVPROC glUniform4fv;
+extern PFNGLDELETESHADERPROC glDeleteShader;
+extern PFNGLGETSHADERIVPROC glGetShaderiv;
+extern PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
+extern PFNGLACTIVETEXTUREPROC glActiveTexture;
+extern PFNGLUNIFORM2FPROC glUniform2f;
+extern PFNGLUNIFORM1IPROC glUniform1i;
+extern PFNGLUNIFORM3IPROC glUniform3i;
+extern PFNGLUNIFORM4IPROC glUniform4i;
+extern PFNGLGETPROGRAMIVPROC glGetProgramiv;
+extern PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;
+extern PFNGLGETATTRIBLOCATIONPROC glGetAttribLocation;
+extern PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;
+extern PFNGLBLENDEQUATIONPROC glBlendEquation;
+extern PFNGLVERTEXATTRIBDIVISORPROC glVertexAttribDivisor;
+extern PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
+extern PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
+extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
+extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
+extern PFNGLDELETEBUFFERSPROC glDeleteBuffers;
+extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
+extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
+extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
+extern PFNGLTEXBUFFERPROC glTexBuffer;
+extern PFNGLBUFFERSUBDATAPROC glBufferSubData;
+extern PFNGLMAPBUFFERPROC glMapBuffer;
+extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
+extern PFNGLUNMAPBUFFERPROC glUnmapBuffer;
+extern PFNGLFENCESYNCPROC glFenceSync;
+extern PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
+extern PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer;
+extern PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers;
+extern PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers;
+extern PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
+extern PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D;
+extern PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture;
+extern PFNGLTEXIMAGE3DPROC glTexImage3D;
+extern PFNGLGENERATEMIPMAPPROC glGenerateMipmap;
+extern PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus;
+extern PFNGLTEXIMAGE2DMULTISAMPLEPROC glTexImage2DMultisample;
+extern PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
+extern PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
+extern PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
+extern PFNGLBLENDCOLORPROC glBlendColor;
+extern PFNGLCOMPRESSEDTEXIMAGE2DPROC glCompressedTexImage2D;
+extern PFNGLGETCOMPRESSEDTEXIMAGEPROC glGetCompressedTexImage;
+extern PFNGLTEXSTORAGE1DPROC glTexStorage1D;
+extern PFNGLTEXSTORAGE2DPROC glTexStorage2D;
+extern PFNGLTEXSTORAGE3DPROC glTexStorage3D;
+extern PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
+extern PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
+extern PFNGLGENSAMPLERSPROC glGenSamplers;
+extern PFNGLBINDSAMPLERPROC glBindSampler;
+extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
+extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
+#ifdef DEBUG
+extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
+#endif
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index 9c63f79f2..dea33ae85 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -1,28 +1,7 @@
 #ifndef GLWRAP_HEADER_H
 #define GLWRAP_HEADER_H
 
-#if defined(__APPLE__)
-#    include <OpenGL/gl.h>
-#    include <OpenGL/gl3.h>
-#    define OGL32CTX
-#    ifdef GL_ARB_instanced_arrays
-#        define glVertexAttribDivisor glVertexAttribDivisorARB
-#    endif
-#    ifndef GL_TEXTURE_SWIZZLE_RGBA
-#        define GL_TEXTURE_SWIZZLE_RGBA 0x8E46
-#    endif
-#elif defined(ANDROID)
-#    include <GLES/gl.h>
-#elif defined(WIN32)
-#    define _WINSOCKAPI_
-// has to be included before gl.h because of WINGDIAPI and APIENTRY definitions
-#    include <windows.h>
-#    include <GL/gl.h>
-#else
-#define GL_GLEXT_PROTOTYPES
-#define DEBUG_OUTPUT_DECLARED
-#    include <GL/gl.h>
-#endif
+#include "gl_headers.hpp"
 
 #include <vector>
 #include "irr_driver.hpp"
@@ -31,91 +10,6 @@
 // already includes glext.h, which defines useful GL constants.
 // COpenGLDriver has already loaded the extension GL functions we use (e.g glBeginQuery)
 #include "../../lib/irrlicht/source/Irrlicht/COpenGLDriver.h"
-#ifdef WIN32
-extern PFNGLGENTRANSFORMFEEDBACKSPROC glGenTransformFeedbacks;
-extern PFNGLBINDTRANSFORMFEEDBACKPROC glBindTransformFeedback;
-extern PFNGLDRAWTRANSFORMFEEDBACKPROC glDrawTransformFeedback;
-extern PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback;
-extern PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback;
-extern PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings;
-extern PFNGLBINDBUFFERBASEPROC glBindBufferBase;
-extern PFNGLGENBUFFERSPROC glGenBuffers;
-extern PFNGLBINDBUFFERPROC glBindBuffer;
-extern PFNGLBUFFERDATAPROC glBufferData;
-extern PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;
-extern PFNGLCREATESHADERPROC glCreateShader;
-extern PFNGLCOMPILESHADERPROC glCompileShader;
-extern PFNGLSHADERSOURCEPROC glShaderSource;
-extern PFNGLCREATEPROGRAMPROC glCreateProgram;
-extern PFNGLATTACHSHADERPROC glAttachShader;
-extern PFNGLLINKPROGRAMPROC glLinkProgram;
-extern PFNGLUSEPROGRAMPROC glUseProgram;
-extern PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
-extern PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
-extern PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
-extern PFNGLUNIFORMMATRIX4FVPROC glUniformMatrix4fv;
-extern PFNGLUNIFORM1FPROC glUniform1f;
-extern PFNGLUNIFORM3FPROC glUniform3f;
-extern PFNGLUNIFORM1FVPROC glUniform1fv;
-extern PFNGLUNIFORM4FVPROC glUniform4fv;
-extern PFNGLDELETESHADERPROC glDeleteShader;
-extern PFNGLGETSHADERIVPROC glGetShaderiv;
-extern PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
-extern PFNGLACTIVETEXTUREPROC glActiveTexture;
-extern PFNGLUNIFORM2FPROC glUniform2f;
-extern PFNGLUNIFORM1IPROC glUniform1i;
-extern PFNGLUNIFORM3IPROC glUniform3i;
-extern PFNGLUNIFORM4IPROC glUniform4i;
-extern PFNGLGETPROGRAMIVPROC glGetProgramiv;
-extern PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;
-extern PFNGLGETATTRIBLOCATIONPROC glGetAttribLocation;
-extern PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;
-extern PFNGLBLENDEQUATIONPROC glBlendEquation;
-extern PFNGLVERTEXATTRIBDIVISORPROC glVertexAttribDivisor;
-extern PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
-extern PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
-extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
-extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
-extern PFNGLDELETEBUFFERSPROC glDeleteBuffers;
-extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
-extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
-extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
-extern PFNGLTEXBUFFERPROC glTexBuffer;
-extern PFNGLBUFFERSUBDATAPROC glBufferSubData;
-extern PFNGLMAPBUFFERPROC glMapBuffer;
-extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
-extern PFNGLUNMAPBUFFERPROC glUnmapBuffer;
-extern PFNGLFENCESYNCPROC glFenceSync;
-extern PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
-extern PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer;
-extern PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers;
-extern PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers;
-extern PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
-extern PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D;
-extern PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture;
-extern PFNGLTEXIMAGE3DPROC glTexImage3D;
-extern PFNGLGENERATEMIPMAPPROC glGenerateMipmap;
-extern PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus;
-extern PFNGLTEXIMAGE2DMULTISAMPLEPROC glTexImage2DMultisample;
-extern PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
-extern PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
-extern PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
-extern PFNGLBLENDCOLORPROC glBlendColor;
-extern PFNGLCOMPRESSEDTEXIMAGE2DPROC glCompressedTexImage2D;
-extern PFNGLGETCOMPRESSEDTEXIMAGEPROC glGetCompressedTexImage;
-extern PFNGLTEXSTORAGE1DPROC glTexStorage1D;
-extern PFNGLTEXSTORAGE2DPROC glTexStorage2D;
-extern PFNGLTEXSTORAGE3DPROC glTexStorage3D;
-extern PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
-extern PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
-extern PFNGLGENSAMPLERSPROC glGenSamplers;
-extern PFNGLBINDSAMPLERPROC glBindSampler;
-extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
-extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
-#ifdef DEBUG
-extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
-#endif
-#endif
 
 
 void initGL();
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index deafb7575..e572257ee 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -600,6 +600,11 @@ bool needsUBO()
     return irr_driver->needUBOWorkaround();
 }
 
+unsigned getGLSLVersion()
+{
+    return irr_driver->getGLSLVersion();
+}
+
 namespace MeshShader
 {
     // Solid Normal and depth pass shaders
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 3f9babc24..7c60455ee 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -23,7 +23,8 @@
 #include "config/user_config.hpp"
 #include "utils/singleton.hpp"
 
-typedef unsigned int    GLuint;
+#include "gl_headers.hpp"
+
 using namespace irr;
 class ParticleSystemProxy;
 
@@ -51,14 +52,10 @@ public:
 };
 }
 
-void glUniformMatrix4fvWraper(GLuint, size_t, unsigned, const float *mat);
-void glUniform3fWraper(GLuint, float, float, float);
-void glUniform4iWraper(GLuint, int, int, int, int);
-void glUniform2fWraper(GLuint a, float b, float c);
-void glUniform1fWrapper(GLuint, float);
-void glUniform1iWrapper(GLuint, int);
 bool needsUBO();
 
+unsigned getGLSLVersion();
+
 struct UniformHelper
 {
     template<unsigned N = 0>
@@ -69,31 +66,28 @@ struct UniformHelper
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, const core::matrix4 &mat, Args... arg)
     {
-#ifndef GL_FALSE
-#define GL_FALSE 0
-#endif
-        glUniformMatrix4fvWraper(uniforms[N], 1, GL_FALSE, mat.pointer());
+        glUniformMatrix4fv(uniforms[N], 1, GL_FALSE, mat.pointer());
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, const video::SColorf &col, Args... arg)
     {
-        glUniform3fWraper(uniforms[N], col.r, col.g, col.b);
+        glUniform3f(uniforms[N], col.r, col.g, col.b);
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, const video::SColor &col, Args... arg)
     {
-        glUniform4iWraper(uniforms[N], col.getRed(), col.getGreen(), col.getBlue(), col.getAlpha());
+        glUniform4i(uniforms[N], col.getRed(), col.getGreen(), col.getBlue(), col.getAlpha());
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, const core::vector3df &v, Args... arg)
     {
-        glUniform3fWraper(uniforms[N], v.X, v.Y, v.Z);
+        glUniform3f(uniforms[N], v.X, v.Y, v.Z);
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
@@ -101,35 +95,34 @@ struct UniformHelper
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, const core::vector2df &v, Args... arg)
     {
-        glUniform2fWraper(uniforms[N], v.X, v.Y);
+        glUniform2f(uniforms[N], v.X, v.Y);
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, const core::dimension2df &v, Args... arg)
     {
-        glUniform2fWraper(uniforms[N], v.Width, v.Height);
+        glUniform2f(uniforms[N], v.Width, v.Height);
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, float f, Args... arg)
     {
-        glUniform1fWrapper(uniforms[N], f);
+        glUniform1f(uniforms[N], f);
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
     template<unsigned N = 0, typename... Args>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms, int f, Args... arg)
     {
-        glUniform1iWrapper(uniforms[N], f);
+        glUniform1i(uniforms[N], f);
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
 };
 
 void bypassUBO(GLuint Program);
-GLuint getUniformLocation(GLuint program, const char* name);
 
 template<typename T, typename... Args>
 class ShaderHelperSingleton : public Singleton<T>

From 92e5126ebfaa2f53c6d7ea86851b3aaf56d286b9 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Tue, 19 Aug 2014 17:16:27 +0200
Subject: [PATCH 040/248] Fix travis ci

---
 src/graphics/shaders.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 7c60455ee..9d3c53bd6 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -137,7 +137,7 @@ protected:
     template<typename... U>
     void AssignUniforms_impl(const char* name, U... rest)
     {
-        uniforms.push_back(getUniformLocation(Program, name));
+        uniforms.push_back(glGetUniformLocation(Program, name));
         AssignUniforms_impl(rest...);
     }
 

From 2a473a550a966e5b353200d51c28e35604d8ca50 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Tue, 19 Aug 2014 17:30:44 +0200
Subject: [PATCH 041/248] Remove wrappers.

---
 src/graphics/shaders.cpp | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index e572257ee..f64745545 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -103,11 +103,6 @@
 
 using namespace video;
 
-GLuint getUniformLocation(GLuint program, const char* name)
-{
-    return glGetUniformLocation(program, name);
-}
-
 Shaders::Shaders()
 {
     // Callbacks
@@ -565,36 +560,6 @@ namespace UtilShader
 }
 using namespace UtilShader;
 
-void glUniformMatrix4fvWraper(GLuint a, size_t b, unsigned c, const float *d)
-{
-    glUniformMatrix4fv(a, b, c, d);
-}
-
-void glUniform3fWraper(GLuint a, float b, float c, float d)
-{
-    glUniform3f(a, b, c, d);
-}
-
-void glUniform4iWraper(GLuint a, int b, int c, int d, int e)
-{
-    glUniform4i(a, b, c, d, e);
-}
-
-void glUniform2fWraper(GLuint a, float b, float c)
-{
-    glUniform2f(a, b, c);
-}
-
-void glUniform1fWrapper(GLuint a, float b)
-{
-    glUniform1f(a, b);
-}
-
-void glUniform1iWrapper(GLuint a, int b)
-{
-    glUniform1i(a, b);
-}
-
 bool needsUBO()
 {
     return irr_driver->needUBOWorkaround();

From af9c3d53b7789c414cb38c9478251b9c6634dee4 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Tue, 19 Aug 2014 16:42:29 +0200
Subject: [PATCH 042/248] Use template to declare shader texture usage.

---
 src/graphics/glwrap.cpp           |   8 +-
 src/graphics/gpuparticles.cpp     |   7 +-
 src/graphics/post_processing.cpp  |  91 ++----
 src/graphics/render_geometry.cpp  | 182 ++++++------
 src/graphics/render_lighting.cpp  |   4 +-
 src/graphics/shaders.cpp          | 453 ++++++++++++++++++-----------
 src/graphics/shaders.hpp          | 465 ++++++++++++++++++++----------
 src/graphics/stkbillboard.cpp     |   2 +-
 src/graphics/stkmeshscenenode.cpp |   6 +-
 9 files changed, 716 insertions(+), 502 deletions(-)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 0cd8d2449..3913133a4 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -932,7 +932,7 @@ static void drawTexColoredQuad(const video::ITexture *texture, const video::SCol
     glUseProgram(UIShader::ColoredTextureRectShader::getInstance()->Program);
     glBindVertexArray(UIShader::ColoredTextureRectShader::getInstance()->vao);
 
-    setTexture(UIShader::ColoredTextureRectShader::getInstance()->TU_tex, static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName(), GL_LINEAR, GL_LINEAR);
+    UIShader::ColoredTextureRectShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName() });
     UIShader::ColoredTextureRectShader::getInstance()->setUniforms(
         core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height),
         core::vector2df(tex_center_pos_x, tex_center_pos_y), core::vector2df(tex_width, tex_height));
@@ -952,7 +952,7 @@ void drawTexQuad(GLuint texture, float width, float height,
     glUseProgram(UIShader::TextureRectShader::getInstance()->Program);
     glBindVertexArray(SharedObject::UIVAO);
 
-    setTexture(UIShader::TextureRectShader::getInstance()->TU_tex, texture, GL_LINEAR, GL_LINEAR);
+    UIShader::TextureRectShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ texture });
     UIShader::TextureRectShader::getInstance()->setUniforms(
         core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height),
         core::vector2df(tex_center_pos_x, tex_center_pos_y),
@@ -1055,7 +1055,7 @@ void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect
     glUseProgram(UIShader::UniformColoredTextureRectShader::getInstance()->Program);
     glBindVertexArray(SharedObject::UIVAO);
 
-    setTexture(UIShader::UniformColoredTextureRectShader::getInstance()->TU_tex, static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName(), GL_LINEAR, GL_LINEAR);
+    UIShader::UniformColoredTextureRectShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName() });
     UIShader::UniformColoredTextureRectShader::getInstance()->setUniforms(
         core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height), core::vector2df(tex_center_pos_x, tex_center_pos_y), core::vector2df(tex_width, tex_height), colors);
 
@@ -1091,7 +1091,7 @@ void draw2DImageFromRTT(GLuint texture, size_t texture_w, size_t texture_h,
     glUseProgram(UIShader::UniformColoredTextureRectShader::getInstance()->Program);
     glBindVertexArray(SharedObject::UIVAO);
 
-    setTexture(UIShader::UniformColoredTextureRectShader::getInstance()->TU_tex, texture, GL_LINEAR, GL_LINEAR);
+    UIShader::UniformColoredTextureRectShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ texture });
     UIShader::UniformColoredTextureRectShader::getInstance()->setUniforms(
         core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height),
         core::vector2df(tex_center_pos_x, tex_center_pos_y), core::vector2df(tex_width, tex_height),
diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index 01831b68a..ffa77e8ea 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -348,9 +348,7 @@ void ParticleSystemProxy::drawFlip()
     glBlendFunc(GL_ONE, GL_ONE);
     glUseProgram(ParticleShader::FlipParticleRender::getInstance()->Program);
 
-    setTexture(ParticleShader::FlipParticleRender::getInstance()->TU_tex, texture, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR);
-    setTexture(ParticleShader::FlipParticleRender::getInstance()->TU_dtex, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
-
+    ParticleShader::FlipParticleRender::getInstance()->SetTextureUnits(std::vector<GLuint>{ texture, irr_driver->getDepthStencilTexture() });
     ParticleShader::FlipParticleRender::getInstance()->setUniforms();
 
     glBindVertexArray(current_rendering_vao);
@@ -365,8 +363,7 @@ void ParticleSystemProxy::drawNotFlip()
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
     glUseProgram(ParticleShader::SimpleParticleRender::getInstance()->Program);
 
-    setTexture(ParticleShader::SimpleParticleRender::getInstance()->TU_tex, texture, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR);
-    setTexture(ParticleShader::SimpleParticleRender::getInstance()->TU_dtex, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
+    ParticleShader::SimpleParticleRender::getInstance()->SetTextureUnits(std::vector<GLuint>{ texture, irr_driver->getDepthStencilTexture() });
     video::SColorf ColorFrom = video::SColorf(getColorFrom()[0], getColorFrom()[1], getColorFrom()[2]);
     video::SColorf ColorTo = video::SColorf(getColorTo()[0], getColorTo()[1], getColorTo()[2]);
 
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index dacba3fab..bd58563a4 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -216,7 +216,7 @@ static void DrawFullScreenEffect(Args...args)
 static
 void renderBloom(GLuint in)
 {
-    setTexture(FullScreenShader::BloomShader::getInstance()->TU_tex, in, GL_NEAREST, GL_NEAREST);
+    FullScreenShader::BloomShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ in });
     DrawFullScreenEffect<FullScreenShader::BloomShader>();
 }
 
@@ -263,26 +263,8 @@ void PostProcessing::renderGI(const core::matrix4 &RHMatrix, const core::vector3
     core::matrix4 InvRHMatrix;
     RHMatrix.getInverse(InvRHMatrix);
     glDisable(GL_DEPTH_TEST);
-    glActiveTexture(GL_TEXTURE0 + FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()->TU_SHR);
-    glBindTexture(GL_TEXTURE_3D, shr);
-    {
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    }
-    glActiveTexture(GL_TEXTURE0 + FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()->TU_SHG);
-    glBindTexture(GL_TEXTURE_3D, shg);
-    {
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    }
-    glActiveTexture(GL_TEXTURE0 + FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()->TU_SHB);
-    glBindTexture(GL_TEXTURE_3D, shb);
-    {
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    }
-    setTexture(FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()->TU_ntex, irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), GL_NEAREST, GL_NEAREST);
-    setTexture(FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()->TU_dtex, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
+    FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()->SetTextureUnits(std::vector<GLuint>
+        { irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), shr, shg, shb });
     DrawFullScreenEffect<FullScreenShader::GlobalIlluminationReconstructionShader>(RHMatrix, InvRHMatrix, rh_extend);
 }
 
@@ -309,17 +291,7 @@ void PostProcessing::renderShadowedSunlight(const std::vector<core::matrix4> &su
     glBlendFunc(GL_ONE, GL_ONE);
     glBlendEquation(GL_FUNC_ADD);
 
-    setTexture(FullScreenShader::ShadowedSunLightShader::getInstance()->TU_ntex, irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), GL_NEAREST, GL_NEAREST);
-    setTexture(FullScreenShader::ShadowedSunLightShader::getInstance()->TU_dtex, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
-    glActiveTexture(GL_TEXTURE0 + FullScreenShader::ShadowedSunLightShader::getInstance()->TU_shadowtex);
-    glBindTexture(GL_TEXTURE_2D_ARRAY, depthtex);
-    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glTexParameterf(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
-    glTexParameterf(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
-
+    FullScreenShader::ShadowedSunLightShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), depthtex });
     DrawFullScreenEffect<FullScreenShader::ShadowedSunLightShader>(cb->getPosition(), video::SColorf(cb->getRed(), cb->getGreen(), cb->getBlue()));
 }
 
@@ -331,17 +303,13 @@ void PostProcessing::renderGaussian3Blur(FrameBuffer &in_fbo, FrameBuffer &auxil
     {
         auxiliary.Bind();
 
-        setTexture(FullScreenShader::Gaussian3VBlurShader::getInstance()->TU_tex, in_fbo.getRTT()[0], GL_LINEAR, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+        FullScreenShader::Gaussian3VBlurShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ in_fbo.getRTT()[0] });
         DrawFullScreenEffect<FullScreenShader::Gaussian3VBlurShader>(core::vector2df(inv_width, inv_height));
     }
     {
         in_fbo.Bind();
 
-        setTexture(FullScreenShader::Gaussian3HBlurShader::getInstance()->TU_tex, auxiliary.getRTT()[0], GL_LINEAR, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+        FullScreenShader::Gaussian3HBlurShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ auxiliary.getRTT()[0] });
         DrawFullScreenEffect<FullScreenShader::Gaussian3HBlurShader>(core::vector2df(inv_width, inv_height));
     }
 }
@@ -353,17 +321,13 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo, FrameBuffer &auxil
     {
         auxiliary.Bind();
 
-        setTexture(FullScreenShader::Gaussian6VBlurShader::getInstance()->TU_tex, in_fbo.getRTT()[0], GL_LINEAR, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+        FullScreenShader::Gaussian6VBlurShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ in_fbo.getRTT()[0] });
         DrawFullScreenEffect<FullScreenShader::Gaussian6VBlurShader>(core::vector2df(inv_width, inv_height));
     }
     {
         in_fbo.Bind();
 
-        setTexture(FullScreenShader::Gaussian6HBlurShader::getInstance()->TU_tex, auxiliary.getRTT()[0], GL_LINEAR, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+        FullScreenShader::Gaussian6HBlurShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ auxiliary.getRTT()[0] });
         DrawFullScreenEffect<FullScreenShader::Gaussian6HBlurShader>(core::vector2df(inv_width, inv_height));
     }
 }
@@ -434,7 +398,7 @@ void PostProcessing::renderPassThrough(GLuint tex)
     glUseProgram(FullScreenShader::PassThroughShader::getInstance()->Program);
     glBindVertexArray(FullScreenShader::PassThroughShader::getInstance()->vao);
 
-    setTexture(FullScreenShader::PassThroughShader::getInstance()->TU_tex, tex, GL_LINEAR, GL_LINEAR);
+    FullScreenShader::PassThroughShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ tex });
     FullScreenShader::PassThroughShader::getInstance()->setUniforms();
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -459,7 +423,7 @@ void PostProcessing::renderGlow(unsigned tex)
     glUseProgram(FullScreenShader::GlowShader::getInstance()->Program);
     glBindVertexArray(FullScreenShader::GlowShader::getInstance()->vao);
 
-    setTexture(FullScreenShader::GlowShader::getInstance()->TU_tex, tex, GL_LINEAR, GL_LINEAR);
+    FullScreenShader::GlowShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ tex });
     FullScreenShader::GlowShader::getInstance()->setUniforms();
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -473,11 +437,11 @@ void PostProcessing::renderSSAO()
 
     // Generate linear depth buffer
     irr_driver->getFBO(FBO_LINEAR_DEPTH).Bind();
-    setTexture(FullScreenShader::LinearizeDepthShader::getInstance()->TU_tex, irr_driver->getDepthStencilTexture(), GL_LINEAR, GL_LINEAR);
+    FullScreenShader::LinearizeDepthShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ irr_driver->getDepthStencilTexture() });
     DrawFullScreenEffect<FullScreenShader::LinearizeDepthShader>(irr_driver->getSceneManager()->getActiveCamera()->getNearValue(), irr_driver->getSceneManager()->getActiveCamera()->getFarValue());
     irr_driver->getFBO(FBO_SSAO).Bind();
 
-    setTexture(FullScreenShader::SSAOShader::getInstance()->TU_dtex, irr_driver->getRenderTargetTexture(RTT_LINEAR_DEPTH), GL_LINEAR, GL_LINEAR_MIPMAP_NEAREST);
+    FullScreenShader::SSAOShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ irr_driver->getRenderTargetTexture(RTT_LINEAR_DEPTH) });
     glGenerateMipmap(GL_TEXTURE_2D);
 
     DrawFullScreenEffect<FullScreenShader::SSAOShader>(irr_driver->getSSAORadius(), irr_driver->getSSAOK(), irr_driver->getSSAOSigma());
@@ -505,8 +469,8 @@ void PostProcessing::renderFog()
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
 
-    setTexture(FullScreenShader::FogShader::getInstance()->TU_tex, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
-   DrawFullScreenEffect<FullScreenShader::FogShader>(fogmax, startH, endH, start, end, col);
+    FullScreenShader::FogShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ irr_driver->getDepthStencilTexture() });
+    DrawFullScreenEffect<FullScreenShader::FogShader>(fogmax, startH, endH, start, end, col);
 
     glEnable(GL_DEPTH_TEST);
     glDisable(GL_BLEND);
@@ -533,10 +497,7 @@ void PostProcessing::renderMotionBlur(unsigned cam, FrameBuffer &in_fbo, FrameBu
     out_fbo.Bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
-    setTexture(FullScreenShader::MotionBlurShader::getInstance()->TU_cb, in_fbo.getRTT()[0], GL_LINEAR, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    setTexture(FullScreenShader::MotionBlurShader::getInstance()->TU_dtex, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
+    FullScreenShader::MotionBlurShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ in_fbo.getRTT()[0], irr_driver->getDepthStencilTexture() });
     DrawFullScreenEffect<FullScreenShader::MotionBlurShader>(
                                   // Todo : use a previousPVMatrix per cam, not global
                                   irr_driver->getPreviousPVMatrix(),
@@ -549,7 +510,7 @@ static void renderGodFade(GLuint tex, const SColor &col)
 {
     glUseProgram(FullScreenShader::GodFadeShader::getInstance()->Program);
     glBindVertexArray(FullScreenShader::GodFadeShader::getInstance()->vao);
-    setTexture(FullScreenShader::GodFadeShader::getInstance()->TU_tex, tex, GL_LINEAR, GL_LINEAR);
+    FullScreenShader::GodFadeShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ tex });
     FullScreenShader::GodFadeShader::getInstance()->setUniforms(col);
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -559,7 +520,7 @@ static void renderGodRay(GLuint tex, const core::vector2df &sunpos)
 {
     glUseProgram(FullScreenShader::GodRayShader::getInstance()->Program);
     glBindVertexArray(FullScreenShader::GodRayShader::getInstance()->vao);
-    setTexture(FullScreenShader::GodRayShader::getInstance()->TU_tex, tex, GL_LINEAR, GL_LINEAR);
+    FullScreenShader::GodRayShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ tex });
     FullScreenShader::GodRayShader::getInstance()->setUniforms(sunpos);
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -568,15 +529,14 @@ static void renderGodRay(GLuint tex, const core::vector2df &sunpos)
 static void toneMap(FrameBuffer &fbo, GLuint rtt)
 {
     fbo.Bind();
-    setTexture(FullScreenShader::ToneMapShader::getInstance()->TU_tex, rtt, GL_NEAREST, GL_NEAREST);
+    FullScreenShader::ToneMapShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ rtt });
     DrawFullScreenEffect<FullScreenShader::ToneMapShader>();
 }
 
 static void renderDoF(FrameBuffer &fbo, GLuint rtt)
 {
     fbo.Bind();
-    setTexture(FullScreenShader::DepthOfFieldShader::getInstance()->TU_tex, rtt, GL_LINEAR, GL_LINEAR);
-    setTexture(FullScreenShader::DepthOfFieldShader::getInstance()->TU_depth, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
+    FullScreenShader::DepthOfFieldShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ rtt, irr_driver->getDepthStencilTexture() });
     DrawFullScreenEffect<FullScreenShader::DepthOfFieldShader>();
 }
 
@@ -592,8 +552,8 @@ void PostProcessing::applyMLAA()
     glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
 
     // Pass 1: color edge detection
-    setTexture(FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->TU_colorMapG, irr_driver->getRenderTargetTexture(RTT_MLAA_COLORS), GL_NEAREST, GL_NEAREST);
     glUseProgram(FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->Program);
+    FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->SetTextureUnits(std::vector<GLuint>{ irr_driver->getRenderTargetTexture(RTT_MLAA_COLORS) });
     FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->setUniforms(PIXEL_SIZE);
 
     glBindVertexArray(FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->vao);
@@ -607,8 +567,7 @@ void PostProcessing::applyMLAA()
     glClear(GL_COLOR_BUFFER_BIT);
 
     glUseProgram(FullScreenShader::MLAABlendWeightSHader::getInstance()->Program);
-    setTexture(FullScreenShader::MLAABlendWeightSHader::getInstance()->TU_edgesMap, irr_driver->getRenderTargetTexture(RTT_MLAA_TMP), GL_LINEAR, GL_LINEAR);
-    setTexture(FullScreenShader::MLAABlendWeightSHader::getInstance()->TU_areaMap, getTextureGLuint(m_areamap), GL_NEAREST, GL_NEAREST);
+    FullScreenShader::MLAABlendWeightSHader::getInstance()->SetTextureUnits(std::vector<GLuint>{ irr_driver->getRenderTargetTexture(RTT_MLAA_TMP), getTextureGLuint(m_areamap) });
     FullScreenShader::MLAABlendWeightSHader::getInstance()->setUniforms(PIXEL_SIZE);
 
     glBindVertexArray(FullScreenShader::MLAABlendWeightSHader::getInstance()->vao);
@@ -621,8 +580,7 @@ void PostProcessing::applyMLAA()
     irr_driver->getFBO(FBO_MLAA_COLORS).Bind();
 
     glUseProgram(FullScreenShader::MLAAGatherSHader::getInstance()->Program);
-    setTexture(FullScreenShader::MLAAGatherSHader::getInstance()->TU_colorMap, irr_driver->getRenderTargetTexture(RTT_MLAA_TMP), GL_NEAREST, GL_NEAREST);
-    setTexture(FullScreenShader::MLAAGatherSHader::getInstance()->TU_blendMap, irr_driver->getRenderTargetTexture(RTT_MLAA_BLEND), GL_NEAREST, GL_NEAREST);
+    FullScreenShader::MLAAGatherSHader::getInstance()->SetTextureUnits(std::vector<GLuint>{ irr_driver->getRenderTargetTexture(RTT_MLAA_BLEND), irr_driver->getRenderTargetTexture(RTT_MLAA_TMP)});
     FullScreenShader::MLAAGatherSHader::getInstance()->setUniforms(PIXEL_SIZE);
 
     glBindVertexArray(FullScreenShader::MLAAGatherSHader::getInstance()->vao);
@@ -753,9 +711,8 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
             glEnable(GL_BLEND);
             glBlendFunc(GL_ONE, GL_ONE);
             glBlendEquation(GL_FUNC_ADD);
-            setTexture(FullScreenShader::BloomBlendShader::getInstance()->TU_tex_128, irr_driver->getRenderTargetTexture(RTT_BLOOM_128), GL_LINEAR, GL_LINEAR);
-            setTexture(FullScreenShader::BloomBlendShader::getInstance()->TU_tex_256, irr_driver->getRenderTargetTexture(RTT_BLOOM_256), GL_LINEAR, GL_LINEAR);
-            setTexture(FullScreenShader::BloomBlendShader::getInstance()->TU_tex_512, irr_driver->getRenderTargetTexture(RTT_BLOOM_512), GL_LINEAR, GL_LINEAR);
+            FullScreenShader::BloomBlendShader::getInstance()->SetTextureUnits(std::vector<GLuint>
+                { irr_driver->getRenderTargetTexture(RTT_BLOOM_128), irr_driver->getRenderTargetTexture(RTT_BLOOM_256), irr_driver->getRenderTargetTexture(RTT_BLOOM_512) });
             DrawFullScreenEffect<FullScreenShader::BloomBlendShader>();
 
             glDisable(GL_BLEND);
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 9f23b18fc..864c7587c 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -122,13 +122,14 @@ void renderMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
     glBindVertexArray(getVAO(VertexType));
     for (unsigned i = 0; i < meshes->size(); i++)
     {
+        std::vector<GLuint> Textures;
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
         for (unsigned j = 0; j < TexUnits.size(); j++)
         {
             if (!mesh.textures[j])
                 mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
             compressTexture(mesh.textures[j], TexUnits[j].m_premul_alpha);
-            setTexture(TexUnits[j].m_id, getTextureGLuint(mesh.textures[j]), GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, true);
+            Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
         }
         if (mesh.VAOType != VertexType)
         {
@@ -137,6 +138,7 @@ void renderMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
 #endif
             continue;
         }
+        Shader::getInstance()->SetTextureUnits(Textures);
         custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
 }
@@ -178,6 +180,7 @@ void renderInstancedMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vec
     glUseProgram(Shader::getInstance()->Program);
     for (unsigned i = 0; i < meshes->size(); i++)
     {
+        std::vector<GLuint> Textures;
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
 #ifdef DEBUG
         if (mesh.VAOType != VertexType)
@@ -186,11 +189,12 @@ void renderInstancedMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vec
         glBindVertexArray(mesh.vao);
         for (unsigned j = 0; j < TexUnits.size(); j++)
         {
-            if (!mesh.textures[j])
+            if (!mesh.textures[TexUnits[j].m_id])
                 mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-            compressTexture(mesh.textures[j], TexUnits[j].m_premul_alpha);
-            setTexture(TexUnits[j].m_id, getTextureGLuint(mesh.textures[j]), GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, true);
+            compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
+            Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
         }
+        Shader::getInstance()->SetTextureUnits(Textures);
         instanced_custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
 }
@@ -251,35 +255,35 @@ void IrrDriver::renderSolidFirstPass()
     {
         ScopedGPUTimer Timer(getGPUTimer(Q_SOLID_PASS1));
 
-        std::vector<TexUnit> object_pass1_texunits = TexUnits(TexUnit(MeshShader::ObjectPass1Shader::getInstance()->TU_tex, true) );
+        std::vector<TexUnit> object_pass1_texunits = TexUnits(TexUnit(0, true) );
         renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_STANDARD, 2, 1>(object_pass1_texunits, ListMatDefault::getInstance());
         renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_STANDARD, 2, 1>(object_pass1_texunits, ListMatSphereMap::getInstance());
         renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_2TCOORDS, 2, 1>(object_pass1_texunits, ListMatDetails::getInstance());
         renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_2TCOORDS, 2, 1>(object_pass1_texunits, ListMatSplatting::getInstance());
         renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(object_pass1_texunits, ListMatUnlit::getInstance());
-        renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(MeshShader::ObjectRefPass1Shader::getInstance()->TU_tex, true)), ListMatAlphaRef::getInstance());
-        renderMeshes1stPass<MeshShader::GrassPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(MeshShader::GrassPass1Shader::getInstance()->TU_tex, true)), ListMatGrass::getInstance());
+        renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(0, true)), ListMatAlphaRef::getInstance());
+        renderMeshes1stPass<MeshShader::GrassPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(0, true)), ListMatGrass::getInstance());
         renderMeshes1stPass<MeshShader::NormalMapShader, video::EVT_TANGENTS, 2, 1>(TexUnits(
-            TexUnit(MeshShader::NormalMapShader::getInstance()->TU_glossy, true),
-            TexUnit(MeshShader::NormalMapShader::getInstance()->TU_normalmap, false)
+            TexUnit(1, false),
+            TexUnit(0, true)
         ), ListMatNormalMap::getInstance());
 
-        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_STANDARD, 2, 1>(object_pass1_texunits, AnimatedListMatDefault::getInstance());
-        renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(MeshShader::ObjectRefPass1Shader::getInstance()->TU_tex, true)), AnimatedListMatAlphaRef::getInstance());
-        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_2TCOORDS, 2, 1>(object_pass1_texunits, AnimatedListMatDetails::getInstance());
-        renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(object_pass1_texunits, AnimatedListMatUnlit::getInstance());
+        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_STANDARD, 2, 1>(TexUnits(TexUnit(0, true)), AnimatedListMatDefault::getInstance());
+        renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(0, true)), AnimatedListMatAlphaRef::getInstance());
+        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_2TCOORDS, 2, 1>(TexUnits(TexUnit(0, true)), AnimatedListMatDetails::getInstance());
+        renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(0, true)), AnimatedListMatUnlit::getInstance());
 
         renderInstancedMeshes1stPass<MeshShader::InstancedObjectPass1Shader, video::EVT_STANDARD>(
-                    TexUnits(TexUnit(MeshShader::InstancedObjectPass1Shader::getInstance()->TU_tex, true)),
+                    TexUnits(TexUnit(0, true)),
                     ListInstancedMatDefault::getInstance());
         renderInstancedMeshes1stPass<MeshShader::InstancedObjectRefPass1Shader, video::EVT_STANDARD>(
-                    TexUnits(TexUnit(MeshShader::InstancedObjectRefPass1Shader::getInstance()->TU_tex, true)),
+                    TexUnits(TexUnit(0, true)),
                     ListInstancedMatAlphaRef::getInstance());
         renderInstancedMeshes1stPass<MeshShader::InstancedGrassPass1Shader, video::EVT_STANDARD, 2>(
-                    TexUnits(TexUnit(MeshShader::InstancedGrassPass1Shader::getInstance()->TU_tex, true)),
+                    TexUnits(TexUnit(0, true)),
                     ListInstancedMatGrass::getInstance());
         renderInstancedMeshes1stPass<MeshShader::InstancedNormalMapShader, video::EVT_TANGENTS>(
-            TexUnits(TexUnit(MeshShader::InstancedNormalMapShader::getInstance()->TU_glossy, true), TexUnit(MeshShader::InstancedNormalMapShader::getInstance()->TU_normalmap, false)),
+            TexUnits(TexUnit(1, false), TexUnit(0, true)),
             ListInstancedMatNormalMap::getInstance());
     }
 }
@@ -291,13 +295,14 @@ void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
     glBindVertexArray(getVAO(VertexType));
     for (unsigned i = 0; i < meshes->size(); i++)
     {
+        std::vector<GLuint> Textures;
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
         for (unsigned j = 0; j < TexUnits.size(); j++)
         {
-            if (!mesh.textures[j])
-                mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-            compressTexture(mesh.textures[j], TexUnits[j].m_premul_alpha);
-            setTexture(TexUnits[j].m_id, getTextureGLuint(mesh.textures[j]), GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, true);
+            if (!mesh.textures[TexUnits[j].m_id])
+                mesh.textures[TexUnits[j].m_id] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
+            compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
+            Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
             if (irr_driver->getLightViz())
             {
                 GLint swizzleMask[] = { GL_ONE, GL_ONE, GL_ONE, GL_ALPHA };
@@ -317,6 +322,7 @@ void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
 #endif
             continue;
         }
+        Shader::getInstance()->SetTextureUnits(Textures);
         custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
 }
@@ -329,12 +335,13 @@ void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vec
     {
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
         glBindVertexArray(mesh.vao);
+        std::vector<GLuint> Textures;
         for (unsigned j = 0; j < TexUnits.size(); j++)
         {
-            if (!mesh.textures[j])
-                mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-            compressTexture(mesh.textures[j], TexUnits[j].m_premul_alpha);
-            setTexture(TexUnits[j].m_id, getTextureGLuint(mesh.textures[j]), GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, true);
+            if (!mesh.textures[TexUnits[j].m_id])
+                mesh.textures[TexUnits[j].m_id] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
+            compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
+            Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
             if (irr_driver->getLightViz())
             {
                 GLint swizzleMask[] = { GL_ONE, GL_ONE, GL_ONE, GL_ALPHA };
@@ -346,7 +353,7 @@ void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vec
                 glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
             }
         }
-
+        Shader::getInstance()->SetTextureUnits(Textures);
         instanced_custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
 }
@@ -373,8 +380,11 @@ void IrrDriver::renderSolidSecondPass()
     glEnable(GL_DEPTH_TEST);
     glDisable(GL_ALPHA_TEST);
     glDisable(GL_BLEND);
+    glBindSampler(0, 0);
     setTexture(0, m_rtts->getRenderTarget(RTT_TMP1), GL_NEAREST, GL_NEAREST);
+    glBindSampler(1, 0);
     setTexture(1, m_rtts->getRenderTarget(RTT_TMP2), GL_NEAREST, GL_NEAREST);
+    glBindSampler(2, 0);
     setTexture(2, m_rtts->getRenderTarget(RTT_HALF1_R), GL_LINEAR, GL_LINEAR);
 
     {
@@ -383,70 +393,68 @@ void IrrDriver::renderSolidSecondPass()
         m_scene_manager->drawAll(scene::ESNRP_SOLID);
 
         renderMeshes2ndPass<MeshShader::ObjectPass2Shader, video::EVT_STANDARD, 3, 1>(TexUnits(
-            TexUnit(MeshShader::ObjectPass2Shader::getInstance()->TU_Albedo, true)
+            TexUnit(0, true)
         ), ListMatDefault::getInstance());
         renderMeshes2ndPass<MeshShader::ObjectPass2Shader, video::EVT_STANDARD, 3, 1>(TexUnits(
-            TexUnit(MeshShader::ObjectPass2Shader::getInstance()->TU_Albedo, true)
+            TexUnit(0, true)
             ), AnimatedListMatDefault::getInstance());
 
         renderMeshes2ndPass<MeshShader::ObjectRefPass2Shader, video::EVT_STANDARD, 3, 1 >(TexUnits(
-            TexUnit(MeshShader::ObjectRefPass2Shader::getInstance()->TU_Albedo, true)
+            TexUnit(0, true)
         ), ListMatAlphaRef::getInstance());
         renderMeshes2ndPass<MeshShader::ObjectRefPass2Shader, video::EVT_STANDARD, 3, 1 >(TexUnits(
-            TexUnit(MeshShader::ObjectRefPass2Shader::getInstance()->TU_Albedo, true)
+            TexUnit(0, true)
             ), AnimatedListMatAlphaRef::getInstance());
 
         renderMeshes2ndPass<MeshShader::SphereMapShader, video::EVT_STANDARD, 2, 1>(TexUnits(
-            TexUnit(MeshShader::SphereMapShader::getInstance()->TU_tex, true)
+            TexUnit(0, true)
         ), ListMatSphereMap::getInstance());
 
         renderMeshes2ndPass<MeshShader::DetailledObjectPass2Shader, video::EVT_2TCOORDS, 1>(TexUnits(
-            TexUnit(MeshShader::DetailledObjectPass2Shader::getInstance()->TU_Albedo, true),
-            TexUnit(MeshShader::DetailledObjectPass2Shader::getInstance()->TU_detail, true)
+            TexUnit(0, true),
+            TexUnit(1, true)
         ), ListMatDetails::getInstance());
         renderMeshes2ndPass<MeshShader::DetailledObjectPass2Shader, video::EVT_2TCOORDS, 1>(TexUnits(
-            TexUnit(MeshShader::DetailledObjectPass2Shader::getInstance()->TU_Albedo, true),
-            TexUnit(MeshShader::DetailledObjectPass2Shader::getInstance()->TU_detail, true)
+            TexUnit(0, true),
+            TexUnit(1, true)
             ), AnimatedListMatDetails::getInstance());
 
         renderMeshes2ndPass<MeshShader::GrassPass2Shader, video::EVT_STANDARD, 3, 1>(TexUnits(
-            TexUnit(MeshShader::GrassPass2Shader::getInstance()->TU_Albedo, true)
+            TexUnit(0, true)
         ), ListMatGrass::getInstance());
 
         renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 3, 1>(TexUnits(
-            TexUnit(MeshShader::ObjectUnlitShader::getInstance()->TU_tex, true)
+            TexUnit(0, true)
         ), ListMatUnlit::getInstance());
         renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 3, 1>(TexUnits(
-            TexUnit(MeshShader::ObjectUnlitShader::getInstance()->TU_tex, true)
+            TexUnit(0, true)
             ), AnimatedListMatUnlit::getInstance());
 
         renderMeshes2ndPass<MeshShader::SplattingShader, video::EVT_2TCOORDS, 1>(TexUnits(
-            TexUnit(8, true),
-            TexUnit(MeshShader::SplattingShader::getInstance()->TU_tex_layout, false),
-            TexUnit(MeshShader::SplattingShader::getInstance()->TU_tex_detail0, true),
-            TexUnit(MeshShader::SplattingShader::getInstance()->TU_tex_detail1, true),
-            TexUnit(MeshShader::SplattingShader::getInstance()->TU_tex_detail2, true),
-            TexUnit(MeshShader::SplattingShader::getInstance()->TU_tex_detail3, true)
+            TexUnit(1, false),
+            TexUnit(2, true),
+            TexUnit(3, true),
+            TexUnit(4, true),
+            TexUnit(5, true)
         ), ListMatSplatting::getInstance());
 
         renderMeshes2ndPass<MeshShader::ObjectPass2Shader, video::EVT_TANGENTS, 3, 1>(TexUnits(
-            TexUnit(MeshShader::ObjectPass2Shader::getInstance()->TU_Albedo, true)
+            TexUnit(0, true)
         ), ListMatNormalMap::getInstance());
 
 
         renderInstancedMeshes2ndPass<MeshShader::InstancedObjectPass2Shader>(
-            TexUnits(TexUnit(MeshShader::InstancedObjectPass2Shader::getInstance()->TU_Albedo, true)),
+            TexUnits(TexUnit(0, true)),
             ListInstancedMatDefault::getInstance());
         renderInstancedMeshes2ndPass<MeshShader::InstancedObjectPass2Shader>(
-            TexUnits(TexUnit(MeshShader::InstancedObjectPass2Shader::getInstance()->TU_Albedo, true)),
+            TexUnits(TexUnit(0, true)),
             ListInstancedMatNormalMap::getInstance());
         renderInstancedMeshes2ndPass<MeshShader::InstancedObjectRefPass2Shader>(
-            TexUnits(TexUnit(MeshShader::InstancedObjectRefPass2Shader::getInstance()->TU_Albedo, true)),
+            TexUnits(TexUnit(0, true)),
             ListInstancedMatAlphaRef::getInstance());
-        setTexture(MeshShader::InstancedGrassPass2Shader::getInstance()->TU_dtex,
-            irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
+        setTexture(4, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
         renderInstancedMeshes2ndPass<MeshShader::InstancedGrassPass2Shader, 3, 2>(
-            TexUnits(TexUnit(MeshShader::InstancedGrassPass2Shader::getInstance()->TU_Albedo, true)),
+            TexUnits(TexUnit(0, true)),
             ListInstancedMatGrass::getInstance());
     }
     m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
@@ -511,22 +519,22 @@ void IrrDriver::renderTransparent()
     {
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
         renderMeshes2ndPass<MeshShader::TransparentFogShader, video::EVT_STANDARD, 8, 7, 6, 5, 4, 3, 2, 1>(TexUnits(
-            TexUnit(MeshShader::TransparentFogShader::getInstance()->TU_tex, true)
+            TexUnit(0, true)
         ), ListBlendTransparentFog::getInstance());
         glBlendFunc(GL_ONE, GL_ONE);
         renderMeshes2ndPass<MeshShader::TransparentFogShader, video::EVT_STANDARD, 8, 7, 6, 5, 4, 3, 2, 1>(TexUnits(
-            TexUnit(MeshShader::TransparentFogShader::getInstance()->TU_tex, true)
+            TexUnit(0, true)
         ), ListAdditiveTransparentFog::getInstance());
     }
     else
     {
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
         renderMeshes2ndPass<MeshShader::TransparentShader, video::EVT_STANDARD, 2, 1>(TexUnits(
-            TexUnit(MeshShader::TransparentShader::getInstance()->TU_tex, true)
+            TexUnit(0, true)
         ), ListBlendTransparent::getInstance());
         glBlendFunc(GL_ONE, GL_ONE);
         renderMeshes2ndPass<MeshShader::TransparentShader, video::EVT_STANDARD, 2, 1>(TexUnits(
-            TexUnit(MeshShader::TransparentShader::getInstance()->TU_tex, true)
+            TexUnit(0, true)
         ), ListAdditiveTransparent::getInstance());
     }
 
@@ -590,10 +598,8 @@ void IrrDriver::renderTransparent()
         GLenum itype = mesh.IndexType;
         size_t count = mesh.IndexCount;
         // Render the effect
-        setTexture(MeshShader::DisplaceShader::getInstance()->TU_displacement_tex, getTextureGLuint(displaceTex), GL_LINEAR, GL_LINEAR, true);
-        setTexture(MeshShader::DisplaceShader::getInstance()->TU_mask_tex, irr_driver->getRenderTargetTexture(RTT_TMP1), GL_LINEAR, GL_LINEAR, true);
-        setTexture(MeshShader::DisplaceShader::getInstance()->TU_color_tex, irr_driver->getRenderTargetTexture(RTT_COLOR), GL_LINEAR, GL_LINEAR, true);
-        setTexture(MeshShader::DisplaceShader::getInstance()->TU_tex, getTextureGLuint(mesh.textures[0]), GL_LINEAR, GL_LINEAR, true);
+        MeshShader::DisplaceShader::getInstance()->SetTextureUnits(
+            { getTextureGLuint(displaceTex), irr_driver->getRenderTargetTexture(RTT_COLOR), irr_driver->getRenderTargetTexture(RTT_TMP1), getTextureGLuint(mesh.textures[0]) });
         glUseProgram(MeshShader::DisplaceShader::getInstance()->Program);
         MeshShader::DisplaceShader::getInstance()->setUniforms(AbsoluteTransformation,
             core::vector2df(cb->getDirX(), cb->getDirY()),
@@ -651,13 +657,14 @@ void renderShadow(const std::vector<GLuint> TextureUnits, const std::vector<STK:
     glBindVertexArray(getVAO(VertexType));
     for (unsigned i = 0; i < t->size(); i++)
     {
+        std::vector<GLuint> Textures;
         const GLMesh *mesh = STK::tuple_get<0>(t->at(i));
         for (unsigned j = 0; j < TextureUnits.size(); j++)
         {
-            compressTexture(mesh->textures[j], true);
-            setTexture(TextureUnits[j], getTextureGLuint(mesh->textures[j]), GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, true);
+            compressTexture(mesh->textures[TextureUnits[j]], true);
+            Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
         }
-
+        T::getInstance()->SetTextureUnits(Textures);
         shadow_custom_unroll_args<List...>::template exec<T>(T::getInstance(), t->at(i));
     }
 }
@@ -699,14 +706,15 @@ void renderInstancedShadow(const std::vector<GLuint> TextureUnits, const std::ve
     glUseProgram(T::getInstance()->Program);
     for (unsigned i = 0; i < t->size(); i++)
     {
+        std::vector<GLuint> Textures;
         const GLMesh *mesh = STK::tuple_get<0>(t->at(i));
         glBindVertexArray(mesh->vao_shadow_pass);
         for (unsigned j = 0; j < TextureUnits.size(); j++)
         {
-            compressTexture(mesh->textures[j], true);
-            setTexture(TextureUnits[j], getTextureGLuint(mesh->textures[j]), GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, true);
+            compressTexture(mesh->textures[TextureUnits[j]], true);
+            Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
         }
-
+        T::getInstance()->SetTextureUnits(Textures);
         instanced_shadow_custom_unroll_args<List...>::template exec<T>(T::getInstance(), t->at(i));
     }
 }
@@ -749,18 +757,18 @@ void IrrDriver::renderShadows()
     renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, ListMatDetails::getInstance());
     renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, ListMatSplatting::getInstance());
     renderShadow<MeshShader::ShadowShader, EVT_TANGENTS, 1>(noTexUnits, ListMatNormalMap::getInstance());
-    renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ MeshShader::RefShadowShader::getInstance()->TU_tex }, ListMatAlphaRef::getInstance());
-    renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ MeshShader::RefShadowShader::getInstance()->TU_tex }, ListMatUnlit::getInstance());
-    renderShadow<MeshShader::GrassShadowShader, EVT_STANDARD, 3, 1>(std::vector<GLuint>{ MeshShader::GrassShadowShader::getInstance()->TU_tex }, ListMatGrass::getInstance());
+    renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, ListMatAlphaRef::getInstance());
+    renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, ListMatUnlit::getInstance());
+    renderShadow<MeshShader::GrassShadowShader, EVT_STANDARD, 3, 1>(std::vector<GLuint>{ 0 }, ListMatGrass::getInstance());
 
     renderShadow<MeshShader::ShadowShader, EVT_STANDARD, 1>(noTexUnits, AnimatedListMatDefault::getInstance());
-    renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ MeshShader::RefShadowShader::getInstance()->TU_tex }, AnimatedListMatAlphaRef::getInstance());
-    renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ MeshShader::RefShadowShader::getInstance()->TU_tex }, AnimatedListMatUnlit::getInstance());
+    renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, AnimatedListMatAlphaRef::getInstance());
+    renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, AnimatedListMatUnlit::getInstance());
     renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, AnimatedListMatDetails::getInstance());
 
     renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, ListInstancedMatDefault::getInstance());
-    renderInstancedShadow<MeshShader::InstancedRefShadowShader>(std::vector<GLuint>{ MeshShader::InstancedRefShadowShader::getInstance()->TU_tex }, ListInstancedMatAlphaRef::getInstance());
-    renderInstancedShadow<MeshShader::InstancedGrassShadowShader, 2>(std::vector<GLuint>{ MeshShader::InstancedGrassShadowShader::getInstance()->TU_tex }, ListInstancedMatGrass::getInstance());
+    renderInstancedShadow<MeshShader::InstancedRefShadowShader>(std::vector<GLuint>{ 0 }, ListInstancedMatAlphaRef::getInstance());
+    renderInstancedShadow<MeshShader::InstancedGrassShadowShader, 2>(std::vector<GLuint>{ 0 }, ListInstancedMatGrass::getInstance());
     renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, ListInstancedMatNormalMap::getInstance());
 
     glDisable(GL_POLYGON_OFFSET_FILL);
@@ -798,14 +806,16 @@ void drawRSM(const core::matrix4 & rsm_matrix, const std::vector<GLuint> &Textur
     glBindVertexArray(getVAO(VertexType));
     for (unsigned i = 0; i < t->size(); i++)
     {
+        std::vector<GLuint> Textures;
         GLMesh *mesh = STK::tuple_get<0>(t->at(i));
         for (unsigned j = 0; j < TextureUnits.size(); j++)
         {
-            if (!mesh->textures[j])
-                mesh->textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-            compressTexture(mesh->textures[j], true);
-            setTexture(TextureUnits[j], getTextureGLuint(mesh->textures[j]), GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, true);
+            if (!mesh->textures[TextureUnits[j]])
+                mesh->textures[TextureUnits[j]] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
+            compressTexture(mesh->textures[TextureUnits[j]], true);
+            Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
         }
+        T::getInstance()->SetTextureUnits(Textures);
         rsm_custom_unroll_args<Selector...>::template exec<T>(rsm_matrix, t->at(i));
     }
 }
@@ -815,18 +825,10 @@ void IrrDriver::renderRSM()
     m_rtts->getRSM().Bind();
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-    drawRSM<MeshShader::RSMShader, EVT_STANDARD, 3, 1>(rsm_matrix, std::vector<GLuint>{ MeshShader::RSMShader::getInstance()->TU_tex }, ListMatDefault::getInstance());
-    drawRSM<MeshShader::RSMShader, EVT_STANDARD, 3, 1>(rsm_matrix, std::vector<GLuint>{ MeshShader::RSMShader::getInstance()->TU_tex }, ListMatAlphaRef::getInstance());
-    drawRSM<MeshShader::RSMShader, EVT_TANGENTS, 3, 1>(rsm_matrix, std::vector<GLuint>{ MeshShader::RSMShader::getInstance()->TU_tex }, ListMatNormalMap::getInstance());
-    drawRSM<MeshShader::RSMShader, EVT_STANDARD, 3, 1>(rsm_matrix, std::vector<GLuint>{ MeshShader::RSMShader::getInstance()->TU_tex }, ListMatUnlit::getInstance());
-    drawRSM<MeshShader::RSMShader, EVT_2TCOORDS, 3, 1>(rsm_matrix, std::vector<GLuint>{ MeshShader::RSMShader::getInstance()->TU_tex }, ListMatDetails::getInstance());
-    drawRSM<MeshShader::SplattingRSMShader, EVT_2TCOORDS, 1>(rsm_matrix,
-        std::vector<GLuint>{
-            8,
-            MeshShader::SplattingRSMShader::getInstance()->TU_layout,
-            MeshShader::SplattingRSMShader::getInstance()->TU_detail0,
-            MeshShader::SplattingRSMShader::getInstance()->TU_detail1,
-            MeshShader::SplattingRSMShader::getInstance()->TU_detail2,
-            MeshShader::SplattingRSMShader::getInstance()->TU_detail3},
-            ListMatSplatting::getInstance());
+    drawRSM<MeshShader::RSMShader, EVT_STANDARD, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatDefault::getInstance());
+    drawRSM<MeshShader::RSMShader, EVT_STANDARD, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatAlphaRef::getInstance());
+    drawRSM<MeshShader::RSMShader, EVT_TANGENTS, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatNormalMap::getInstance());
+    drawRSM<MeshShader::RSMShader, EVT_STANDARD, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatUnlit::getInstance());
+    drawRSM<MeshShader::RSMShader, EVT_2TCOORDS, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatDetails::getInstance());
+    drawRSM<MeshShader::SplattingRSMShader, EVT_2TCOORDS, 1>(rsm_matrix, std::vector<GLuint>{ 1, 2, 3, 4, 5}, ListMatSplatting::getInstance());
 }
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 0067a857f..97d08dc92 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -155,9 +155,7 @@ void IrrDriver::renderLights(unsigned pointlightcount)
         else
         {
             glUseProgram(FullScreenShader::RadianceHintsConstructionShader::getInstance()->Program);
-            setTexture(FullScreenShader::RadianceHintsConstructionShader::getInstance()->TU_ctex, m_rtts->getRSM().getRTT()[0], GL_LINEAR, GL_LINEAR);
-            setTexture(FullScreenShader::RadianceHintsConstructionShader::getInstance()->TU_ntex, m_rtts->getRSM().getRTT()[1], GL_LINEAR, GL_LINEAR);
-            setTexture(FullScreenShader::RadianceHintsConstructionShader::getInstance()->TU_dtex, m_rtts->getRSM().getDepthTexture(), GL_LINEAR, GL_LINEAR);
+            FullScreenShader::RadianceHintsConstructionShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ m_rtts->getRSM().getRTT()[0], m_rtts->getRSM().getRTT()[1], m_rtts->getRSM().getDepthTexture() });
             FullScreenShader::RadianceHintsConstructionShader::getInstance()->setUniforms(rsm_matrix, rh_matrix, rh_extend);
             glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, 32);
         }
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index e572257ee..335485c69 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -595,6 +595,171 @@ void glUniform1iWrapper(GLuint a, int b)
     glUniform1i(a, b);
 }
 
+void setTextureSampler(GLenum tp, GLuint texunit, GLuint tid, GLuint sid)
+{
+    glActiveTexture(GL_TEXTURE0 + texunit);
+    glBindTexture(tp, tid);
+    glBindSampler(texunit, sid);
+}
+
+
+GLuint createNearestSampler()
+{
+    unsigned id;
+    glGenSamplers(1, &id);
+    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+    return id;
+}
+
+void BindTextureNearest(GLuint TU, GLuint tex)
+{
+    glActiveTexture(GL_TEXTURE0 + TU);
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+}
+
+GLuint createBilinearSampler()
+{
+    unsigned id;
+    glGenSamplers(1, &id);
+    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+    return id;
+}
+
+void BindTextureBilinear(GLuint TU, GLuint tex)
+{
+    glActiveTexture(GL_TEXTURE0 + TU);
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+}
+
+GLuint createBilinearClampedSampler()
+{
+    unsigned id;
+    glGenSamplers(1, &id);
+    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+    return id;
+}
+
+void BindTextureBilinearClamped(GLuint TU, GLuint tex)
+{
+    glActiveTexture(GL_TEXTURE0 + TU);
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+}
+
+GLuint createSemiTrilinearSampler()
+{
+    unsigned id;
+    glGenSamplers(1, &id);
+    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+    return id;
+}
+
+void BindTextureSemiTrilinear(GLuint TU, GLuint tex)
+{
+    glActiveTexture(GL_TEXTURE0 + TU);
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+}
+
+GLuint createTrilinearSampler()
+{
+    unsigned id;
+    glGenSamplers(1, &id);
+    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+    int aniso = UserConfigParams::m_anisotropic;
+    if (aniso == 0) aniso = 1;
+    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
+    return id;
+}
+
+void BindTextureTrilinearAnisotropic(GLuint TU, GLuint tex)
+{
+    glActiveTexture(GL_TEXTURE0 + TU);
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+    int aniso = UserConfigParams::m_anisotropic;
+    if (aniso == 0) aniso = 1;
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
+}
+
+GLuint createShadowSampler()
+{
+    unsigned id;
+    glGenSamplers(1, &id);
+    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glSamplerParameterf(id, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
+    glSamplerParameterf(id, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
+    return id;
+}
+
+void BindTextureShadow(GLuint TU, GLuint tex)
+{
+    glActiveTexture(GL_TEXTURE0 + TU);
+    glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameterf(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
+    glTexParameterf(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
+}
+
+void BindTextureVolume(GLuint TU, GLuint tex)
+{
+    glActiveTexture(GL_TEXTURE0 + TU);
+    glBindTexture(GL_TEXTURE_3D, tex);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+}
+
 bool needsUBO()
 {
     return irr_driver->needUBOWorkaround();
@@ -619,8 +784,7 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     ObjectRefPass1Shader::ObjectRefPass1Shader()
@@ -634,8 +798,7 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     GrassPass1Shader::GrassPass1Shader()
@@ -645,8 +808,8 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectref_pass1.frag").c_str());
         AssignUniforms("ModelMatrix", "InverseModelMatrix", "windDir");
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     NormalMapShader::NormalMapShader()
@@ -660,9 +823,7 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        TU_normalmap = 1;
-        TU_glossy = 0;
-        AssignTextureUnit(Program, TexUnit(TU_normalmap, "normalMap"), TexUnit(TU_glossy, "DiffuseForAlpha"));
+        AssignSamplerNames(Program, 1, "normalMap", 0, "DiffuseForAlpha");
     }
 
     InstancedObjectPass1Shader::InstancedObjectPass1Shader()
@@ -672,9 +833,9 @@ namespace MeshShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_pass1.frag").c_str());
-        TU_tex = 0;
+
         AssignUniforms();
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+        AssignSamplerNames(Program, 0, "tex");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -687,9 +848,9 @@ namespace MeshShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectref_pass1.frag").c_str());
-        TU_tex = 0;
+
         AssignUniforms();
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+        AssignSamplerNames(Program, 0, "tex");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -703,8 +864,8 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectref_pass1.frag").c_str());
         AssignUniforms("windDir");
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+
+        AssignSamplerNames(Program, 0, "tex");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -722,9 +883,7 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        TU_normalmap = 1;
-        TU_glossy = 0;
-        AssignTextureUnit(Program, TexUnit(TU_normalmap, "normalMap"), TexUnit(TU_glossy, "DiffuseForAlpha"));
+        AssignSamplerNames(Program, 0, "normalMap", 1, "DiffuseForAlpha");
     }
 
     // Solid Lit pass shaders
@@ -739,14 +898,11 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        TU_Albedo = 3;
-
         AssignTextureUnit(Program,
             TexUnit(0, "DiffuseMap"),
             TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"),
-            TexUnit(TU_Albedo, "Albedo")
-        );
+            TexUnit(2, "SSAO"));
+        AssignSamplerNames(Program, 3, "Albedo");
     }
 
     InstancedObjectPass2Shader::InstancedObjectPass2Shader()
@@ -757,14 +913,13 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_pass2.frag").c_str());
         AssignUniforms();
-        TU_Albedo = 3;
 
         AssignTextureUnit(Program,
             TexUnit(0, "DiffuseMap"),
             TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"),
-            TexUnit(TU_Albedo, "Albedo")
-        );
+            TexUnit(2, "SSAO"));
+
+        AssignSamplerNames(Program, 3, "Albedo");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -779,14 +934,13 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectref_pass2.frag").c_str());
         AssignUniforms();
-        TU_Albedo = 3;
 
         AssignTextureUnit(Program,
             TexUnit(0, "DiffuseMap"),
             TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"),
-            TexUnit(TU_Albedo, "Albedo")
-        );
+            TexUnit(2, "SSAO"));
+
+        AssignSamplerNames(Program, 3, "Albedo");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -801,16 +955,12 @@ namespace MeshShader
         AssignUniforms("ModelMatrix");
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
-        TU_Albedo = 3;
-        TU_detail = 4;
 
         AssignTextureUnit(Program,
             TexUnit(0, "DiffuseMap"),
             TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"),
-            TexUnit(TU_Albedo, "Albedo"),
-            TexUnit(TU_detail, "Detail")
-        );
+            TexUnit(2, "SSAO"));
+        AssignSamplerNames(Program, 3, "Albedo", 4, "Detail");
     }
 
     ObjectUnlitShader::ObjectUnlitShader()
@@ -823,9 +973,7 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        TU_tex = 3;
-
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+        AssignSamplerNames(Program, 3, "tex");
     }
 
     ObjectRefPass2Shader::ObjectRefPass2Shader()
@@ -839,14 +987,11 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        TU_Albedo = 3;
-
         AssignTextureUnit(Program,
             TexUnit(0, "DiffuseMap"),
             TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"),
-            TexUnit(TU_Albedo, "Albedo")
-        );
+            TexUnit(2, "SSAO"));
+        AssignSamplerNames(Program, 3, "Albedo");
     }
 
     GrassPass2Shader::GrassPass2Shader()
@@ -856,14 +1001,12 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/grass_pass2.frag").c_str());
         AssignUniforms("ModelMatrix", "windDir");
-        TU_Albedo = 3;
 
         AssignTextureUnit(Program,
             TexUnit(0, "DiffuseMap"),
             TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"),
-            TexUnit(TU_Albedo, "Albedo")
-        );
+            TexUnit(2, "SSAO"));
+        AssignSamplerNames(Program, 3, "Albedo");
     }
 
     InstancedGrassPass2Shader::InstancedGrassPass2Shader()
@@ -874,16 +1017,16 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/grass_pass2.frag").c_str());
         AssignUniforms("windDir", "SunDir");
-        TU_Albedo = 3;
-        TU_dtex = 4;
 
         AssignTextureUnit(Program,
             TexUnit(0, "DiffuseMap"),
             TexUnit(1, "SpecularMap"),
             TexUnit(2, "SSAO"),
-            TexUnit(TU_Albedo, "Albedo"),
-            TexUnit(TU_dtex, "dtex")
-        );
+            TexUnit(4, "dtex")
+            );
+
+        AssignSamplerNames(Program, 3, "Albedo");
+
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -901,14 +1044,11 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        TU_tex = 3;
-
         AssignTextureUnit(Program,
             TexUnit(0, "DiffuseMap"),
             TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"),
-            TexUnit(TU_tex, "tex")
-        );
+            TexUnit(2, "SSAO"));
+        AssignSamplerNames(Program, 3, "tex");
     }
 
     SplattingShader::SplattingShader()
@@ -918,22 +1058,17 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/splatting.frag").c_str());
         AssignUniforms("ModelMatrix");
-        TU_tex_layout = 3;
-        TU_tex_detail0 = 4;
-        TU_tex_detail1 = 5;
-        TU_tex_detail2 = 6;
-        TU_tex_detail3 = 7;
 
         AssignTextureUnit(Program,
             TexUnit(0, "DiffuseMap"),
             TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"),
-            TexUnit(TU_tex_layout, "tex_layout"),
-            TexUnit(TU_tex_detail0, "tex_detail0"),
-            TexUnit(TU_tex_detail1, "tex_detail1"),
-            TexUnit(TU_tex_detail2, "tex_detail2"),
-            TexUnit(TU_tex_detail3, "tex_detail3")
-        );
+            TexUnit(2, "SSAO"));
+        AssignSamplerNames(Program,
+            3, "tex_layout",
+            4, "tex_detail0",
+            5, "tex_detail1",
+            6, "tex_detail2",
+            7, "tex_detail3");
     }
 
     GLuint BubbleShader::Program;
@@ -970,9 +1105,7 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        TU_tex = 0;
-
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     TransparentFogShader::TransparentFogShader()
@@ -985,9 +1118,7 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        TU_tex = 0;
-
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     BillboardShader::BillboardShader()
@@ -1000,9 +1131,7 @@ namespace MeshShader
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
         AssignUniforms("ModelViewMatrix", "ProjectionMatrix", "Position", "Size");
 
-        TU_tex = 0;
-
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     ColorizeShader::ColorizeShader()
@@ -1044,9 +1173,9 @@ namespace MeshShader
         Program = LoadProgram(
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/rsm.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/rsm.frag").c_str());
-        TU_tex = 0;
+
         AssignUniforms("RSMMatrix", "ModelMatrix", "TextureMatrix");
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+        AssignSamplerNames(Program, 0, "tex");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -1057,13 +1186,9 @@ namespace MeshShader
         Program = LoadProgram(
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/rsm.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/splatting_rsm.frag").c_str());
-        TU_layout = 0;
-        TU_detail0 = 1;
-        TU_detail1 = 2;
-        TU_detail2 = 3;
-        TU_detail3 = 4;
+
         AssignUniforms("RSMMatrix", "ModelMatrix");
-        AssignTextureUnit(Program, TexUnit(TU_layout, "tex_layout"), TexUnit(TU_detail0, "tex_detail0"), TexUnit(TU_detail1, "tex_detail1"), TexUnit(TU_detail2, "tex_detail2"), TexUnit(TU_detail3, "tex_detail3"));
+        AssignSamplerNames(Program, 0, "tex_layout", 1, "tex_detail0", 2, "tex_detail1", 3, "tex_detail2", 4, "tex_detail3");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -1114,9 +1239,8 @@ namespace MeshShader
         AssignUniforms("ModelMatrix");
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
-        TU_tex = 0;
 
-        AssignTextureUnit(Program, { TexUnit(TU_tex, "tex") });
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     InstancedRefShadowShader::InstancedRefShadowShader()
@@ -1139,8 +1263,8 @@ namespace MeshShader
                 GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/shadow.geom").c_str(),
                 GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_unlit.frag").c_str());
         }
-        TU_tex = 0;
-        AssignTextureUnit(Program, { TexUnit(TU_tex, "tex") });
+
+        AssignSamplerNames(Program, 0, "tex");
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
     }
@@ -1166,9 +1290,8 @@ namespace MeshShader
         AssignUniforms("ModelMatrix", "windDir");
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
-        TU_tex = 0;
 
-        AssignTextureUnit(Program, { TexUnit(TU_tex, "tex") });
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     InstancedGrassShadowShader::InstancedGrassShadowShader()
@@ -1191,8 +1314,8 @@ namespace MeshShader
                 GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/shadow.geom").c_str(),
                 GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_unlit.frag").c_str());
         }
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+
+        AssignSamplerNames(Program, 0, "tex");
 
         AssignUniforms("windDir");
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
@@ -1217,16 +1340,12 @@ namespace MeshShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/displace.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/displace.frag").c_str());
         AssignUniforms("ModelMatrix", "dir", "dir2");
-        TU_displacement_tex = 0;
-        TU_color_tex = 1;
-        TU_mask_tex = 2;
-        TU_tex = 3;
-        AssignTextureUnit(Program,
-            TexUnit(TU_displacement_tex, "displacement_tex"),
-            TexUnit(TU_color_tex, "color_tex"),
-            TexUnit(TU_mask_tex, "mask_tex"),
-            TexUnit(TU_tex, "tex")
-        );
+
+        AssignSamplerNames(Program,
+            0, "displacement_tex",
+            1, "color_tex",
+            2, "mask_tex",
+            3, "tex");
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
     }
@@ -1414,9 +1533,7 @@ namespace ParticleShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/particle.frag").c_str());
         AssignUniforms("color_from", "color_to");
 
-        TU_tex = 0;
-        TU_dtex = 1;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"), TexUnit(TU_dtex, "dtex"));
+        AssignSamplerNames(Program, 0, "tex", 1, "dtex");
     }
 
     FlipParticleRender::FlipParticleRender()
@@ -1427,9 +1544,7 @@ namespace ParticleShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/particle.frag").c_str());
         AssignUniforms();
 
-        TU_tex = 0;
-        TU_dtex = 1;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"), TexUnit(TU_dtex, "dtex"));
+        AssignSamplerNames(Program, 0, "tex", 1, "dtex");
     }
 }
 
@@ -1458,8 +1573,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getCIEXYZ.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/bloom.frag").c_str());
         AssignUniforms();
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     BloomBlendShader::BloomBlendShader()
@@ -1468,10 +1583,8 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/bloomblend.frag").c_str());
         AssignUniforms();
-        TU_tex_128 = 0;
-        TU_tex_256 = 1;
-        TU_tex_512 = 2;
-        AssignTextureUnit(Program, TexUnit(TU_tex_128, "tex_128"), TexUnit(TU_tex_256, "tex_256"), TexUnit(TU_tex_512, "tex_512"));
+
+        AssignSamplerNames(Program, 0, "tex_128", 1, "tex_256", 2, "tex_512");
     }
 
     ToneMapShader::ToneMapShader()
@@ -1482,8 +1595,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getCIEXYZ.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/tonemap.frag").c_str());
         AssignUniforms();
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "text"));
+
+        AssignSamplerNames(Program, 0, "text");
     }
 
     DepthOfFieldShader::DepthOfFieldShader()
@@ -1491,10 +1604,9 @@ namespace FullScreenShader
         Program = LoadProgram(
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/dof.frag").c_str());
-        TU_tex = 0;
-        TU_depth = 1;
+
         AssignUniforms();
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"), TexUnit(TU_depth, "dtex"));
+        AssignSamplerNames(Program, 0, "tex", 1, "dtex");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -1554,10 +1666,9 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getSpecular.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/sunlightshadow.frag").c_str());
-        TU_ntex = 0;
-        TU_dtex = 1;
-        TU_shadowtex = 2;
-        AssignTextureUnit(Program, TexUnit(TU_ntex, "ntex"), TexUnit(TU_dtex, "dtex"), TexUnit(TU_shadowtex, "shadowtex"));
+
+        // Use 8 to circumvent a catalyst bug when binding sampler
+        AssignSamplerNames(Program, 0, "ntex", 1, "dtex", 8, "shadowtex");
         AssignUniforms("direction", "col");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
@@ -1583,10 +1694,7 @@ namespace FullScreenShader
         }
 
         AssignUniforms("RSMMatrix", "RHMatrix", "extents");
-        TU_ctex = 0;
-        TU_ntex = 1;
-        TU_dtex = 2;
-        AssignTextureUnit(Program, TexUnit(TU_ctex, "ctex"), TexUnit(TU_ntex, "ntex"), TexUnit(TU_dtex, "dtex"));
+        AssignSamplerNames(Program, 0, "ctex", 1, "ntex", 2, "dtex");
     }
 
     NVWorkaroundRadianceHintsConstructionShader::NVWorkaroundRadianceHintsConstructionShader()
@@ -1628,12 +1736,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/gi.frag").c_str());
 
         AssignUniforms("RHMatrix", "InvRHMatrix", "extents");
-        TU_ntex = 0;
-        TU_dtex = 1;
-        TU_SHR = 2;
-        TU_SHG = 3;
-        TU_SHB = 4;
-        AssignTextureUnit(Program, TexUnit(TU_ntex, "ntex"), TexUnit(TU_dtex, "dtex"), TexUnit(TU_SHR, "SHR"), TexUnit(TU_SHG, "SHG"), TexUnit(TU_SHB, "SHB"));
+
+        AssignSamplerNames(Program, 0, "ntex", 1, "dtex", 2, "SHR", 3, "SHG", 4, "SHB");
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
     }
@@ -1670,8 +1774,8 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/gaussian6h.frag").c_str());
         AssignUniforms("pixel");
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     Gaussian3HBlurShader::Gaussian3HBlurShader()
@@ -1680,8 +1784,8 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/gaussian3h.frag").c_str());
         AssignUniforms("pixel");
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     Gaussian17TapVShader::Gaussian17TapVShader()
@@ -1715,8 +1819,8 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/gaussian6v.frag").c_str());
         AssignUniforms("pixel");
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     Gaussian3VBlurShader::Gaussian3VBlurShader()
@@ -1725,8 +1829,8 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/gaussian3v.frag").c_str());
         AssignUniforms("pixel");
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     PassThroughShader::PassThroughShader()
@@ -1734,9 +1838,9 @@ namespace FullScreenShader
         Program = LoadProgram(
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/texturedquad.frag").c_str());
-        TU_tex = 0;
+
         AssignUniforms();
-        AssignTextureUnit(Program, TexUnit(TU_tex, "texture"));
+        AssignSamplerNames(Program, 0, "texture");
         vao = createVAO(Program);
     }
 
@@ -1757,8 +1861,8 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/linearizedepth.frag").c_str());
         AssignUniforms("zn", "zf");
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "texture"));
+
+        AssignSamplerNames(Program, 0, "texture");
     }
 
     GlowShader::GlowShader()
@@ -1767,8 +1871,8 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/glow.frag").c_str());
         AssignUniforms();
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+
+        AssignSamplerNames(Program, 0, "tex");
         vao = createVAO(Program);
     }
 
@@ -1779,8 +1883,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/decodeNormal.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/ssao.frag").c_str());
-        TU_dtex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_dtex, "dtex"));
+
+        AssignSamplerNames(Program, 0, "dtex");
         AssignUniforms("radius", "k", "sigma");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
@@ -1793,9 +1897,9 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/fog.frag").c_str());
-        TU_tex = 0;
+
         AssignUniforms("fogmax", "startH", "endH", "start", "end", "col");
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+        AssignSamplerNames(Program, 0, "tex");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -1808,9 +1912,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/motion_blur.frag").c_str());
         AssignUniforms("previous_viewproj", "center", "boost_amount", "mask_radius");
-        TU_cb = 0;
-        TU_dtex = 1;
-        AssignTextureUnit(Program, TexUnit(TU_dtex, "dtex"), TexUnit(TU_cb, "color_buffer"));
+
+        AssignSamplerNames(Program, 0, "color_buffer", 1, "dtex");
     }
 
     GodFadeShader::GodFadeShader()
@@ -1819,8 +1922,8 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/godfade.frag").c_str());
         AssignUniforms("col");
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+
+        AssignSamplerNames(Program, 0, "tex");
         vao = createVAO(Program);
     }
 
@@ -1829,9 +1932,9 @@ namespace FullScreenShader
         Program = LoadProgram(
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/godray.frag").c_str());
-        TU_tex = 0;
+
         AssignUniforms("sunpos");
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+        AssignSamplerNames(Program, 0, "tex");
         vao = createVAO(Program);
     }
 
@@ -1841,8 +1944,8 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/mlaa_offset.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/mlaa_color1.frag").c_str());
         AssignUniforms("PIXEL_SIZE");
-        TU_colorMapG = 0;
-        AssignTextureUnit(Program, TexUnit(TU_colorMapG, "colorMapG"));
+
+        AssignSamplerNames(Program, 0, "colorMapG");
         vao = createVAO(Program);
     }
 
@@ -1852,9 +1955,8 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/mlaa_blend2.frag").c_str());
         AssignUniforms("PIXEL_SIZE");
-        TU_edgesMap = 0;
-        TU_areaMap = 1;
-        AssignTextureUnit(Program, TexUnit(TU_edgesMap, "edgesMap"), TexUnit(TU_areaMap, "areaMap"));
+
+        AssignSamplerNames(Program, 0, "edgesMap", 1, "areaMap");
         vao = createVAO(Program);
     }
 
@@ -1864,9 +1966,8 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/mlaa_offset.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/mlaa_neigh3.frag").c_str());
         AssignUniforms("PIXEL_SIZE");
-        TU_blendMap = 0;
-        TU_colorMap = 1;
-        AssignTextureUnit(Program, TexUnit(TU_blendMap, "blendMap"), TexUnit(TU_colorMap, "colorMap"));
+
+        AssignSamplerNames(Program, 0, "blendMap", 1, "colorMap");
         vao = createVAO(Program);
     }
 }
@@ -1879,8 +1980,8 @@ namespace UIShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/texturedquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/texturedquad.frag").c_str());
         AssignUniforms("center", "size", "texcenter", "texsize");
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     UniformColoredTextureRectShader::UniformColoredTextureRectShader()
@@ -1890,8 +1991,8 @@ namespace UIShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/uniformcolortexturedquad.frag").c_str());
 
         AssignUniforms("center", "size", "texcenter", "texsize", "color");
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+
+        AssignSamplerNames(Program, 0, "tex");
     }
 
     ColoredTextureRectShader::ColoredTextureRectShader()
@@ -1900,8 +2001,8 @@ namespace UIShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/colortexturedquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/colortexturedquad.frag").c_str());
         AssignUniforms("center", "size", "texcenter", "texsize");
-        TU_tex = 0;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"));
+
+        AssignSamplerNames(Program, 0, "tex");
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 7c60455ee..49b88f97a 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -137,7 +137,7 @@ protected:
     template<typename... U>
     void AssignUniforms_impl(const char* name, U... rest)
     {
-        uniforms.push_back(getUniformLocation(Program, name));
+        uniforms.push_back(glGetUniformLocation(Program, name));
         AssignUniforms_impl(rest...);
     }
 
@@ -159,146 +159,365 @@ public:
     }
 };
 
+enum SamplerType {
+    Trilinear_Anisotropic_Filtered,
+    Semi_trilinear,
+    Bilinear_Filtered,
+    Bilinear_Clamped_Filtered,
+    Nearest_Filtered,
+    Shadow_Sampler,
+    Volume_Linear_Filtered,
+};
+
+void setTextureSampler(GLenum, GLuint, GLuint, GLuint);
+
+template<SamplerType...tp>
+struct CreateSamplers;
+
+template<SamplerType...tp>
+struct BindTexture;
+
+template<>
+struct CreateSamplers<>
+{
+    static void exec(std::vector<unsigned> &, std::vector<GLenum> &e)
+    {}
+};
+
+template<>
+struct BindTexture<>
+{
+    static void exec(const std::vector<unsigned> &TU, const std::vector<unsigned> &TexId, unsigned N)
+    {}
+};
+
+GLuint createNearestSampler();
+
+template<SamplerType...tp>
+struct CreateSamplers<Nearest_Filtered, tp...>
+{
+    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
+    {
+        v.push_back(createNearestSampler());
+        e.push_back(GL_TEXTURE_2D);
+        CreateSamplers<tp...>::exec(v, e);
+    }
+};
+
+void BindTextureNearest(unsigned TU, unsigned tid);
+
+template<SamplerType...tp>
+struct BindTexture<Nearest_Filtered, tp...>
+{
+    static void exec(const std::vector<unsigned> &TU, const std::vector<unsigned> &TexId, unsigned N)
+    {
+        BindTextureNearest(TU[N], TexId[N]);
+        BindTexture<tp...>::exec(TU, TexId, N + 1);
+    }
+};
+
+GLuint createBilinearSampler();
+
+template<SamplerType...tp>
+struct CreateSamplers<Bilinear_Filtered, tp...>
+{
+    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
+    {
+        v.push_back(createBilinearSampler());
+        e.push_back(GL_TEXTURE_2D);
+        CreateSamplers<tp...>::exec(v, e);
+    }
+};
+
+void BindTextureBilinear(unsigned TU, unsigned tex);
+
+template<SamplerType...tp>
+struct BindTexture<Bilinear_Filtered, tp...>
+{
+    static void exec(const std::vector<unsigned> &TU, const std::vector<unsigned> &TexId, unsigned N)
+    {
+        BindTextureBilinear(TU[N], TexId[N]);
+        BindTexture<tp...>::exec(TU, TexId, N + 1);
+    }
+};
+
+GLuint createBilinearClampedSampler();
+
+template<SamplerType...tp>
+struct CreateSamplers<Bilinear_Clamped_Filtered, tp...>
+{
+    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
+    {
+        v.push_back(createBilinearClampedSampler());
+        e.push_back(GL_TEXTURE_2D);
+        CreateSamplers<tp...>::exec(v, e);
+    }
+};
+
+void BindTextureBilinearClamped(unsigned TU, unsigned tex);
+
+template<SamplerType...tp>
+struct BindTexture<Bilinear_Clamped_Filtered, tp...>
+{
+    static void exec(const std::vector<unsigned> &TU, const std::vector<unsigned> &TexId, unsigned N)
+    {
+        BindTextureBilinearClamped(TU[N], TexId[N]);
+        BindTexture<tp...>::exec(TU, TexId, N + 1);
+    }
+};
+
+GLuint createSemiTrilinearSampler();
+
+template<SamplerType...tp>
+struct CreateSamplers<Semi_trilinear, tp...>
+{
+    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
+    {
+        v.push_back(createSemiTrilinearSampler());
+        e.push_back(GL_TEXTURE_2D);
+        CreateSamplers<tp...>::exec(v, e);
+    }
+};
+
+void BindTextureSemiTrilinear(unsigned TU, unsigned tex);
+
+template<SamplerType...tp>
+struct BindTexture<Semi_trilinear, tp...>
+{
+    static void exec(const std::vector<unsigned> &TU, const std::vector<unsigned> &TexId, unsigned N)
+    {
+        BindTextureSemiTrilinear(TU[N], TexId[N]);
+        BindTexture<tp...>::exec(TU, TexId, N + 1);
+    }
+};
+
+GLuint createTrilinearSampler();
+
+template<SamplerType...tp>
+struct CreateSamplers<Trilinear_Anisotropic_Filtered, tp...>
+{
+    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
+    {
+        v.push_back(createTrilinearSampler());
+        e.push_back(GL_TEXTURE_2D);
+        CreateSamplers<tp...>::exec(v, e);
+    }
+};
+
+void BindTextureTrilinearAnisotropic(unsigned TU, unsigned tex);
+
+template<SamplerType...tp>
+struct BindTexture<Trilinear_Anisotropic_Filtered, tp...>
+{
+    static void exec(const std::vector<unsigned> &TU, const std::vector<unsigned> &TexId, unsigned N)
+    {
+        BindTextureTrilinearAnisotropic(TU[N], TexId[N]);
+        BindTexture<tp...>::exec(TU, TexId, N + 1);
+    }
+};
+
+template<SamplerType...tp>
+struct CreateSamplers<Volume_Linear_Filtered, tp...>
+{
+    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
+    {
+        v.push_back(createBilinearSampler());
+        e.push_back(GL_TEXTURE_3D);
+        CreateSamplers<tp...>::exec(v, e);
+    }
+};
+
+void BindTextureVolume(unsigned TU, unsigned tex);
+
+template<SamplerType...tp>
+struct BindTexture<Volume_Linear_Filtered, tp...>
+{
+    static void exec(const std::vector<unsigned> &TU, const std::vector<unsigned> &TexId, unsigned N)
+    {
+        BindTextureVolume(TU[N], TexId[N]);
+        BindTexture<tp...>::exec(TU, TexId, N + 1);
+    }
+};
+
+GLuint createShadowSampler();
+
+template<SamplerType...tp>
+struct CreateSamplers<Shadow_Sampler, tp...>
+{
+    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
+    {
+        v.push_back(createShadowSampler());
+        e.push_back(GL_TEXTURE_2D_ARRAY);
+        CreateSamplers<tp...>::exec(v, e);
+    }
+};
+
+void BindTextureShadow(unsigned TU, unsigned tex);
+
+template<SamplerType...tp>
+struct BindTexture<Shadow_Sampler, tp...>
+{
+    static void exec(const std::vector<unsigned> &TU, const std::vector<unsigned> &TexId, unsigned N)
+    {
+        BindTextureShadow(TU[N], TexId[N]);
+        BindTexture<tp...>::exec(TU, TexId, N + 1);
+    }
+};
+
+template<SamplerType...tp>
+class TextureRead
+{
+private:
+    template<unsigned N, typename...Args>
+    void AssignTextureNames_impl(GLuint)
+    {}
+
+    template<unsigned N, typename...Args>
+    void AssignTextureNames_impl(GLuint Program, GLuint TexUnit, const char *name, Args...args...)
+    {
+        GLuint location = glGetUniformLocation(Program, name);
+        glUniform1i(location, TexUnit);
+        TextureUnits.push_back(TexUnit);
+        AssignTextureNames_impl<N + 1>(Program, args...);
+    }
+
+protected:
+    std::vector<GLuint> SamplersId;
+    std::vector<GLuint> TextureUnits;
+    std::vector<GLenum> TextureType;
+    template<typename...Args>
+    void AssignSamplerNames(GLuint Program, Args...args)
+    {
+        CreateSamplers<tp...>::exec(SamplersId, TextureType);
+
+        glUseProgram(Program);
+        AssignTextureNames_impl<0>(Program, args...);
+        glUseProgram(0);
+    }
+
+public:
+    void SetTextureUnits(const std::vector<GLuint> &args)
+    {
+        assert(args.size() == sizeof...(tp) && "Too much texture unit provided");
+        if (getGLSLVersion() >= 330)
+        {
+            for (unsigned i = 0; i < args.size(); i++)
+            {
+                setTextureSampler(TextureType[i], TextureUnits[i], args[i], SamplersId[i]);
+            }
+        }
+        else
+            BindTexture<tp...>::exec(TextureUnits, args, 0);
+    }
+};
+
 namespace MeshShader
 {
-class ObjectPass1Shader : public ShaderHelperSingleton<ObjectPass1Shader, core::matrix4, core::matrix4>
+class ObjectPass1Shader : public ShaderHelperSingleton<ObjectPass1Shader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
     ObjectPass1Shader();
 };
 
-class ObjectRefPass1Shader : public ShaderHelperSingleton<ObjectRefPass1Shader, core::matrix4, core::matrix4, core::matrix4>
+class ObjectRefPass1Shader : public ShaderHelperSingleton<ObjectRefPass1Shader, core::matrix4, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
     ObjectRefPass1Shader();
 };
 
-class GrassPass1Shader : public ShaderHelperSingleton<GrassPass1Shader, core::matrix4, core::matrix4, core::vector3df>
+class GrassPass1Shader : public ShaderHelperSingleton<GrassPass1Shader, core::matrix4, core::matrix4, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     GrassPass1Shader();
 };
 
-class NormalMapShader : public ShaderHelperSingleton<NormalMapShader, core::matrix4, core::matrix4>
+class NormalMapShader : public ShaderHelperSingleton<NormalMapShader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_normalmap, TU_glossy;
     NormalMapShader();
 };
 
-class InstancedObjectPass1Shader : public ShaderHelperSingleton<InstancedObjectPass1Shader>
+class InstancedObjectPass1Shader : public ShaderHelperSingleton<InstancedObjectPass1Shader>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     InstancedObjectPass1Shader();
 };
 
-class InstancedObjectRefPass1Shader : public ShaderHelperSingleton<InstancedObjectRefPass1Shader>
+class InstancedObjectRefPass1Shader : public ShaderHelperSingleton<InstancedObjectRefPass1Shader>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     InstancedObjectRefPass1Shader();
 };
 
-class InstancedGrassPass1Shader : public ShaderHelperSingleton<InstancedGrassPass1Shader, core::vector3df>
+class InstancedGrassPass1Shader : public ShaderHelperSingleton<InstancedGrassPass1Shader, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     InstancedGrassPass1Shader();
 };
 
-class InstancedNormalMapShader : public ShaderHelperSingleton<InstancedNormalMapShader>
+class InstancedNormalMapShader : public ShaderHelperSingleton<InstancedNormalMapShader>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_glossy, TU_normalmap;
-
     InstancedNormalMapShader();
 };
 
-class ObjectPass2Shader : public ShaderHelperSingleton<ObjectPass2Shader, core::matrix4, core::matrix4>
+class ObjectPass2Shader : public ShaderHelperSingleton<ObjectPass2Shader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_Albedo;
-
     ObjectPass2Shader();
 };
 
-class InstancedObjectPass2Shader : public ShaderHelperSingleton<InstancedObjectPass2Shader>
+class InstancedObjectPass2Shader : public ShaderHelperSingleton<InstancedObjectPass2Shader>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_Albedo;
-
     InstancedObjectPass2Shader();
 };
 
-class InstancedObjectRefPass2Shader : public ShaderHelperSingleton<InstancedObjectRefPass2Shader>
+class InstancedObjectRefPass2Shader : public ShaderHelperSingleton<InstancedObjectRefPass2Shader>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_Albedo;
-
     InstancedObjectRefPass2Shader();
 };
 
-class DetailledObjectPass2Shader : public ShaderHelperSingleton<DetailledObjectPass2Shader, core::matrix4>
+class DetailledObjectPass2Shader : public ShaderHelperSingleton<DetailledObjectPass2Shader, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_Albedo, TU_detail;
-
     DetailledObjectPass2Shader();
 };
 
-class ObjectUnlitShader : public ShaderHelperSingleton<ObjectUnlitShader, core::matrix4, core::matrix4>
+class ObjectUnlitShader : public ShaderHelperSingleton<ObjectUnlitShader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     ObjectUnlitShader();
 };
 
-class ObjectRefPass2Shader : public ShaderHelperSingleton<ObjectRefPass2Shader, core::matrix4, core::matrix4>
+class ObjectRefPass2Shader : public ShaderHelperSingleton<ObjectRefPass2Shader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_Albedo;
-
     ObjectRefPass2Shader();
 };
 
-class GrassPass2Shader : public ShaderHelperSingleton<GrassPass2Shader, core::matrix4, core::vector3df>
+class GrassPass2Shader : public ShaderHelperSingleton<GrassPass2Shader, core::matrix4, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_Albedo;
-
     GrassPass2Shader();
 };
 
-class InstancedGrassPass2Shader : public ShaderHelperSingleton<InstancedGrassPass2Shader, core::vector3df, core::vector3df>
+class InstancedGrassPass2Shader : public ShaderHelperSingleton<InstancedGrassPass2Shader, core::vector3df, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_Albedo, TU_dtex;
-
     InstancedGrassPass2Shader();
 };
 
-class SphereMapShader : public ShaderHelperSingleton<SphereMapShader, core::matrix4, core::matrix4>
+class SphereMapShader : public ShaderHelperSingleton<SphereMapShader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     SphereMapShader();
 };
 
-class SplattingShader : public ShaderHelperSingleton<SplattingShader, core::matrix4>
+class SplattingShader : public ShaderHelperSingleton<SplattingShader, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex_layout, TU_tex_detail0, TU_tex_detail1, TU_tex_detail2, TU_tex_detail3;
-
     SplattingShader();
 };
 
@@ -312,27 +531,21 @@ public:
     static void setUniforms(const core::matrix4 &ModelViewProjectionMatrix, unsigned TU_tex, float time, float transparency);
 };
 
-class TransparentShader : public ShaderHelperSingleton<TransparentShader, core::matrix4, core::matrix4>
+class TransparentShader : public ShaderHelperSingleton<TransparentShader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     TransparentShader();
 };
 
-class TransparentFogShader : public ShaderHelperSingleton<TransparentFogShader, core::matrix4, core::matrix4, float, float, float, float, float, video::SColorf>
+class TransparentFogShader : public ShaderHelperSingleton<TransparentFogShader, core::matrix4, core::matrix4, float, float, float, float, float, video::SColorf>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     TransparentFogShader();
 };
 
-class BillboardShader : public ShaderHelperSingleton<BillboardShader, core::matrix4, core::matrix4, core::vector3df, core::dimension2df>
+class BillboardShader : public ShaderHelperSingleton<BillboardShader, core::matrix4, core::matrix4, core::vector3df, core::dimension2df>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     BillboardShader();
 };
 
@@ -343,59 +556,52 @@ public:
     ColorizeShader();
 };
 
-class ShadowShader : public ShaderHelperSingleton<ShadowShader, core::matrix4>
+class ShadowShader : public ShaderHelperSingleton<ShadowShader, core::matrix4>, public TextureRead<>
 {
 public:
     ShadowShader();
 };
 
-class RSMShader : public ShaderHelperSingleton<RSMShader, core::matrix4, core::matrix4, core::matrix4>
+class RSMShader : public ShaderHelperSingleton<RSMShader, core::matrix4, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     RSMShader();
 };
 
-class SplattingRSMShader : public ShaderHelperSingleton<SplattingRSMShader, core::matrix4, core::matrix4>
+class SplattingRSMShader : public ShaderHelperSingleton<SplattingRSMShader, core::matrix4, core::matrix4>,
+    public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_layout, TU_detail0, TU_detail1, TU_detail2, TU_detail3;
-
     SplattingRSMShader();
 };
 
-class InstancedShadowShader : public ShaderHelperSingleton<InstancedShadowShader>
+class InstancedShadowShader : public ShaderHelperSingleton<InstancedShadowShader>, public TextureRead<>
 {
 public:
     InstancedShadowShader();
 };
 
-class RefShadowShader : public ShaderHelperSingleton<RefShadowShader, core::matrix4>
+class RefShadowShader : public ShaderHelperSingleton<RefShadowShader, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
     RefShadowShader();
 };
 
-class InstancedRefShadowShader : public ShaderHelperSingleton<InstancedRefShadowShader>
+class InstancedRefShadowShader : public ShaderHelperSingleton<InstancedRefShadowShader>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
     InstancedRefShadowShader();
 };
 
-class GrassShadowShader : public ShaderHelperSingleton<GrassShadowShader, core::matrix4, core::vector3df>
+class GrassShadowShader : public ShaderHelperSingleton<GrassShadowShader, core::matrix4, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
     GrassShadowShader();
 };
 
-class InstancedGrassShadowShader : public ShaderHelperSingleton<InstancedGrassShadowShader, core::vector3df>
+class InstancedGrassShadowShader : public ShaderHelperSingleton<InstancedGrassShadowShader, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_tex;
     InstancedGrassShadowShader();
 };
 
@@ -405,11 +611,9 @@ public:
     DisplaceMaskShader();
 };
 
-class DisplaceShader : public ShaderHelperSingleton<DisplaceShader, core::matrix4, core::vector2df, core::vector2df>
+class DisplaceShader : public ShaderHelperSingleton<DisplaceShader, core::matrix4, core::vector2df, core::vector2df>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
-    GLuint TU_displacement_tex, TU_mask_tex, TU_color_tex, TU_tex;
-
     DisplaceShader();
 };
 
@@ -495,19 +699,15 @@ public:
     HeightmapSimulationShader();
 };
 
-class SimpleParticleRender : public ShaderHelperSingleton<SimpleParticleRender, video::SColorf, video::SColorf>
+class SimpleParticleRender : public ShaderHelperSingleton<SimpleParticleRender, video::SColorf, video::SColorf>, public TextureRead<Trilinear_Anisotropic_Filtered, Nearest_Filtered>
 {
 public:
-    GLuint TU_tex, TU_dtex;
-
     SimpleParticleRender();
 };
 
-class FlipParticleRender : public ShaderHelperSingleton<FlipParticleRender>
+class FlipParticleRender : public ShaderHelperSingleton<FlipParticleRender>, public TextureRead<Trilinear_Anisotropic_Filtered, Nearest_Filtered>
 {
 public:
-    GLuint TU_tex, TU_dtex;
-
     FlipParticleRender();
 };
 }
@@ -515,35 +715,27 @@ public:
 namespace FullScreenShader
 {
 
-class BloomShader : public ShaderHelperSingleton<BloomShader>
+class BloomShader : public ShaderHelperSingleton<BloomShader>, public TextureRead<Nearest_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     BloomShader();
 };
 
-class BloomBlendShader : public ShaderHelperSingleton<BloomBlendShader>
+class BloomBlendShader : public ShaderHelperSingleton<BloomBlendShader>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
 {
 public:
-    GLuint TU_tex_128, TU_tex_256, TU_tex_512;
-
     BloomBlendShader();
 };
 
-class ToneMapShader : public ShaderHelperSingleton<ToneMapShader>
+class ToneMapShader : public ShaderHelperSingleton<ToneMapShader>, public TextureRead<Nearest_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     ToneMapShader();
 };
 
-class DepthOfFieldShader : public ShaderHelperSingleton<DepthOfFieldShader>
+class DepthOfFieldShader : public ShaderHelperSingleton<DepthOfFieldShader>, public TextureRead<Bilinear_Filtered, Nearest_Filtered>
 {
 public:
-    GLuint TU_tex, TU_depth;
-
     DepthOfFieldShader();
 };
 
@@ -565,19 +757,15 @@ public:
     static void setUniforms(const core::matrix4 &TransposeViewMatrix, const float *blueSHCoeff, const float *greenSHCoeff, const float *redSHCoeff, unsigned TU_ntex);
 };
 
-class ShadowedSunLightShader : public ShaderHelperSingleton<ShadowedSunLightShader, core::vector3df, video::SColorf>
+class ShadowedSunLightShader : public ShaderHelperSingleton<ShadowedSunLightShader, core::vector3df, video::SColorf>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Shadow_Sampler>
 {
 public:
-    GLuint TU_ntex, TU_dtex, TU_shadowtex;
-
     ShadowedSunLightShader();
 };
 
-class RadianceHintsConstructionShader : public ShaderHelperSingleton<RadianceHintsConstructionShader, core::matrix4, core::matrix4, core::vector3df>
+class RadianceHintsConstructionShader : public ShaderHelperSingleton<RadianceHintsConstructionShader, core::matrix4, core::matrix4, core::vector3df>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
 {
 public:
-    GLuint TU_ctex, TU_ntex, TU_dtex;
-
     RadianceHintsConstructionShader();
 };
 
@@ -598,11 +786,10 @@ public:
     RHDebug();
 };
 
-class GlobalIlluminationReconstructionShader : public ShaderHelperSingleton<GlobalIlluminationReconstructionShader, core::matrix4, core::matrix4, core::vector3df>
+class GlobalIlluminationReconstructionShader : public ShaderHelperSingleton<GlobalIlluminationReconstructionShader, core::matrix4, core::matrix4, core::vector3df>,
+    public TextureRead<Nearest_Filtered, Nearest_Filtered, Volume_Linear_Filtered, Volume_Linear_Filtered, Volume_Linear_Filtered>
 {
 public:
-    GLuint TU_ntex, TU_dtex, TU_SHR, TU_SHG, TU_SHB, uniform_RHMatrix;
-
     GlobalIlluminationReconstructionShader();
 };
 
@@ -621,19 +808,15 @@ public:
     ComputeGaussian17TapHShader();
 };
 
-class Gaussian6HBlurShader : public ShaderHelperSingleton<Gaussian6HBlurShader, core::vector2df>
+class Gaussian6HBlurShader : public ShaderHelperSingleton<Gaussian6HBlurShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     Gaussian6HBlurShader();
 };
 
-class Gaussian3HBlurShader : public ShaderHelperSingleton<Gaussian3HBlurShader, core::vector2df>
+class Gaussian3HBlurShader : public ShaderHelperSingleton<Gaussian3HBlurShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     Gaussian3HBlurShader();
 };
 
@@ -654,26 +837,21 @@ public:
 };
 
 
-class Gaussian6VBlurShader : public ShaderHelperSingleton<Gaussian6VBlurShader, core::vector2df>
+class Gaussian6VBlurShader : public ShaderHelperSingleton<Gaussian6VBlurShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     Gaussian6VBlurShader();
 };
 
-class Gaussian3VBlurShader : public ShaderHelperSingleton<Gaussian3VBlurShader, core::vector2df>
+class Gaussian3VBlurShader : public ShaderHelperSingleton<Gaussian3VBlurShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     Gaussian3VBlurShader();
 };
 
-class PassThroughShader : public ShaderHelperSingleton<PassThroughShader>
+class PassThroughShader : public ShaderHelperSingleton<PassThroughShader>, public TextureRead<Bilinear_Filtered>
 {
 public:
-    GLuint TU_tex;
     GLuint vao;
 
     PassThroughShader();
@@ -688,87 +866,73 @@ public:
     LayerPassThroughShader();
 };
 
-class LinearizeDepthShader : public ShaderHelperSingleton<LinearizeDepthShader, float, float>
+class LinearizeDepthShader : public ShaderHelperSingleton<LinearizeDepthShader, float, float>, public TextureRead<Bilinear_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     LinearizeDepthShader();
 };
 
-class GlowShader : public ShaderHelperSingleton<GlowShader>
+class GlowShader : public ShaderHelperSingleton<GlowShader>, public TextureRead<Bilinear_Filtered>
 {
 public:
-    GLuint TU_tex;
     GLuint vao;
 
     GlowShader();
 };
 
-class SSAOShader : public ShaderHelperSingleton<SSAOShader, float, float, float>
+class SSAOShader : public ShaderHelperSingleton<SSAOShader, float, float, float>, public TextureRead<Semi_trilinear>
 {
 public:
-    GLuint TU_dtex;
-
     SSAOShader();
 };
 
-class FogShader : public ShaderHelperSingleton<FogShader, float, float, float, float, float, core::vector3df>
+class FogShader : public ShaderHelperSingleton<FogShader, float, float, float, float, float, core::vector3df>, public TextureRead<Nearest_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     FogShader();
 };
 
-class MotionBlurShader : public ShaderHelperSingleton<MotionBlurShader, core::matrix4, core::vector2df, float, float>
+class MotionBlurShader : public ShaderHelperSingleton<MotionBlurShader, core::matrix4, core::vector2df, float, float>, public TextureRead<Bilinear_Clamped_Filtered, Nearest_Filtered>
 {
 public:
-    GLuint TU_cb, TU_dtex;
-
     MotionBlurShader();
 };
 
-class GodFadeShader : public ShaderHelperSingleton<GodFadeShader, video::SColorf>
+class GodFadeShader : public ShaderHelperSingleton<GodFadeShader, video::SColorf>, public TextureRead<Bilinear_Filtered>
 {
 public:
-    GLuint TU_tex;
     GLuint vao;
 
     GodFadeShader();
 };
 
-class GodRayShader : public ShaderHelperSingleton<GodRayShader, core::vector2df>
+class GodRayShader : public ShaderHelperSingleton<GodRayShader, core::vector2df>, public TextureRead<Bilinear_Filtered>
 {
 public:
-    GLuint TU_tex;
     GLuint vao;
 
     GodRayShader();
 };
 
-class MLAAColorEdgeDetectionSHader : public ShaderHelperSingleton<MLAAColorEdgeDetectionSHader, core::vector2df>
+class MLAAColorEdgeDetectionSHader : public ShaderHelperSingleton<MLAAColorEdgeDetectionSHader, core::vector2df>, public TextureRead<Nearest_Filtered>
 {
 public:
-    GLuint TU_colorMapG;
     GLuint vao;
 
     MLAAColorEdgeDetectionSHader();
 };
 
-class MLAABlendWeightSHader : public ShaderHelperSingleton<MLAABlendWeightSHader, core::vector2df>
+class MLAABlendWeightSHader : public ShaderHelperSingleton<MLAABlendWeightSHader, core::vector2df>, public TextureRead<Bilinear_Filtered, Nearest_Filtered>
 {
 public:
-    GLuint TU_edgesMap, TU_areaMap;
     GLuint vao;
 
     MLAABlendWeightSHader();
 };
 
-class MLAAGatherSHader : public ShaderHelperSingleton<MLAAGatherSHader, core::vector2df>
+class MLAAGatherSHader : public ShaderHelperSingleton<MLAAGatherSHader, core::vector2df>, public TextureRead<Nearest_Filtered, Nearest_Filtered>
 {
 public:
-    GLuint TU_colorMap, TU_blendMap;
     GLuint vao;
 
     MLAAGatherSHader();
@@ -778,26 +942,21 @@ public:
 
 namespace UIShader
 {
-class TextureRectShader : public ShaderHelperSingleton<TextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df>
+class TextureRectShader : public ShaderHelperSingleton<TextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df>, public TextureRead<Bilinear_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     TextureRectShader();
 };
 
-class UniformColoredTextureRectShader : public ShaderHelperSingleton<UniformColoredTextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df, video::SColor>
+class UniformColoredTextureRectShader : public ShaderHelperSingleton<UniformColoredTextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df, video::SColor>, public TextureRead<Bilinear_Filtered>
 {
 public:
-    GLuint TU_tex;
-
     UniformColoredTextureRectShader();
 };
 
-class ColoredTextureRectShader : public ShaderHelperSingleton<ColoredTextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df>
+class ColoredTextureRectShader : public ShaderHelperSingleton<ColoredTextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df>, public TextureRead<Bilinear_Filtered>
 {
 public:
-    GLuint TU_tex;
     GLuint colorvbo;
     GLuint vao;
 
diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stkbillboard.cpp
index b04d65e5e..3f2328c60 100644
--- a/src/graphics/stkbillboard.cpp
+++ b/src/graphics/stkbillboard.cpp
@@ -51,8 +51,8 @@ void STKBillboard::render()
         return;
     compressTexture(tex, true, true);
     GLuint texid = getTextureGLuint(tex);
-    setTexture(0, texid, GL_LINEAR, GL_LINEAR);
     glUseProgram(MeshShader::BillboardShader::getInstance()->Program);
+    MeshShader::BillboardShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ texid });
     MeshShader::BillboardShader::getInstance()->setUniforms(irr_driver->getViewMatrix(), irr_driver->getProjMatrix(), pos, Size);
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
     glBindVertexArray(0);
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 54db127c7..4640ac59a 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -278,7 +278,7 @@ void STKMeshSceneNode::render()
                 GLenum itype = mesh.IndexType;
                 size_t count = mesh.IndexCount;
 
-                setTexture(MeshShader::ObjectPass2Shader::getInstance()->TU_Albedo, getTextureGLuint(spareWhiteTex), GL_NEAREST, GL_NEAREST, false);
+                MeshShader::ObjectPass2Shader::getInstance()->SetTextureUnits(std::vector<GLuint>{ getTextureGLuint(spareWhiteTex) });
                 MeshShader::ObjectPass2Shader::getInstance()->setUniforms(AbsoluteTransformation, mesh.TextureMatrix);
                 assert(mesh.vao);
                 glBindVertexArray(mesh.vao);
@@ -341,7 +341,7 @@ void STKMeshSceneNode::render()
                         tmpcol.getBlue() / 255.0f);
 
                     compressTexture(mesh.textures[0], true);
-                    setTexture(MeshShader::TransparentFogShader::getInstance()->TU_tex, getTextureGLuint(mesh.textures[0]), GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, true);
+                    MeshShader::TransparentFogShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ getTextureGLuint(mesh.textures[0]) });
                     MeshShader::TransparentFogShader::getInstance()->setUniforms(AbsoluteTransformation, mesh.TextureMatrix, fogmax, startH, endH, start, end, col);
 
                     assert(mesh.vao);
@@ -362,7 +362,7 @@ void STKMeshSceneNode::render()
                     size_t count = mesh.IndexCount;
 
                     compressTexture(mesh.textures[0], true);
-                    setTexture(MeshShader::TransparentShader::getInstance()->TU_tex, getTextureGLuint(mesh.textures[0]), GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, true);
+                    MeshShader::TransparentShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ getTextureGLuint(mesh.textures[0]) });
 
                     MeshShader::TransparentShader::getInstance()->setUniforms(AbsoluteTransformation, mesh.TextureMatrix);
                     assert(mesh.vao);

From a28f4d26b46f64d1e50824e79a81a5fb5d6d768b Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 20 Aug 2014 01:13:39 +0200
Subject: [PATCH 043/248] Add a "createVector" function for OSX

---
 src/graphics/post_processing.cpp |  5 +++--
 src/utils/cpp2011.hpp            | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index bd58563a4..d51fc2816 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -33,6 +33,7 @@
 #include "tracks/track.hpp"
 #include "utils/log.hpp"
 #include "utils/profiler.hpp"
+#include "utils/cpp2011.hpp"
 
 #include <SViewFrustum.h>
 
@@ -711,8 +712,8 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
             glEnable(GL_BLEND);
             glBlendFunc(GL_ONE, GL_ONE);
             glBlendEquation(GL_FUNC_ADD);
-            FullScreenShader::BloomBlendShader::getInstance()->SetTextureUnits(std::vector<GLuint>
-                { irr_driver->getRenderTargetTexture(RTT_BLOOM_128), irr_driver->getRenderTargetTexture(RTT_BLOOM_256), irr_driver->getRenderTargetTexture(RTT_BLOOM_512) });
+            FullScreenShader::BloomBlendShader::getInstance()->SetTextureUnits(createVector<GLuint>(
+                irr_driver->getRenderTargetTexture(RTT_BLOOM_128), irr_driver->getRenderTargetTexture(RTT_BLOOM_256), irr_driver->getRenderTargetTexture(RTT_BLOOM_512) ));
             DrawFullScreenEffect<FullScreenShader::BloomBlendShader>();
 
             glDisable(GL_BLEND);
diff --git a/src/utils/cpp2011.hpp b/src/utils/cpp2011.hpp
index d1d5a2d79..8d36330b4 100644
--- a/src/utils/cpp2011.hpp
+++ b/src/utils/cpp2011.hpp
@@ -27,4 +27,28 @@ void pushVector(std::vector<T> *vec, Args ...args)
     vec->emplace_back(args...);
 #endif
 }
+
+struct Util
+{
+    template <typename T>
+    static void populate(std::vector<T> &v)
+    { }
+
+    template <typename T, typename...Args>
+    static void populate(std::vector<T> &v, T t, Args... args)
+    {
+        v.push_back(t);
+        populate<T>(v, args...);
+    }
+};
+
+
+template<typename T, typename...Args>
+static std::vector<T> createVector(Args...args)
+{
+    std::vector<T> result = std::vector<T>();
+    Util::populate(result, args...);
+    return result;
+}
+
 #endif
\ No newline at end of file

From 190aed62193dd6b54dfc4219113d40a4165ec1b9 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 20 Aug 2014 01:27:26 +0200
Subject: [PATCH 044/248] Use createVector in some others places

---
 src/graphics/post_processing.cpp | 2 +-
 src/graphics/render_geometry.cpp | 2 +-
 src/utils/cpp2011.hpp            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index d51fc2816..a276f35e0 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -292,7 +292,7 @@ void PostProcessing::renderShadowedSunlight(const std::vector<core::matrix4> &su
     glBlendFunc(GL_ONE, GL_ONE);
     glBlendEquation(GL_FUNC_ADD);
 
-    FullScreenShader::ShadowedSunLightShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), depthtex });
+    FullScreenShader::ShadowedSunLightShader::getInstance()->SetTextureUnits(createVector<GLuint>( irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), depthtex ));
     DrawFullScreenEffect<FullScreenShader::ShadowedSunLightShader>(cb->getPosition(), video::SColorf(cb->getRed(), cb->getGreen(), cb->getBlue()));
 }
 
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 864c7587c..3be82c294 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -830,5 +830,5 @@ void IrrDriver::renderRSM()
     drawRSM<MeshShader::RSMShader, EVT_TANGENTS, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatNormalMap::getInstance());
     drawRSM<MeshShader::RSMShader, EVT_STANDARD, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatUnlit::getInstance());
     drawRSM<MeshShader::RSMShader, EVT_2TCOORDS, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatDetails::getInstance());
-    drawRSM<MeshShader::SplattingRSMShader, EVT_2TCOORDS, 1>(rsm_matrix, std::vector<GLuint>{ 1, 2, 3, 4, 5}, ListMatSplatting::getInstance());
+    drawRSM<MeshShader::SplattingRSMShader, EVT_2TCOORDS, 1>(rsm_matrix, createVector<GLuint>(1, 2, 3, 4, 5), ListMatSplatting::getInstance());
 }
diff --git a/src/utils/cpp2011.hpp b/src/utils/cpp2011.hpp
index 8d36330b4..2cf0a2f88 100644
--- a/src/utils/cpp2011.hpp
+++ b/src/utils/cpp2011.hpp
@@ -47,7 +47,7 @@ template<typename T, typename...Args>
 static std::vector<T> createVector(Args...args)
 {
     std::vector<T> result = std::vector<T>();
-    Util::populate(result, args...);
+    Util::template populate<T>(result, args...);
     return result;
 }
 

From d0e22164d51569ce4edb8befd25e46d278738278 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 20 Aug 2014 01:31:11 +0200
Subject: [PATCH 045/248] Add some ifdef for OSX

---
 src/graphics/render_geometry.cpp | 15 ++++++++++++---
 src/graphics/shaders.cpp         |  2 ++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 3be82c294..561745216 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -380,11 +380,20 @@ void IrrDriver::renderSolidSecondPass()
     glEnable(GL_DEPTH_TEST);
     glDisable(GL_ALPHA_TEST);
     glDisable(GL_BLEND);
-    glBindSampler(0, 0);
+#ifdef WIN32
+    if (irr_driver->getGLSLVersion() >= 330)
+        glBindSampler(0, 0);
+#endif
     setTexture(0, m_rtts->getRenderTarget(RTT_TMP1), GL_NEAREST, GL_NEAREST);
-    glBindSampler(1, 0);
+#ifdef WIN32
+    if (irr_driver->getGLSLVersion() >= 330)
+        glBindSampler(1, 0);
+#endif
     setTexture(1, m_rtts->getRenderTarget(RTT_TMP2), GL_NEAREST, GL_NEAREST);
-    glBindSampler(2, 0);
+#ifdef WIN32
+    if (irr_driver->getGLSLVersion() >= 330)
+        glBindSampler(2, 0);
+#endif
     setTexture(2, m_rtts->getRenderTarget(RTT_HALF1_R), GL_LINEAR, GL_LINEAR);
 
     {
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 335485c69..04122bc29 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -597,9 +597,11 @@ void glUniform1iWrapper(GLuint a, int b)
 
 void setTextureSampler(GLenum tp, GLuint texunit, GLuint tid, GLuint sid)
 {
+#ifdef WIN32
     glActiveTexture(GL_TEXTURE0 + texunit);
     glBindTexture(tp, tid);
     glBindSampler(texunit, sid);
+#endif
 }
 
 

From ef95f5703a674588ace45cba5cdcda7b80912c8d Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 20 Aug 2014 01:37:50 +0200
Subject: [PATCH 046/248] Add createVector in another place.

---
 src/graphics/post_processing.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index a276f35e0..bf0691379 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -264,8 +264,8 @@ void PostProcessing::renderGI(const core::matrix4 &RHMatrix, const core::vector3
     core::matrix4 InvRHMatrix;
     RHMatrix.getInverse(InvRHMatrix);
     glDisable(GL_DEPTH_TEST);
-    FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()->SetTextureUnits(std::vector<GLuint>
-        { irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), shr, shg, shb });
+    FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()->SetTextureUnits(createVector<GLuint>
+        (irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), shr, shg, shb ));
     DrawFullScreenEffect<FullScreenShader::GlobalIlluminationReconstructionShader>(RHMatrix, InvRHMatrix, rh_extend);
 }
 

From 5788073b17ab9b4bc5dbbf8499bf4b519497a2b9 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 19 Aug 2014 19:44:27 -0400
Subject: [PATCH 047/248] osx fixes

---
 src/graphics/post_processing.cpp | 4 ++--
 src/graphics/render_geometry.cpp | 5 ++++-
 src/graphics/render_lighting.cpp | 8 +++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index a276f35e0..51152352f 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -264,8 +264,8 @@ void PostProcessing::renderGI(const core::matrix4 &RHMatrix, const core::vector3
     core::matrix4 InvRHMatrix;
     RHMatrix.getInverse(InvRHMatrix);
     glDisable(GL_DEPTH_TEST);
-    FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()->SetTextureUnits(std::vector<GLuint>
-        { irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), shr, shg, shb });
+    FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()->SetTextureUnits(createVector<GLuint>(
+        irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), shr, shg, shb));
     DrawFullScreenEffect<FullScreenShader::GlobalIlluminationReconstructionShader>(RHMatrix, InvRHMatrix, rh_extend);
 }
 
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 561745216..97bd5b052 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -608,7 +608,10 @@ void IrrDriver::renderTransparent()
         size_t count = mesh.IndexCount;
         // Render the effect
         MeshShader::DisplaceShader::getInstance()->SetTextureUnits(
-            { getTextureGLuint(displaceTex), irr_driver->getRenderTargetTexture(RTT_COLOR), irr_driver->getRenderTargetTexture(RTT_TMP1), getTextureGLuint(mesh.textures[0]) });
+            createVector<GLuint>(getTextureGLuint(displaceTex),
+                irr_driver->getRenderTargetTexture(RTT_COLOR),
+                irr_driver->getRenderTargetTexture(RTT_TMP1),
+                getTextureGLuint(mesh.textures[0])));
         glUseProgram(MeshShader::DisplaceShader::getInstance()->Program);
         MeshShader::DisplaceShader::getInstance()->setUniforms(AbsoluteTransformation,
             core::vector2df(cb->getDirX(), cb->getDirY()),
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 97d08dc92..36fd61aa2 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -155,7 +155,13 @@ void IrrDriver::renderLights(unsigned pointlightcount)
         else
         {
             glUseProgram(FullScreenShader::RadianceHintsConstructionShader::getInstance()->Program);
-            FullScreenShader::RadianceHintsConstructionShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ m_rtts->getRSM().getRTT()[0], m_rtts->getRSM().getRTT()[1], m_rtts->getRSM().getDepthTexture() });
+            FullScreenShader::RadianceHintsConstructionShader::getInstance()->SetTextureUnits(
+                createVector<GLuint>(
+                    m_rtts->getRSM().getRTT()[0],
+                    m_rtts->getRSM().getRTT()[1],
+                    m_rtts->getRSM().getDepthTexture()
+                )
+            );
             FullScreenShader::RadianceHintsConstructionShader::getInstance()->setUniforms(rsm_matrix, rh_matrix, rh_extend);
             glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, 32);
         }

From 953dd9db0ddeb7f6eb1bdb6c7c375a85eda7ef54 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 20 Aug 2014 01:48:20 +0200
Subject: [PATCH 048/248] Put some others bunch of code between ifdef win32

---
 src/graphics/shaders.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 04122bc29..2ebde1a12 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -607,6 +607,7 @@ void setTextureSampler(GLenum tp, GLuint texunit, GLuint tid, GLuint sid)
 
 GLuint createNearestSampler()
 {
+#ifdef WIN32
     unsigned id;
     glGenSamplers(1, &id);
     glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
@@ -615,6 +616,7 @@ GLuint createNearestSampler()
     glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
     glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
     return id;
+#endif
 }
 
 void BindTextureNearest(GLuint TU, GLuint tex)
@@ -630,6 +632,7 @@ void BindTextureNearest(GLuint TU, GLuint tex)
 
 GLuint createBilinearSampler()
 {
+#ifdef WIN32
     unsigned id;
     glGenSamplers(1, &id);
     glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -638,6 +641,7 @@ GLuint createBilinearSampler()
     glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
     glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
     return id;
+#endif
 }
 
 void BindTextureBilinear(GLuint TU, GLuint tex)
@@ -653,6 +657,7 @@ void BindTextureBilinear(GLuint TU, GLuint tex)
 
 GLuint createBilinearClampedSampler()
 {
+#ifdef WIN32
     unsigned id;
     glGenSamplers(1, &id);
     glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -661,6 +666,7 @@ GLuint createBilinearClampedSampler()
     glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
     return id;
+#endif
 }
 
 void BindTextureBilinearClamped(GLuint TU, GLuint tex)
@@ -676,6 +682,7 @@ void BindTextureBilinearClamped(GLuint TU, GLuint tex)
 
 GLuint createSemiTrilinearSampler()
 {
+#ifdef WIN32
     unsigned id;
     glGenSamplers(1, &id);
     glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -684,6 +691,7 @@ GLuint createSemiTrilinearSampler()
     glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
     return id;
+#endif
 }
 
 void BindTextureSemiTrilinear(GLuint TU, GLuint tex)
@@ -699,6 +707,7 @@ void BindTextureSemiTrilinear(GLuint TU, GLuint tex)
 
 GLuint createTrilinearSampler()
 {
+#ifdef WIN32
     unsigned id;
     glGenSamplers(1, &id);
     glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -710,6 +719,7 @@ GLuint createTrilinearSampler()
     if (aniso == 0) aniso = 1;
     glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
     return id;
+#endif
 }
 
 void BindTextureTrilinearAnisotropic(GLuint TU, GLuint tex)
@@ -728,6 +738,7 @@ void BindTextureTrilinearAnisotropic(GLuint TU, GLuint tex)
 
 GLuint createShadowSampler()
 {
+#ifdef WIN32
     unsigned id;
     glGenSamplers(1, &id);
     glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -737,6 +748,7 @@ GLuint createShadowSampler()
     glSamplerParameterf(id, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
     glSamplerParameterf(id, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
     return id;
+#endif
 }
 
 void BindTextureShadow(GLuint TU, GLuint tex)

From af4fdaf96b144e55b2ffb2db0050d797dff0d579 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 20 Aug 2014 01:56:04 +0200
Subject: [PATCH 049/248] Add "functionnal" include in debug.cpp

---
 src/utils/debug.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/utils/debug.cpp b/src/utils/debug.cpp
index 57a74ec8e..e1846081a 100644
--- a/src/utils/debug.cpp
+++ b/src/utils/debug.cpp
@@ -34,6 +34,9 @@
 #include "utils/profiler.hpp"
 #include <IGUIEnvironment.h>
 #include <IGUIContextMenu.h>
+
+#include <functional>
+
 using namespace irr;
 using namespace gui;
 

From b3e6ed03b1241452b69aca036a774a16e8c5c2da Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 20 Aug 2014 01:56:16 +0200
Subject: [PATCH 050/248] Use VERSION_3_3 macro

---
 src/graphics/render_geometry.cpp |  6 +++---
 src/graphics/shaders.cpp         | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 97bd5b052..d925742e8 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -380,17 +380,17 @@ void IrrDriver::renderSolidSecondPass()
     glEnable(GL_DEPTH_TEST);
     glDisable(GL_ALPHA_TEST);
     glDisable(GL_BLEND);
-#ifdef WIN32
+#ifdef GL_VERSION_3_3
     if (irr_driver->getGLSLVersion() >= 330)
         glBindSampler(0, 0);
 #endif
     setTexture(0, m_rtts->getRenderTarget(RTT_TMP1), GL_NEAREST, GL_NEAREST);
-#ifdef WIN32
+#ifdef GL_VERSION_3_3
     if (irr_driver->getGLSLVersion() >= 330)
         glBindSampler(1, 0);
 #endif
     setTexture(1, m_rtts->getRenderTarget(RTT_TMP2), GL_NEAREST, GL_NEAREST);
-#ifdef WIN32
+#ifdef GL_VERSION_3_3
     if (irr_driver->getGLSLVersion() >= 330)
         glBindSampler(2, 0);
 #endif
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 2ebde1a12..f1679a201 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -597,7 +597,7 @@ void glUniform1iWrapper(GLuint a, int b)
 
 void setTextureSampler(GLenum tp, GLuint texunit, GLuint tid, GLuint sid)
 {
-#ifdef WIN32
+#ifdef GL_VERSION_3_3
     glActiveTexture(GL_TEXTURE0 + texunit);
     glBindTexture(tp, tid);
     glBindSampler(texunit, sid);
@@ -607,7 +607,7 @@ void setTextureSampler(GLenum tp, GLuint texunit, GLuint tid, GLuint sid)
 
 GLuint createNearestSampler()
 {
-#ifdef WIN32
+#ifdef GL_VERSION_3_3
     unsigned id;
     glGenSamplers(1, &id);
     glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
@@ -632,7 +632,7 @@ void BindTextureNearest(GLuint TU, GLuint tex)
 
 GLuint createBilinearSampler()
 {
-#ifdef WIN32
+#ifdef GL_VERSION_3_3
     unsigned id;
     glGenSamplers(1, &id);
     glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -657,7 +657,7 @@ void BindTextureBilinear(GLuint TU, GLuint tex)
 
 GLuint createBilinearClampedSampler()
 {
-#ifdef WIN32
+#ifdef GL_VERSION_3_3
     unsigned id;
     glGenSamplers(1, &id);
     glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -682,7 +682,7 @@ void BindTextureBilinearClamped(GLuint TU, GLuint tex)
 
 GLuint createSemiTrilinearSampler()
 {
-#ifdef WIN32
+#ifdef GL_VERSION_3_3
     unsigned id;
     glGenSamplers(1, &id);
     glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -707,7 +707,7 @@ void BindTextureSemiTrilinear(GLuint TU, GLuint tex)
 
 GLuint createTrilinearSampler()
 {
-#ifdef WIN32
+#ifdef GL_VERSION_3_3
     unsigned id;
     glGenSamplers(1, &id);
     glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -738,7 +738,7 @@ void BindTextureTrilinearAnisotropic(GLuint TU, GLuint tex)
 
 GLuint createShadowSampler()
 {
-#ifdef WIN32
+#ifdef GL_VERSION_3_3
     unsigned id;
     glGenSamplers(1, &id);
     glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

From 5559a9fd1daff52f9b23c235494cb49899a63d16 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 20 Aug 2014 02:02:34 +0200
Subject: [PATCH 051/248] Add some #if !defined(APPLE) in debug screen

---
 src/states_screens/dialogs/debug_slider.cpp | 2 ++
 src/states_screens/dialogs/debug_slider.hpp | 5 ++++-
 src/utils/debug.cpp                         | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/states_screens/dialogs/debug_slider.cpp b/src/states_screens/dialogs/debug_slider.cpp
index 006a05c8b..fe54611c1 100644
--- a/src/states_screens/dialogs/debug_slider.cpp
+++ b/src/states_screens/dialogs/debug_slider.cpp
@@ -39,6 +39,7 @@ DebugSliderDialog::DebugSliderDialog() : ModalDialog(0.85f, 0.25f, MODAL_DIALOG_
     loadFromFile("debug_slider.stkgui");
 }
 
+#if !defined(__APPLE__)
 void DebugSliderDialog::setSliderHook(std::string id, unsigned min, unsigned max, std::function<int()> G, std::function<void(int)> S)
 {
     getWidget<SpinnerWidget>(id.c_str())->setValue(G());
@@ -46,6 +47,7 @@ void DebugSliderDialog::setSliderHook(std::string id, unsigned min, unsigned max
     getWidget<SpinnerWidget>(id.c_str())->setMax(max);
     Setters[id] = S;
 }
+#endif
 
 // ------------------------------------------------------------------------------------------------------
 
diff --git a/src/states_screens/dialogs/debug_slider.hpp b/src/states_screens/dialogs/debug_slider.hpp
index 5c4aaf734..8cd01acbc 100644
--- a/src/states_screens/dialogs/debug_slider.hpp
+++ b/src/states_screens/dialogs/debug_slider.hpp
@@ -33,14 +33,17 @@ class DebugSliderDialog : public GUIEngine::ModalDialog
 private:
 
     std::string m_id;
+#if !defined(__APPLE__)
     std::map<std::string, std::function<void(int)> >Setters;
+#endif
 
 public:
     DebugSliderDialog();
 
     ~DebugSliderDialog();
-
+#if !defined(__APPLE__)
     void setSliderHook(std::string id, unsigned min, unsigned max, std::function<int()> G, std::function<void(int)> S);
+#endif
 
     virtual void onEnterPressedInternal() OVERRIDE;
     virtual void onUpdate(float dt) OVERRIDE;
diff --git a/src/utils/debug.cpp b/src/utils/debug.cpp
index e1846081a..62bbc8dd3 100644
--- a/src/utils/debug.cpp
+++ b/src/utils/debug.cpp
@@ -35,8 +35,6 @@
 #include <IGUIEnvironment.h>
 #include <IGUIContextMenu.h>
 
-#include <functional>
-
 using namespace irr;
 using namespace gui;
 
@@ -439,6 +437,7 @@ bool onEvent(const SEvent &event)
                 }
                 else if (cmdID == DEBUG_VISUAL_VALUES)
                 {
+#if !defined(__APPLE__)
                     DebugSliderDialog *dsd = new DebugSliderDialog();
                     dsd->setSliderHook( "red_slider", 0, 255, [](){ return irr_driver->getAmbientLight().r * 255.; },
                         [](int v){
@@ -467,6 +466,7 @@ bool onEvent(const SEvent &event)
                     dsd->setSliderHook("ssao_sigma", 0, 100, [](){ return irr_driver->getSSAOSigma() * 10; },
                         [](int v){irr_driver->setSSAOSigma(v / 10.); }
                     );
+#endif
                 }
             }
 

From 4197e2c320dd1f50cdf4b1ad70d80b8781f0c02c Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 20 Aug 2014 02:05:16 +0200
Subject: [PATCH 052/248] Another ifdef sets...

---
 src/states_screens/dialogs/debug_slider.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/states_screens/dialogs/debug_slider.cpp b/src/states_screens/dialogs/debug_slider.cpp
index fe54611c1..38a210b51 100644
--- a/src/states_screens/dialogs/debug_slider.cpp
+++ b/src/states_screens/dialogs/debug_slider.cpp
@@ -69,12 +69,16 @@ void DebugSliderDialog::onEnterPressedInternal()
 
 GUIEngine::EventPropagation DebugSliderDialog::processEvent(const std::string& eventSource)
 {
+#if !defined(__APPLE__)
     if (Setters.find(eventSource) == Setters.end())
+#endif
         return GUIEngine::EVENT_LET;
+#if !defined(__APPLE__)
     int value = getWidget<SpinnerWidget>(eventSource.c_str())->getValue();
     Log::info("DebugSlider", "Value for <%s> : %i", eventSource.c_str(), value);
     Setters[eventSource](value);
     return GUIEngine::EVENT_BLOCK;
+#endif
 }
 
 // ------------------------------------------------------------------------------------------------------

From 7de6b7adcd7095e4dda9b77a21127518f3abbce5 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 20 Aug 2014 02:21:34 +0200
Subject: [PATCH 053/248] Use createVector in others places

---
 src/graphics/glwrap.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 3913133a4..6cddac011 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -3,6 +3,7 @@
 #include <string>
 #include "config/user_config.hpp"
 #include "utils/profiler.hpp"
+#include "utils/cpp2011.hpp"
 
 #ifdef _IRR_WINDOWS_API_
 #define IRR_OGL_LOAD_EXTENSION(X) wglGetProcAddress(reinterpret_cast<const char*>(X))
@@ -932,7 +933,7 @@ static void drawTexColoredQuad(const video::ITexture *texture, const video::SCol
     glUseProgram(UIShader::ColoredTextureRectShader::getInstance()->Program);
     glBindVertexArray(UIShader::ColoredTextureRectShader::getInstance()->vao);
 
-    UIShader::ColoredTextureRectShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName() });
+    UIShader::ColoredTextureRectShader::getInstance()->SetTextureUnits(createVector<GLuint>(static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName()));
     UIShader::ColoredTextureRectShader::getInstance()->setUniforms(
         core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height),
         core::vector2df(tex_center_pos_x, tex_center_pos_y), core::vector2df(tex_width, tex_height));
@@ -952,7 +953,7 @@ void drawTexQuad(GLuint texture, float width, float height,
     glUseProgram(UIShader::TextureRectShader::getInstance()->Program);
     glBindVertexArray(SharedObject::UIVAO);
 
-    UIShader::TextureRectShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ texture });
+    UIShader::TextureRectShader::getInstance()->SetTextureUnits(createVector<GLuint>(texture));
     UIShader::TextureRectShader::getInstance()->setUniforms(
         core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height),
         core::vector2df(tex_center_pos_x, tex_center_pos_y),
@@ -1055,7 +1056,7 @@ void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect
     glUseProgram(UIShader::UniformColoredTextureRectShader::getInstance()->Program);
     glBindVertexArray(SharedObject::UIVAO);
 
-    UIShader::UniformColoredTextureRectShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName() });
+    UIShader::UniformColoredTextureRectShader::getInstance()->SetTextureUnits(createVector<GLuint>(static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName()));
     UIShader::UniformColoredTextureRectShader::getInstance()->setUniforms(
         core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height), core::vector2df(tex_center_pos_x, tex_center_pos_y), core::vector2df(tex_width, tex_height), colors);
 
@@ -1091,7 +1092,7 @@ void draw2DImageFromRTT(GLuint texture, size_t texture_w, size_t texture_h,
     glUseProgram(UIShader::UniformColoredTextureRectShader::getInstance()->Program);
     glBindVertexArray(SharedObject::UIVAO);
 
-    UIShader::UniformColoredTextureRectShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ texture });
+    UIShader::UniformColoredTextureRectShader::getInstance()->SetTextureUnits(createVector<GLuint>(texture));
     UIShader::UniformColoredTextureRectShader::getInstance()->setUniforms(
         core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height),
         core::vector2df(tex_center_pos_x, tex_center_pos_y), core::vector2df(tex_width, tex_height),

From d11d56f6cd18dafe016245f853e163838c5df75b Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 20 Aug 2014 02:42:59 +0200
Subject: [PATCH 054/248] Replace std::vector<GLuint>{...} in post_processing

---
 src/graphics/post_processing.cpp | 36 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 51152352f..b091ed348 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -217,7 +217,7 @@ static void DrawFullScreenEffect(Args...args)
 static
 void renderBloom(GLuint in)
 {
-    FullScreenShader::BloomShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ in });
+    FullScreenShader::BloomShader::getInstance()->SetTextureUnits(createVector<GLuint>(in));
     DrawFullScreenEffect<FullScreenShader::BloomShader>();
 }
 
@@ -304,13 +304,13 @@ void PostProcessing::renderGaussian3Blur(FrameBuffer &in_fbo, FrameBuffer &auxil
     {
         auxiliary.Bind();
 
-        FullScreenShader::Gaussian3VBlurShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ in_fbo.getRTT()[0] });
+        FullScreenShader::Gaussian3VBlurShader::getInstance()->SetTextureUnits(createVector<GLuint>(in_fbo.getRTT()[0]));
         DrawFullScreenEffect<FullScreenShader::Gaussian3VBlurShader>(core::vector2df(inv_width, inv_height));
     }
     {
         in_fbo.Bind();
 
-        FullScreenShader::Gaussian3HBlurShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ auxiliary.getRTT()[0] });
+        FullScreenShader::Gaussian3HBlurShader::getInstance()->SetTextureUnits(createVector<GLuint>(auxiliary.getRTT()[0]));
         DrawFullScreenEffect<FullScreenShader::Gaussian3HBlurShader>(core::vector2df(inv_width, inv_height));
     }
 }
@@ -322,13 +322,13 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo, FrameBuffer &auxil
     {
         auxiliary.Bind();
 
-        FullScreenShader::Gaussian6VBlurShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ in_fbo.getRTT()[0] });
+        FullScreenShader::Gaussian6VBlurShader::getInstance()->SetTextureUnits(createVector<GLuint>(in_fbo.getRTT()[0]));
         DrawFullScreenEffect<FullScreenShader::Gaussian6VBlurShader>(core::vector2df(inv_width, inv_height));
     }
     {
         in_fbo.Bind();
 
-        FullScreenShader::Gaussian6HBlurShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ auxiliary.getRTT()[0] });
+        FullScreenShader::Gaussian6HBlurShader::getInstance()->SetTextureUnits(createVector<GLuint>(auxiliary.getRTT()[0]));
         DrawFullScreenEffect<FullScreenShader::Gaussian6HBlurShader>(core::vector2df(inv_width, inv_height));
     }
 }
@@ -399,7 +399,7 @@ void PostProcessing::renderPassThrough(GLuint tex)
     glUseProgram(FullScreenShader::PassThroughShader::getInstance()->Program);
     glBindVertexArray(FullScreenShader::PassThroughShader::getInstance()->vao);
 
-    FullScreenShader::PassThroughShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ tex });
+    FullScreenShader::PassThroughShader::getInstance()->SetTextureUnits(createVector<GLuint>(tex));
     FullScreenShader::PassThroughShader::getInstance()->setUniforms();
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -424,7 +424,7 @@ void PostProcessing::renderGlow(unsigned tex)
     glUseProgram(FullScreenShader::GlowShader::getInstance()->Program);
     glBindVertexArray(FullScreenShader::GlowShader::getInstance()->vao);
 
-    FullScreenShader::GlowShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ tex });
+    FullScreenShader::GlowShader::getInstance()->SetTextureUnits(createVector<GLuint>(tex));
     FullScreenShader::GlowShader::getInstance()->setUniforms();
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -438,11 +438,11 @@ void PostProcessing::renderSSAO()
 
     // Generate linear depth buffer
     irr_driver->getFBO(FBO_LINEAR_DEPTH).Bind();
-    FullScreenShader::LinearizeDepthShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ irr_driver->getDepthStencilTexture() });
+    FullScreenShader::LinearizeDepthShader::getInstance()->SetTextureUnits(createVector<GLuint>(irr_driver->getDepthStencilTexture()));
     DrawFullScreenEffect<FullScreenShader::LinearizeDepthShader>(irr_driver->getSceneManager()->getActiveCamera()->getNearValue(), irr_driver->getSceneManager()->getActiveCamera()->getFarValue());
     irr_driver->getFBO(FBO_SSAO).Bind();
 
-    FullScreenShader::SSAOShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ irr_driver->getRenderTargetTexture(RTT_LINEAR_DEPTH) });
+    FullScreenShader::SSAOShader::getInstance()->SetTextureUnits(createVector<GLuint>(irr_driver->getRenderTargetTexture(RTT_LINEAR_DEPTH)));
     glGenerateMipmap(GL_TEXTURE_2D);
 
     DrawFullScreenEffect<FullScreenShader::SSAOShader>(irr_driver->getSSAORadius(), irr_driver->getSSAOK(), irr_driver->getSSAOSigma());
@@ -470,7 +470,7 @@ void PostProcessing::renderFog()
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
 
-    FullScreenShader::FogShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ irr_driver->getDepthStencilTexture() });
+    FullScreenShader::FogShader::getInstance()->SetTextureUnits(createVector<GLuint>(irr_driver->getDepthStencilTexture()));
     DrawFullScreenEffect<FullScreenShader::FogShader>(fogmax, startH, endH, start, end, col);
 
     glEnable(GL_DEPTH_TEST);
@@ -498,7 +498,7 @@ void PostProcessing::renderMotionBlur(unsigned cam, FrameBuffer &in_fbo, FrameBu
     out_fbo.Bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
-    FullScreenShader::MotionBlurShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ in_fbo.getRTT()[0], irr_driver->getDepthStencilTexture() });
+    FullScreenShader::MotionBlurShader::getInstance()->SetTextureUnits(createVector<GLuint>(in_fbo.getRTT()[0], irr_driver->getDepthStencilTexture()));
     DrawFullScreenEffect<FullScreenShader::MotionBlurShader>(
                                   // Todo : use a previousPVMatrix per cam, not global
                                   irr_driver->getPreviousPVMatrix(),
@@ -511,7 +511,7 @@ static void renderGodFade(GLuint tex, const SColor &col)
 {
     glUseProgram(FullScreenShader::GodFadeShader::getInstance()->Program);
     glBindVertexArray(FullScreenShader::GodFadeShader::getInstance()->vao);
-    FullScreenShader::GodFadeShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ tex });
+    FullScreenShader::GodFadeShader::getInstance()->SetTextureUnits(createVector<GLuint>(tex));
     FullScreenShader::GodFadeShader::getInstance()->setUniforms(col);
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -521,7 +521,7 @@ static void renderGodRay(GLuint tex, const core::vector2df &sunpos)
 {
     glUseProgram(FullScreenShader::GodRayShader::getInstance()->Program);
     glBindVertexArray(FullScreenShader::GodRayShader::getInstance()->vao);
-    FullScreenShader::GodRayShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ tex });
+    FullScreenShader::GodRayShader::getInstance()->SetTextureUnits(createVector<GLuint>(tex));
     FullScreenShader::GodRayShader::getInstance()->setUniforms(sunpos);
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -530,14 +530,14 @@ static void renderGodRay(GLuint tex, const core::vector2df &sunpos)
 static void toneMap(FrameBuffer &fbo, GLuint rtt)
 {
     fbo.Bind();
-    FullScreenShader::ToneMapShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ rtt });
+    FullScreenShader::ToneMapShader::getInstance()->SetTextureUnits(createVector<GLuint>(rtt));
     DrawFullScreenEffect<FullScreenShader::ToneMapShader>();
 }
 
 static void renderDoF(FrameBuffer &fbo, GLuint rtt)
 {
     fbo.Bind();
-    FullScreenShader::DepthOfFieldShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ rtt, irr_driver->getDepthStencilTexture() });
+    FullScreenShader::DepthOfFieldShader::getInstance()->SetTextureUnits(createVector<GLuint>(rtt, irr_driver->getDepthStencilTexture()));
     DrawFullScreenEffect<FullScreenShader::DepthOfFieldShader>();
 }
 
@@ -554,7 +554,7 @@ void PostProcessing::applyMLAA()
 
     // Pass 1: color edge detection
     glUseProgram(FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->Program);
-    FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->SetTextureUnits(std::vector<GLuint>{ irr_driver->getRenderTargetTexture(RTT_MLAA_COLORS) });
+    FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->SetTextureUnits(createVector<GLuint>(irr_driver->getRenderTargetTexture(RTT_MLAA_COLORS)));
     FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->setUniforms(PIXEL_SIZE);
 
     glBindVertexArray(FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->vao);
@@ -568,7 +568,7 @@ void PostProcessing::applyMLAA()
     glClear(GL_COLOR_BUFFER_BIT);
 
     glUseProgram(FullScreenShader::MLAABlendWeightSHader::getInstance()->Program);
-    FullScreenShader::MLAABlendWeightSHader::getInstance()->SetTextureUnits(std::vector<GLuint>{ irr_driver->getRenderTargetTexture(RTT_MLAA_TMP), getTextureGLuint(m_areamap) });
+    FullScreenShader::MLAABlendWeightSHader::getInstance()->SetTextureUnits(createVector<GLuint>(irr_driver->getRenderTargetTexture(RTT_MLAA_TMP), getTextureGLuint(m_areamap)));
     FullScreenShader::MLAABlendWeightSHader::getInstance()->setUniforms(PIXEL_SIZE);
 
     glBindVertexArray(FullScreenShader::MLAABlendWeightSHader::getInstance()->vao);
@@ -581,7 +581,7 @@ void PostProcessing::applyMLAA()
     irr_driver->getFBO(FBO_MLAA_COLORS).Bind();
 
     glUseProgram(FullScreenShader::MLAAGatherSHader::getInstance()->Program);
-    FullScreenShader::MLAAGatherSHader::getInstance()->SetTextureUnits(std::vector<GLuint>{ irr_driver->getRenderTargetTexture(RTT_MLAA_BLEND), irr_driver->getRenderTargetTexture(RTT_MLAA_TMP)});
+    FullScreenShader::MLAAGatherSHader::getInstance()->SetTextureUnits(createVector<GLuint>(irr_driver->getRenderTargetTexture(RTT_MLAA_BLEND), irr_driver->getRenderTargetTexture(RTT_MLAA_TMP)));
     FullScreenShader::MLAAGatherSHader::getInstance()->setUniforms(PIXEL_SIZE);
 
     glBindVertexArray(FullScreenShader::MLAAGatherSHader::getInstance()->vao);

From fc945a429f79cb838721670336fdf3ba105a68af Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 20 Aug 2014 02:46:48 +0200
Subject: [PATCH 055/248] Another place found

---
 src/graphics/stkbillboard.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stkbillboard.cpp
index 3f2328c60..913727ec1 100644
--- a/src/graphics/stkbillboard.cpp
+++ b/src/graphics/stkbillboard.cpp
@@ -52,7 +52,7 @@ void STKBillboard::render()
     compressTexture(tex, true, true);
     GLuint texid = getTextureGLuint(tex);
     glUseProgram(MeshShader::BillboardShader::getInstance()->Program);
-    MeshShader::BillboardShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ texid });
+    MeshShader::BillboardShader::getInstance()->SetTextureUnits(createVector<GLuint>(texid));
     MeshShader::BillboardShader::getInstance()->setUniforms(irr_driver->getViewMatrix(), irr_driver->getProjMatrix(), pos, Size);
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
     glBindVertexArray(0);

From 6b3786457f5881a752de04150f964de7d4c0398d Mon Sep 17 00:00:00 2001
From: Stephen Just <stephenjust@gmail.com>
Date: Tue, 19 Aug 2014 16:08:27 -0600
Subject: [PATCH 056/248] Fix OpenGL extension detection on Linux/Mesa.

Created function in glwrap to test whether a GL extension is available.
This required using OpenGL3's glGetStringi. Backwards compat code can
be added to function if necessary.
---
 src/graphics/glwrap.cpp     | 16 ++++++++++++++++
 src/graphics/glwrap.hpp     |  3 +++
 src/graphics/irr_driver.cpp |  6 +++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 6cddac011..13da4236b 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -1213,3 +1213,19 @@ void GL32_draw2DRectangle(video::SColor color, const core::rect<s32>& position,
 
     glGetError();
 }
+
+bool hasGLExtension(const char* extension) {
+    GLint numExtensions = 0;
+    glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
+    Log::debug("GLWrap", "Found %d OpenGL Extensions", numExtensions);
+    for (GLint i = 0; i < numExtensions; i++) {
+        const char* foundExtension =
+            (const char*) glGetStringi(GL_EXTENSIONS, i);
+        if (foundExtension && strcmp(foundExtension, extension) == 0) {
+            Log::debug("GLWrap", "Extension %s found", extension);
+            return true;
+        }
+    }
+    Log::debug("GLWrap", "Extension %s not found", extension);
+    return false;
+}
diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index dea33ae85..20d0f425d 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -162,4 +162,7 @@ void draw2DImage(const irr::video::ITexture* texture, const irr::core::rect<s32>
 
 void GL32_draw2DRectangle(irr::video::SColor color, const irr::core::rect<s32>& position,
     const irr::core::rect<s32>* clip = 0);
+
+bool hasGLExtension(const char* extension);
+
 #endif
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 5bcf11334..2ccf581d2 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -486,9 +486,9 @@ void IrrDriver::initDevice()
     // Default false value for hasVSLayer if --no-graphics argument is used
     if (!ProfileWorld::isNoGraphics())
     {
-        const GLubyte *extensions = glGetString(GL_EXTENSIONS);
-        if (extensions && strstr((const char*)extensions, "GL_AMD_vertex_shader_layer") != NULL)
-        hasVSLayer = true;
+        if (hasGLExtension("GL_AMD_vertex_shader_layer")) {
+            hasVSLayer = true;
+        }
     }
 
 

From 6a48010644855bfff57efa3a95513f427101d52f Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 20 Aug 2014 06:49:01 +0200
Subject: [PATCH 057/248] Fixed compilation error with disabled xrandr

---
 lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
index 5989cd35b..657340742 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
@@ -1590,7 +1590,6 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 				}
 				XFree(modes);
 			}
-			else
 			#endif
 			#ifdef _IRR_LINUX_X11_RANDR_
 			while (XRRQueryExtension(display, &eventbase, &errorbase))

From 6073788813ea8f5d0957b2c4253b2a4a087f7de8 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 20 Aug 2014 21:07:12 +1000
Subject: [PATCH 058/248] Fix linux compilation (no nullptr).

---
 src/graphics/irr_driver.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 2ccf581d2..d9fa4cdbc 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -472,11 +472,11 @@ void IrrDriver::initDevice()
         m_need_rh_workaround = false;
 #ifdef WIN32
         // Fix for Intel Sandy Bridge on Windows which supports GL up to 3.1 only
-        if (strstr((const char *)glGetString(GL_VENDOR), "Intel") != nullptr && (GLMajorVersion == 3 && GLMinorVersion == 1))
+        if (strstr((const char *)glGetString(GL_VENDOR), "Intel") != NULL && (GLMajorVersion == 3 && GLMinorVersion == 1))
             m_need_ubo_workaround = true;
 #endif
         // Fix for Nvidia and instanced RH
-        if (strstr((const char *)glGetString(GL_VENDOR), "NVIDIA") != nullptr)
+        if (strstr((const char *)glGetString(GL_VENDOR), "NVIDIA") != NULL)
             m_need_rh_workaround = true;
     }
     m_glsl = (GLMajorVersion > 3 || (GLMajorVersion == 3 && GLMinorVersion >= 1));

From 4228fbb0d44ef0f802c4f5d04beb574998d7eef9 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 20 Aug 2014 21:24:20 +1000
Subject: [PATCH 059/248] Temporary fixed windows compilation (glGetStringi not
 known). Needs a proper fix!!

---
 src/graphics/glwrap.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 13da4236b..fbb64e077 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -1214,18 +1214,25 @@ void GL32_draw2DRectangle(video::SColor color, const core::rect<s32>& position,
     glGetError();
 }
 
-bool hasGLExtension(const char* extension) {
+bool hasGLExtension(const char* extension) 
+{
+#ifdef WIN32
+    return false;
+#else
     GLint numExtensions = 0;
     glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
     Log::debug("GLWrap", "Found %d OpenGL Extensions", numExtensions);
-    for (GLint i = 0; i < numExtensions; i++) {
+    for (GLint i = 0; i < numExtensions; i++)
+    {
         const char* foundExtension =
             (const char*) glGetStringi(GL_EXTENSIONS, i);
-        if (foundExtension && strcmp(foundExtension, extension) == 0) {
+        if (foundExtension && strcmp(foundExtension, extension) == 0)
+        {
             Log::debug("GLWrap", "Extension %s found", extension);
             return true;
         }
     }
     Log::debug("GLWrap", "Extension %s not found", extension);
     return false;
+#endif
 }

From e95536c2653e134c89217939d82dc4401c3d2e5e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 20 Aug 2014 21:35:22 +1000
Subject: [PATCH 060/248] Fixed height computation. Moved adding of gravity
 center  shift, which probably fixed the problems we had with  'wheels inside
 kart chassis' tests earlier.

---
 src/karts/kart.cpp | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 577f75b8e..127cc565e 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -611,15 +611,20 @@ void Kart::createPhysics()
                     // to place the wheels outside of the chassis
                     if(f<0)
                     {
-                        const Vec3 cs = getKartProperties()->getGravityCenterShift();
-                        wheel_pos[index].setX(x*0.5f*getKartWidth()+cs.getX());
-                        float radius = getKartProperties()->getWheelRadius();
-                        // Set the connection point so that a maximum compressed wheel
-                        // (susp. length=0) will still poke a little bit out under the
-                        // kart
-                        wheel_pos[index].setY(radius - 0.05f);
-                        wheel_pos[index].setZ((0.5f*getKartLength() - radius)* z
-                                               + cs.getZ());
+                        // All wheel positions are relative to the center of
+                        // the collision shape.
+                        wheel_pos[index].setX(x*0.5f*getKartWidth());
+                        float radius = getKartProperties()->getWheelRadius();
+                        // The y position of the wheels (i.e. the points where
+                        // the suspension is attached to) is just at the
+                        // bottom of the kart. That is half the kart height
+                        // down. The wheel radius is added to the suspension
+                        // length in the physics, so we move the connection
+                        // point 'radius' up. That means that if the suspension
+                        // is fully compressed (0), the wheel will just be at
+                        // the bottom of the kart chassis and touch the ground
+                        wheel_pos[index].setY(- 0.5f*getKartHeight() + radius);
+                        wheel_pos[index].setZ((0.5f*getKartLength() - radius)* z);
 
                     }
                     else
@@ -687,11 +692,12 @@ void Kart::createPhysics()
     tuning.m_maxSuspensionForce    =
         m_kart_properties->getMaxSuspensionForce();
 
+    const Vec3 &cs = getKartProperties()->getGravityCenterShift();
     for(unsigned int i=0; i<4; i++)
     {
         bool is_front_wheel = i<2;
         btWheelInfo& wheel = m_vehicle->addWheel(
-                            wheel_pos[i],
+                            wheel_pos[i]+cs,
                             wheel_direction, wheel_axle, suspension_rest,
                             wheel_radius, tuning, is_front_wheel);
         wheel.m_suspensionStiffness      = m_kart_properties->getSuspensionStiffness();

From 210a8e7ae9ba5d9678d0ec5c3eb4e03d07617b0c Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 20 Aug 2014 22:19:26 +1000
Subject: [PATCH 061/248] Set the graphical suspension depending on physical
 suspension (capped). Adjusted graphical chassis to be 0.1 higher to have
 similar look at previously and avoid graphical chassis going into terrain,

---
 src/karts/abstract_kart.cpp             | 10 +++++
 src/karts/abstract_kart.hpp             |  6 +++
 src/karts/kart.cpp                      | 57 ++++++++++++-------------
 src/karts/kart.hpp                      | 10 +++--
 src/karts/kart_model.cpp                | 40 +++++++++++------
 src/karts/kart_model.hpp                |  6 ++-
 src/modes/world.cpp                     |  5 +--
 src/states_screens/feature_unlocked.cpp |  3 +-
 8 files changed, 85 insertions(+), 52 deletions(-)

diff --git a/src/karts/abstract_kart.cpp b/src/karts/abstract_kart.cpp
index 3ad73b442..0171d5043 100644
--- a/src/karts/abstract_kart.cpp
+++ b/src/karts/abstract_kart.cpp
@@ -122,3 +122,13 @@ void AbstractKart::setKartAnimation(AbstractKartAnimation *ka)
     assert( (ka!=NULL) ^ (m_kart_animation!=NULL) );
     m_kart_animation = ka;
 }   // setKartAnimation
+
+// ----------------------------------------------------------------------------
+/** Moves the current physical transform into this kart's position.
+ */
+void AbstractKart::kartIsInRestNow()
+{
+    // Update the kart transforms with the newly computed position
+    // after all karts are reset
+    setTrans(getBody()->getWorldTransform());
+}   // kartIsInRest
\ No newline at end of file
diff --git a/src/karts/abstract_kart.hpp b/src/karts/abstract_kart.hpp
index 7e681e418..5df0e817b 100644
--- a/src/karts/abstract_kart.hpp
+++ b/src/karts/abstract_kart.hpp
@@ -154,6 +154,12 @@ public:
     /** Returns the highest point of the kart (coordinate on up axis) */
     float getHighestPoint() const { return m_kart_highest_point;  }
     // ------------------------------------------------------------------------
+    /** Called after the kart comes to rest. It can be used to e.g. compute
+     *  differences between graphical and physical chassis. Note that 
+     *  overwriting this function is possible, but this implementation must
+     *  be called. */
+    virtual void kartIsInRestNow();
+    // ------------------------------------------------------------------------
     /** Returns true if this kart has no wheels. */
     bool isWheeless() const;
     // ------------------------------------------------------------------------
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 127cc565e..4b8fe38bd 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -2410,6 +2410,30 @@ void Kart::applyEngineForce(float force)
     }
 }   // applyEngineForce
 
+//-----------------------------------------------------------------------------
+/** Computes the transform of the graphical kart chasses with regards to the
+ *  physical chassis. This function is called once the kart comes to rest
+ *  before the race starts. Based on the current physical kart position, it
+ *  computes an (at this stage Y-only) offset by which the graphical chassis
+ *  is moved so that it appears the way it is designed in blender. This means
+ *  that the distance of the wheels from the chassis (i.e. suspension) appears
+ *  as in blender when karts are in rest.
+ */
+void Kart::kartIsInRestNow()
+{
+    AbstractKart::kartIsInRestNow();
+    float f = 0;
+    for(int i=0; i<m_vehicle->getNumWheels(); i++)
+    {
+        const btWheelInfo &wi = m_vehicle->getWheelInfo(i);
+        f +=  wi.m_chassisConnectionPointCS.getY()
+            - wi.m_raycastInfo.m_suspensionLength - wi.m_wheelsRadius;
+    }
+    m_graphical_y_offset = f/m_vehicle->getNumWheels() + 0.1f;
+
+    m_kart_model->setDefaultSuspension();
+}   // kartIsInRestNow
+
 //-----------------------------------------------------------------------------
 /** Updates the graphics model. Mainly set the graphical position to be the
  *  same as the physics position, but uses offsets to position and rotation
@@ -2510,42 +2534,15 @@ void Kart::updateGraphics(float dt, const Vec3& offset_xyz,
         }
     }
 
-    // Now determine graphical chassis and wheel position depending on
-    // the physics result. The center of gravity of the chassis is at the
-    // bottom of the chassis, but the position of the graphical chassis is at
-    // the bottom of the wheels (i.e. in blender the kart is positioned on
-    // the horizonal plane through (0,0,0)). So first determine how far
-    // above the terrain is the center of the physics body. If the minimum
-    // of those values is larger than the lowest point of the chassis model
-    // the kart chassis would be too high (and look odd), so in this case
-    // move the chassis down so that the wheels (when touching the ground)
-    // look close enough to the chassis.
-    float height_above_terrain[4];
-    float min_hat = 9999.9f;
-    for(unsigned int i=0; i<4; i++)
-    {
-        // Set the suspension length
-        const btWheelInfo &wi = m_vehicle->getWheelInfo(i);
-        height_above_terrain[i] = wi.m_raycastInfo.m_suspensionLength;
-        if(height_above_terrain[i] < min_hat) min_hat = height_above_terrain[i];
-    }
-    float kart_hat = m_kart_model->getLowestPoint();
-
-    if(min_hat >= kart_hat)
-    {
-        for(unsigned int i=0; i<4; i++)
-            height_above_terrain[i] = kart_hat;
-    }
-    m_kart_model->update(dt, m_wheel_rotation_dt, getSteerPercent(),
-                         height_above_terrain, m_speed);
+    m_kart_model->update(dt, m_wheel_rotation_dt, getSteerPercent(), m_speed);
 
     // If the kart is leaning, part of the kart might end up 'in' the track.
     // To avoid this, raise the kart enough to offset the leaning.
     float lean_height = tan(fabsf(m_current_lean)) * getKartWidth()*0.5f;
 
     float heading = m_skidding->getVisualSkidRotation();
-    Vec3 center_shift = Vec3(0, m_skidding->getGraphicalJumpOffset() - kart_hat
-                              + lean_height-m_kart_model->getLowestPoint(), 0);
+    Vec3 center_shift = Vec3(0, m_skidding->getGraphicalJumpOffset() 
+                              + lean_height +m_graphical_y_offset, 0);
     center_shift = getTrans().getBasis() * center_shift;
 
     Moveable::updateGraphics(dt, center_shift,
diff --git a/src/karts/kart.hpp b/src/karts/kart.hpp
index 52c477b9d..087c510ab 100644
--- a/src/karts/kart.hpp
+++ b/src/karts/kart.hpp
@@ -66,13 +66,13 @@ class Kart : public AbstractKart
     friend class Skidding;
 private:
     /** Handles speed increase and capping due to powerup, terrain, ... */
-    MaxSpeed           *m_max_speed;
+    MaxSpeed *m_max_speed;
 
     /** Stores information about the terrain the kart is on. */
-    TerrainInfo        *m_terrain_info;
+    TerrainInfo *m_terrain_info;
 
     /** Handles the powerup of a kart. */
-    Powerup     *m_powerup;
+    Powerup *m_powerup;
 
     /** True if kart is flying (for debug purposes only). */
     bool m_flying;
@@ -106,6 +106,9 @@ private:
      *  new lap is triggered. */
     Vec3 m_xyz_front;
 
+    /** Offset of the graphical kart chassis from the physical chassis. */
+    float m_graphical_y_offset;
+
     /** True if the kart is eliminated. */
     bool m_eliminated;
 
@@ -234,6 +237,7 @@ public:
                         int position, const btTransform& init_transform);
     virtual       ~Kart();
     virtual void   init(RaceManager::KartType type);
+    virtual void   kartIsInRestNow();
     virtual void   updateGraphics(float dt, const Vec3& off_xyz,
                                   const btQuaternion& off_rotation);
     virtual void   createPhysics    ();
diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index 90ef13a5f..2b5fd2866 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -540,6 +540,8 @@ bool KartModel::loadModels(const KartProperties &kart_properties)
                                                      : -0.5f*m_kart_length);
         }
     }
+    for(unsigned int i=0; i<4; i++)
+        m_wheel_graphics_position[i].setY(m_wheel_graphics_position[i].getY()-0.1f);
 
     // Load the wheel models. This can't be done early, since the default
     // values for the graphical position must be defined, which in turn
@@ -634,9 +636,7 @@ void KartModel::loadWheelInfo(const XMLNode &node,
  */
 void KartModel::reset()
 {
-    // Reset the wheels
-    const float suspension[4]={0,0,0,0};
-    update(0.0f, 0.0f, 0.0f, suspension, 0.0f);
+    update(0.0f, 0.0f, 0.0f, 0.0f);
 
     // Stop any animations currently being played.
     setAnimation(KartModel::AF_DEFAULT);
@@ -741,6 +741,16 @@ void KartModel::OnAnimationEnd(scene::IAnimatedMeshSceneNode *node)
     m_animated_node->setAnimationEndCallback(NULL);
 }   // OnAnimationEnd
 
+// ----------------------------------------------------------------------------
+void KartModel::setDefaultSuspension()
+{
+    for(int i=0; i<m_kart->getVehicle()->getNumWheels(); i++)
+    {
+        const btWheelInfo &wi = m_kart->getVehicle()->getWheelInfo(i);
+        m_default_physics_suspension[i] = wi.m_raycastInfo.m_suspensionLength;
+    }
+}   // setDefaultSuspension
+
 // ----------------------------------------------------------------------------
 /** Rotates and turns the wheels appropriately, and adjust for suspension
     + updates the speed-weighted objects' animations.
@@ -748,30 +758,34 @@ void KartModel::OnAnimationEnd(scene::IAnimatedMeshSceneNode *node)
  *  \param rotation_dt How far the wheels have rotated since last time.
  *  \param steer The actual steer settings.
  *  \param suspension Suspension height for all four wheels.
- *  \param speed The speed of the kart in meters/sec, used for the speed-weighted objects' animations
+ *  \param speed The speed of the kart in meters/sec, used for the 
+ *         speed-weighted objects' animations
  */
-void KartModel::update(float dt, float rotation_dt, float steer,
-                       const float height_above_terrain[4], float speed)
+void KartModel::update(float dt, float rotation_dt, float steer,  float speed)
 {
    core::vector3df wheel_steer(0, steer*30.0f, 0);
 
     for(unsigned int i=0; i<4; i++)
     {
         if(!m_wheel_node[i]) continue;
+        const btWheelInfo &wi = m_kart->getVehicle()->getWheelInfo(i);
 #ifdef DEBUG
         if(UserConfigParams::m_physics_debug && m_kart)
         {
             // Make wheels that are not touching the ground invisible
-            bool wheel_has_contact =
-                m_kart->getVehicle()->getWheelInfo(i).m_raycastInfo
-                                                     .m_isInContact;
-            m_wheel_node[i]->setVisible(wheel_has_contact);
+            m_wheel_node[i]->setVisible(wi.m_raycastInfo.m_isInContact);
         }
 #endif
+        float rel_suspension = m_default_physics_suspension[i] 
+                             - wi.m_raycastInfo.m_suspensionLength;
+        if(rel_suspension< m_min_suspension[i])
+            rel_suspension = m_min_suspension[i];
+        else if(rel_suspension > m_max_suspension[i])
+            rel_suspension = m_max_suspension[i];
+
         core::vector3df pos =  m_wheel_graphics_position[i].toIrrVector();
-        // 
-        pos.Y = -  height_above_terrain[i] + m_kart_lowest_point
-              + m_wheel_graphics_radius[i];
+        pos.Y += rel_suspension;
+
         m_wheel_node[i]->setPosition(pos);
 
         // Now calculate the new rotation: (old + change) mod 360
diff --git a/src/karts/kart_model.hpp b/src/karts/kart_model.hpp
index 9d2138642..a5cd92201 100644
--- a/src/karts/kart_model.hpp
+++ b/src/karts/kart_model.hpp
@@ -169,6 +169,9 @@ private:
     /** The speed weighted objects. */
     SpeedWeightedObjectList     m_speed_weighted_objects;
     
+    /** Length of the physics suspension when the kart is at rest. */
+    float m_default_physics_suspension[4];
+
     /** Minimum suspension length. If the displayed suspension is
      *  shorter than this, the wheel would look wrong. */
     float         m_min_suspension[4];
@@ -227,8 +230,9 @@ public:
     void          reset();
     void          loadInfo(const XMLNode &node);
     bool          loadModels(const KartProperties &kart_properties);
+    void          setDefaultSuspension();
     void          update(float dt, float rotation_dt, float steer,
-                         const float height_abve_terrain[4], float speed);
+                         float speed);
     void          finishedRace();
     scene::ISceneNode*
                   attachModel(bool animatedModels, bool always_animated);
diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index d80ae7b7d..438f5d8d8 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -677,9 +677,7 @@ void World::resetAllKarts()
 
     for ( KartList::iterator i=m_karts.begin(); i!=m_karts.end(); i++)
     {
-        // Update the kart transforms with the newly computed position
-        // after all karts are reset
-        (*i)->setTrans((*i)->getBody()->getWorldTransform());
+        (*i)->kartIsInRestNow();
     }
 
     // Initialise the cameras, now that the correct kart positions are set
@@ -799,6 +797,7 @@ void World::updateWorld(float dt)
     }
     catch (AbortWorldUpdateException& e)
     {
+        (void)e;   // avoid compiler warning
         return;
     }
 
diff --git a/src/states_screens/feature_unlocked.cpp b/src/states_screens/feature_unlocked.cpp
index 32510f341..3f24204ee 100644
--- a/src/states_screens/feature_unlocked.cpp
+++ b/src/states_screens/feature_unlocked.cpp
@@ -297,8 +297,7 @@ void FeatureUnlockedCutScene::init()
             m_unlocked_stuff[n].m_root_gift_node = kart_model->attachModel(true, false);
             m_unlocked_stuff[n].m_scale = 5.0f;
             kart_model->setAnimation(KartModel::AF_DEFAULT);
-            float susp[4]={0,0,0,0};
-            kart_model->update(0.0f, 0.0f, 0.0f, susp, 0.0f);
+            kart_model->update(0.0f, 0.0f, 0.0f, 0.0f);
 
 #ifdef DEBUG
             m_unlocked_stuff[n].m_root_gift_node->setName("unlocked kart");

From 5c4c54bf2009e4a9d98ed61f33be8ef5cfc0c271 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 20 Aug 2014 19:13:11 +0200
Subject: [PATCH 062/248] xrandr: make sure that output_id and old_mode are
 declared

---
 lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
index 657340742..a2477900e 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
@@ -250,7 +250,7 @@ bool CIrrDeviceLinux::switchToFullscreen(bool reset)
 		}
 		#endif
 		#ifdef _IRR_LINUX_X11_RANDR_
-		if (UseXRandR && CreationParams.Fullscreen)
+		if (UseXRandR && CreationParams.Fullscreen && old_mode != BadRRMode)
 		{
 			XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display));
 			XRROutputInfo* output = XRRGetOutputInfo(display, res, output_id);
@@ -340,7 +340,7 @@ bool CIrrDeviceLinux::switchToFullscreen(bool reset)
 	{
 		XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display));
 
-		if (!res || output_id == BadRRMode)
+		if (!res || output_id == BadRROutput)
 		{
 			os::Printer::log("Could not get video output. Try to run in windowed mode.", ELL_WARNING);
 			CreationParams.Fullscreen = false;
@@ -1592,12 +1592,14 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 			}
 			#endif
 			#ifdef _IRR_LINUX_X11_RANDR_
+			output_id = BadRROutput;
+			old_mode = BadRRMode;
+			
 			while (XRRQueryExtension(display, &eventbase, &errorbase))
 			{
 				XRROutputInfo* output = NULL;
 				XRRCrtcInfo* crtc = NULL;
 				crtc_x = crtc_y = -1;
-				output_id = BadRRMode;
 
 				XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display));
 
@@ -1653,7 +1655,7 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 					XRRFreeOutputInfo(output);
 				}
 				
-				if (output_id == BadRRMode)
+				if (output_id == BadRROutput)
 				{
 					os::Printer::log("Could not get video output.", ELL_WARNING);
 					break;

From 56fa56a38f6abaa96e5fba5c210f2a03aff6e76a Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 20 Aug 2014 19:30:28 +0200
Subject: [PATCH 063/248] xrandr: don't restore resolution if output was
 disconnected during game

---
 .../source/Irrlicht/CIrrDeviceLinux.cpp        | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
index a2477900e..f9d8c2ba1 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
@@ -253,9 +253,27 @@ bool CIrrDeviceLinux::switchToFullscreen(bool reset)
 		if (UseXRandR && CreationParams.Fullscreen && old_mode != BadRRMode)
 		{
 			XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display));
+			
+			if (!res)
+				return false;
+
 			XRROutputInfo* output = XRRGetOutputInfo(display, res, output_id);
+			
+			if (!output || !output->crtc || output->connection == RR_Disconnected) 
+			{
+				XRRFreeOutputInfo(output);
+				return false;
+			}
+
 			XRRCrtcInfo* crtc = XRRGetCrtcInfo(display, res, output->crtc);
 
+			if (!crtc) 
+			{
+				XRRFreeCrtcInfo(crtc);
+				XRRFreeOutputInfo(output);
+				return false;
+			}
+
 			Status s = XRRSetCrtcConfig(display, res, output->crtc, CurrentTime,
 										crtc->x, crtc->y, old_mode,
 										crtc->rotation, &output_id, 1);

From c2cf83bb6a11aed9cf5473f1af8a11356b90d360 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 20 Aug 2014 19:36:44 +0200
Subject: [PATCH 064/248] xrandr: move restore resolution to separated function
 because it makes a mess...

---
 .../source/Irrlicht/CIrrDeviceLinux.cpp       | 103 +++++++++---------
 .../source/Irrlicht/CIrrDeviceLinux.h         |   3 +-
 2 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
index f9d8c2ba1..096309f15 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
@@ -194,7 +194,7 @@ CIrrDeviceLinux::~CIrrDeviceLinux()
 		}
 		
 		// Reset fullscreen resolution change
-		switchToFullscreen(true);		
+		restoreResolution();		
 		
 		if (!ExternalWindow)
 		{
@@ -235,61 +235,66 @@ int IrrPrintXError(Display *display, XErrorEvent *event)
 }
 #endif
 
-
-bool CIrrDeviceLinux::switchToFullscreen(bool reset)
+bool CIrrDeviceLinux::restoreResolution()
 {
 	if (!CreationParams.Fullscreen)
 		return true;
-	if (reset)
+
+	#ifdef _IRR_LINUX_X11_VIDMODE_
+	if (UseXVidMode && CreationParams.Fullscreen)
 	{
-		#ifdef _IRR_LINUX_X11_VIDMODE_
-		if (UseXVidMode && CreationParams.Fullscreen)
-		{
-			XF86VidModeSwitchToMode(display, screennr, &oldVideoMode);
-			XF86VidModeSetViewPort(display, screennr, 0, 0);
-		}
-		#endif
-		#ifdef _IRR_LINUX_X11_RANDR_
-		if (UseXRandR && CreationParams.Fullscreen && old_mode != BadRRMode)
-		{
-			XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display));
-			
-			if (!res)
-				return false;
-
-			XRROutputInfo* output = XRRGetOutputInfo(display, res, output_id);
-			
-			if (!output || !output->crtc || output->connection == RR_Disconnected) 
-			{
-				XRRFreeOutputInfo(output);
-				return false;
-			}
-
-			XRRCrtcInfo* crtc = XRRGetCrtcInfo(display, res, output->crtc);
-
-			if (!crtc) 
-			{
-				XRRFreeCrtcInfo(crtc);
-				XRRFreeOutputInfo(output);
-				return false;
-			}
-
-			Status s = XRRSetCrtcConfig(display, res, output->crtc, CurrentTime,
-										crtc->x, crtc->y, old_mode,
-										crtc->rotation, &output_id, 1);
-
-			XRRFreeOutputInfo(output);
-			XRRFreeCrtcInfo(crtc);
-			XRRFreeScreenResources(res);
-
-			if (s != Success)
-				return false;
-		}
-		#endif
-		return true;
+		XF86VidModeSwitchToMode(display, screennr, &oldVideoMode);
+		XF86VidModeSetViewPort(display, screennr, 0, 0);
 	}
+	#endif
+	#ifdef _IRR_LINUX_X11_RANDR_
+	if (UseXRandR && CreationParams.Fullscreen && old_mode != BadRRMode)
+	{
+		XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display));
+		
+		if (!res)
+			return false;
+
+		XRROutputInfo* output = XRRGetOutputInfo(display, res, output_id);
+		
+		if (!output || !output->crtc || output->connection == RR_Disconnected) 
+		{
+			XRRFreeOutputInfo(output);
+			return false;
+		}
+
+		XRRCrtcInfo* crtc = XRRGetCrtcInfo(display, res, output->crtc);
+
+		if (!crtc) 
+		{
+			XRRFreeCrtcInfo(crtc);
+			XRRFreeOutputInfo(output);
+			return false;
+		}
+
+		Status s = XRRSetCrtcConfig(display, res, output->crtc, CurrentTime,
+									crtc->x, crtc->y, old_mode,
+									crtc->rotation, &output_id, 1);
+
+		XRRFreeOutputInfo(output);
+		XRRFreeCrtcInfo(crtc);
+		XRRFreeScreenResources(res);
+
+		if (s != Success)
+			return false;
+	}
+	#endif
+	return true;
+}
+
+
+bool CIrrDeviceLinux::switchToFullscreen()
+{
+	if (!CreationParams.Fullscreen)
+		return true;
 
 	getVideoModeList();
+
 	#if defined(_IRR_LINUX_X11_VIDMODE_) || defined(_IRR_LINUX_X11_RANDR_)
 	s32 eventbase, errorbase;
 	s32 bestMode = -1;
diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
index e071724de..d2fd06899 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
@@ -150,7 +150,8 @@ namespace irr
 
 		void initXAtoms();
 
-		bool switchToFullscreen(bool reset=false);
+		bool restoreResolution();
+		bool switchToFullscreen();
 
 		//! Implementation of the linux cursor control
 		class CCursorControl : public gui::ICursorControl

From 04f6c7e729913b8316527707b1410b5fee25849e Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Wed, 20 Aug 2014 23:04:02 +0200
Subject: [PATCH 065/248] Use singleton template for VAOManager (ex
 VBOGatherer)

---
 src/graphics/glwrap.cpp           | 99 +++++++++----------------------
 src/graphics/glwrap.hpp           | 25 ++++++--
 src/graphics/render.cpp           |  2 +-
 src/graphics/render_geometry.cpp  | 14 ++---
 src/graphics/stkanimatedmesh.cpp  |  4 +-
 src/graphics/stkmeshscenenode.cpp |  6 +-
 src/tracks/track.cpp              |  2 +-
 7 files changed, 62 insertions(+), 90 deletions(-)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index fbb64e077..e205a41c8 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -548,40 +548,7 @@ void setTexture(unsigned TextureUnit, GLuint TextureId, GLenum MagFilter, GLenum
     glGetError();
 }
 
-class VBOGatherer
-{
-    enum VTXTYPE { VTXTYPE_STANDARD, VTXTYPE_TCOORD, VTXTYPE_TANGENT, VTXTYPE_COUNT };
-    GLuint vbo[VTXTYPE_COUNT], ibo[VTXTYPE_COUNT], vao[VTXTYPE_COUNT];
-    std::vector<scene::IMeshBuffer *> storedCPUBuffer[VTXTYPE_COUNT];
-    void *vtx_mirror[VTXTYPE_COUNT], *idx_mirror[VTXTYPE_COUNT];
-    size_t vtx_cnt[VTXTYPE_COUNT], idx_cnt[VTXTYPE_COUNT];
-    std::map<scene::IMeshBuffer*, unsigned> mappedBaseVertex[VTXTYPE_COUNT], mappedBaseIndex[VTXTYPE_COUNT];
-
-    void regenerateBuffer(enum VTXTYPE);
-    void regenerateVAO(enum VTXTYPE);
-    size_t getVertexPitch(enum VTXTYPE) const;
-    VTXTYPE getVTXTYPE(video::E_VERTEX_TYPE type);
-    void append(scene::IMeshBuffer *, VBOGatherer::VTXTYPE tp);
-public:
-    VBOGatherer();
-    std::pair<unsigned, unsigned> getBase(scene::IMeshBuffer *);
-    unsigned getVBO(video::E_VERTEX_TYPE type) { return vbo[getVTXTYPE(type)]; }
-    unsigned getVAO(video::E_VERTEX_TYPE type) { return vao[getVTXTYPE(type)]; }
-    ~VBOGatherer()
-    {
-        for (unsigned i = 0; i < VTXTYPE_COUNT; i++)
-        {
-            if (vbo[i])
-                glDeleteBuffers(1, &vbo[i]);
-            if (ibo[i])
-                glDeleteBuffers(1, &ibo[i]);
-            if (vao[i])
-                glDeleteVertexArrays(1, &vao[i]);
-        }
-    }
-};
-
-VBOGatherer::VBOGatherer()
+VAOManager::VAOManager()
 {
     vao[0] = vao[1] = vao[2] = 0;
     vbo[0] = vbo[1] = vbo[2] = 0;
@@ -592,7 +559,25 @@ VBOGatherer::VBOGatherer()
     idx_mirror[0] = idx_mirror[1] = idx_mirror[2] = NULL;
 }
 
-void VBOGatherer::regenerateBuffer(enum VTXTYPE tp)
+VAOManager::~VAOManager()
+{
+    for (unsigned i = 0; i < 3; i++)
+    {
+        if (vtx_mirror[i])
+            free(vtx_mirror[i]);
+        if (idx_mirror[i])
+            free(idx_mirror[i]);
+        if (vbo[i])
+            glDeleteBuffers(1, &vbo[i]);
+        if (ibo[i])
+            glDeleteBuffers(1, &ibo[i]);
+        if (vao[i])
+            glDeleteVertexArrays(1, &vao[i]);
+    }
+
+}
+
+void VAOManager::regenerateBuffer(enum VTXTYPE tp)
 {
     glBindVertexArray(0);
     if (vbo[tp])
@@ -611,7 +596,7 @@ void VBOGatherer::regenerateBuffer(enum VTXTYPE tp)
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
 }
 
-void VBOGatherer::regenerateVAO(enum VTXTYPE tp)
+void VAOManager::regenerateVAO(enum VTXTYPE tp)
 {
     if (vao[tp])
         glDeleteVertexArrays(1, &vao[tp]);
@@ -677,7 +662,7 @@ void VBOGatherer::regenerateVAO(enum VTXTYPE tp)
     glBindVertexArray(0);
 }
 
-size_t VBOGatherer::getVertexPitch(enum VTXTYPE tp) const
+size_t VAOManager::getVertexPitch(enum VTXTYPE tp) const
 {
     switch (tp)
     {
@@ -693,22 +678,22 @@ size_t VBOGatherer::getVertexPitch(enum VTXTYPE tp) const
     }
 }
 
-VBOGatherer::VTXTYPE VBOGatherer::getVTXTYPE(video::E_VERTEX_TYPE type)
+VAOManager::VTXTYPE VAOManager::getVTXTYPE(video::E_VERTEX_TYPE type)
 {
     switch (type)
     {
+    default:
+        assert(0 && "Wrong vtxtype");
     case video::EVT_STANDARD:
         return VTXTYPE_STANDARD;
     case video::EVT_2TCOORDS:
         return VTXTYPE_TCOORD;
     case video::EVT_TANGENTS:
         return VTXTYPE_TANGENT;
-    default:
-        assert(0 && "Wrong vtxtype");
     }
 };
 
-void VBOGatherer::append(scene::IMeshBuffer *mb, VBOGatherer::VTXTYPE tp)
+void VAOManager::append(scene::IMeshBuffer *mb, VTXTYPE tp)
 {
     size_t old_vtx_cnt = vtx_cnt[tp];
     vtx_cnt[tp] += mb->getVertexCount();
@@ -726,7 +711,7 @@ void VBOGatherer::append(scene::IMeshBuffer *mb, VBOGatherer::VTXTYPE tp)
     mappedBaseIndex[tp][mb] = old_idx_cnt * sizeof(u16);
 }
 
-std::pair<unsigned, unsigned> VBOGatherer::getBase(scene::IMeshBuffer *mb)
+std::pair<unsigned, unsigned> VAOManager::getBase(scene::IMeshBuffer *mb)
 {
     VTXTYPE tp = getVTXTYPE(mb->getVertexType());
     if (mappedBaseVertex[tp].find(mb) == mappedBaseVertex[tp].end())
@@ -747,36 +732,6 @@ std::pair<unsigned, unsigned> VBOGatherer::getBase(scene::IMeshBuffer *mb)
     return std::pair<unsigned, unsigned>(vtx, It->second);
 }
 
-static VBOGatherer *gatherersingleton = 0;
-
-std::pair<unsigned, unsigned> getVAOOffsetAndBase(scene::IMeshBuffer *mb)
-{
-    if (!gatherersingleton)
-        gatherersingleton = new VBOGatherer();
-    return gatherersingleton->getBase(mb);
-}
-
-unsigned getVBO(video::E_VERTEX_TYPE type)
-{
-    if (gatherersingleton)
-        return gatherersingleton->getVBO(type);
-    return 0;
-}
-
-unsigned getVAO(video::E_VERTEX_TYPE type)
-{
-    if (gatherersingleton)
-        return gatherersingleton->getVAO(type);
-    return 0;
-}
-
-void resetVAO()
-{
-    if (gatherersingleton)
-        delete gatherersingleton;
-    gatherersingleton = 0;
-}
-
 ScopedGPUTimer::ScopedGPUTimer(GPUTimer &timer)
 {
     if (!UserConfigParams::m_profiler_enabled) return;
diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index 20d0f425d..034af4090 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -139,10 +139,27 @@ void compressTexture(irr::video::ITexture *tex, bool srgb, bool premul_alpha = f
 bool loadCompressedTexture(const std::string& compressed_tex);
 void saveCompressedTexture(const std::string& compressed_tex);
 
-std::pair<unsigned, unsigned> getVAOOffsetAndBase(scene::IMeshBuffer *mb);
-unsigned getVAO(video::E_VERTEX_TYPE type);
-unsigned getVBO(video::E_VERTEX_TYPE type);
-void resetVAO();
+class VAOManager : public Singleton<VAOManager>
+{
+    enum VTXTYPE { VTXTYPE_STANDARD, VTXTYPE_TCOORD, VTXTYPE_TANGENT, VTXTYPE_COUNT };
+    GLuint vbo[VTXTYPE_COUNT], ibo[VTXTYPE_COUNT], vao[VTXTYPE_COUNT];
+    std::vector<scene::IMeshBuffer *> storedCPUBuffer[VTXTYPE_COUNT];
+    void *vtx_mirror[VTXTYPE_COUNT], *idx_mirror[VTXTYPE_COUNT];
+    size_t vtx_cnt[VTXTYPE_COUNT], idx_cnt[VTXTYPE_COUNT];
+    std::map<scene::IMeshBuffer*, unsigned> mappedBaseVertex[VTXTYPE_COUNT], mappedBaseIndex[VTXTYPE_COUNT];
+
+    void regenerateBuffer(enum VTXTYPE);
+    void regenerateVAO(enum VTXTYPE);
+    size_t getVertexPitch(enum VTXTYPE) const;
+    VTXTYPE getVTXTYPE(video::E_VERTEX_TYPE type);
+    void append(scene::IMeshBuffer *, VTXTYPE tp);
+public:
+    VAOManager();
+    std::pair<unsigned, unsigned> getBase(scene::IMeshBuffer *);
+    unsigned getVBO(video::E_VERTEX_TYPE type) { return vbo[getVTXTYPE(type)]; }
+    unsigned getVAO(video::E_VERTEX_TYPE type) { return vao[getVTXTYPE(type)]; }
+    ~VAOManager();
+};
 
 void draw3DLine(const core::vector3df& start,
     const core::vector3df& end, irr::video::SColor color);
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index ad3dcad4f..7cac587c1 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -768,7 +768,7 @@ void IrrDriver::renderGlow(std::vector<GlowData>& glows)
     glDepthMask(GL_FALSE);
     glDisable(GL_BLEND);
 
-    glBindVertexArray(getVAO(EVT_STANDARD));
+    glBindVertexArray(VAOManager::getInstance()->getVAO(EVT_STANDARD));
     for (u32 i = 0; i < glowcount; i++)
     {
         const GlowData &dat = glows[i];
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index d925742e8..ec27ac576 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -119,7 +119,7 @@ template<typename Shader, enum E_VERTEX_TYPE VertexType, int ...List, typename..
 void renderMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes)
 {
     glUseProgram(Shader::getInstance()->Program);
-    glBindVertexArray(getVAO(VertexType));
+    glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
     for (unsigned i = 0; i < meshes->size(); i++)
     {
         std::vector<GLuint> Textures;
@@ -292,7 +292,7 @@ template<typename Shader, enum E_VERTEX_TYPE VertexType, int...List, typename...
 void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes)
 {
     glUseProgram(Shader::getInstance()->Program);
-    glBindVertexArray(getVAO(VertexType));
+    glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
     for (unsigned i = 0; i < meshes->size(); i++)
     {
         std::vector<GLuint> Textures;
@@ -473,7 +473,7 @@ template<enum E_VERTEX_TYPE VertexType, typename... TupleType>
 static void renderMeshNormals(std::vector<STK::Tuple<TupleType...> > *meshes)
 {
     glUseProgram(MeshShader::NormalVisualizer::getInstance()->Program);
-    glBindVertexArray(getVAO(VertexType));
+    glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
     for (unsigned i = 0; i < meshes->size(); i++)
     {
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
@@ -522,7 +522,7 @@ void IrrDriver::renderTransparent()
     ListDisplacement::getInstance()->clear();
     m_scene_manager->drawAll(scene::ESNRP_TRANSPARENT);
 
-    glBindVertexArray(getVAO(EVT_STANDARD));
+    glBindVertexArray(VAOManager::getInstance()->getVAO(EVT_STANDARD));
 
     if (World::getWorld() && World::getWorld()->isFogEnabled())
     {
@@ -568,7 +568,7 @@ void IrrDriver::renderTransparent()
     glStencilFunc(GL_ALWAYS, 1, 0xFF);
     glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
 
-    glBindVertexArray(getVAO(EVT_2TCOORDS));
+    glBindVertexArray(VAOManager::getInstance()->getVAO(EVT_2TCOORDS));
     // Generate displace mask
     // Use RTT_TMP4 as displace mask
     irr_driver->getFBO(FBO_TMP1_WITH_DS).Bind();
@@ -666,7 +666,7 @@ template<typename T, enum E_VERTEX_TYPE VertexType, int...List, typename... Args
 void renderShadow(const std::vector<GLuint> TextureUnits, const std::vector<STK::Tuple<Args...> > *t)
 {
     glUseProgram(T::getInstance()->Program);
-    glBindVertexArray(getVAO(VertexType));
+    glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
     for (unsigned i = 0; i < t->size(); i++)
     {
         std::vector<GLuint> Textures;
@@ -815,7 +815,7 @@ template<typename T, enum E_VERTEX_TYPE VertexType, int... Selector, typename...
 void drawRSM(const core::matrix4 & rsm_matrix, const std::vector<GLuint> &TextureUnits, std::vector<STK::Tuple<Args...> > *t)
 {
     glUseProgram(T::getInstance()->Program);
-    glBindVertexArray(getVAO(VertexType));
+    glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
     for (unsigned i = 0; i < t->size(); i++)
     {
         std::vector<GLuint> Textures;
diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stkanimatedmesh.cpp
index e88550d38..1b07ba301 100644
--- a/src/graphics/stkanimatedmesh.cpp
+++ b/src/graphics/stkanimatedmesh.cpp
@@ -100,7 +100,7 @@ void STKAnimatedMesh::render()
                 MeshMaterial MatType = MaterialTypeToMeshMaterial(type, mb->getVertexType());
                 MeshSolidMaterial[MatType].push_back(&mesh);
             }
-            std::pair<unsigned, unsigned> p = getVAOOffsetAndBase(mb);
+            std::pair<unsigned, unsigned> p = VAOManager::getInstance()->getBase(mb);
             mesh.vaoBaseVertex = p.first;
             mesh.vaoOffset = p.second;
             mesh.VAOType = mb->getVertexType();
@@ -118,7 +118,7 @@ void STKAnimatedMesh::render()
             {
                 glBindVertexArray(0);
                 size_t size = mb->getVertexCount() * GLmeshes[i].Stride;
-                glBindBuffer(GL_ARRAY_BUFFER, getVBO(mb->getVertexType()));
+                glBindBuffer(GL_ARRAY_BUFFER, VAOManager::getInstance()->getVBO(mb->getVertexType()));
                 GLbitfield bitfield = GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_UNSYNCHRONIZED_BIT;
                 void * buf = glMapBufferRange(GL_ARRAY_BUFFER, GLmeshes[i].vaoBaseVertex * GLmeshes[i].Stride, size, bitfield);
                 memcpy(buf, mb->getVertices(), size);
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 4640ac59a..0a8aabddd 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -95,7 +95,7 @@ void STKMeshSceneNode::setFirstTimeMaterial()
 
       if (!immediate_draw)
       {
-          std::pair<unsigned, unsigned> p = getVAOOffsetAndBase(mb);
+          std::pair<unsigned, unsigned> p = VAOManager::getInstance()->getBase(mb);
           mesh.vaoBaseVertex = p.first;
           mesh.vaoOffset = p.second;
           mesh.VAOType = mb->getVertexType();
@@ -300,7 +300,7 @@ void STKMeshSceneNode::render()
             scene::IMeshBuffer* mb = Mesh->getMeshBuffer(i);
             if (!mb)
                 continue;
-            glBindVertexArray(getVAO(video::EVT_STANDARD));
+            glBindVertexArray(VAOManager::getInstance()->getVAO(video::EVT_STANDARD));
             drawGlow(GLmeshes[i]);
         }
     }
@@ -413,7 +413,7 @@ void STKMeshSceneNode::render()
 
         if (!TransparentMesh[TM_BUBBLE].empty())
             glUseProgram(MeshShader::BubbleShader::Program);
-        glBindVertexArray(getVAO(video::EVT_STANDARD));
+        glBindVertexArray(VAOManager::getInstance()->getVAO(video::EVT_STANDARD));
         for_in(mesh, TransparentMesh[TM_BUBBLE])
             drawBubble(*mesh, ModelViewProjectionMatrix);
         return;
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index f5546d85f..36aab33c8 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -270,7 +270,7 @@ void Track::cleanup()
 {
     QuadGraph::destroy();
     ItemManager::destroy();
-    resetVAO();
+    VAOManager::kill();
 
     ParticleKindManager::get()->cleanUpTrackSpecificGfx();
     // Clear reminder of transformed textures

From 06df2d12c7cd408e03756f1a3c398bdc1b55bd90 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Wed, 20 Aug 2014 23:16:20 +0200
Subject: [PATCH 066/248] Forgot to free a temp array.

---
 src/graphics/render_skybox.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/graphics/render_skybox.cpp b/src/graphics/render_skybox.cpp
index adafbf66e..8ae0bdeaf 100644
--- a/src/graphics/render_skybox.cpp
+++ b/src/graphics/render_skybox.cpp
@@ -440,6 +440,7 @@ GLuint generateCubeMapFromTextures(const std::vector<video::ITexture *> &texture
                     swapPixels(tmp, rgba[i], size, x, y, (size - y - 1), x);
                 }
             }
+            free(tmp);
         }
 
         glBindTexture(GL_TEXTURE_CUBE_MAP, result);

From dd1f0739f0885fadb213e8b77edaf77173e88f8a Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Wed, 20 Aug 2014 23:30:25 +0200
Subject: [PATCH 067/248] Properly clean program object in load shader
 function.

---
 src/graphics/gl_headers.hpp |  2 ++
 src/graphics/glwrap.cpp     |  4 ++++
 src/graphics/shaders.cpp    |  6 ++++++
 src/graphics/shaders.hpp    | 18 ++++++++++++++++++
 4 files changed, 30 insertions(+)

diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp
index 21d092693..8d53259c5 100644
--- a/src/graphics/gl_headers.hpp
+++ b/src/graphics/gl_headers.hpp
@@ -45,6 +45,7 @@ extern PFNGLCREATEPROGRAMPROC glCreateProgram;
 extern PFNGLATTACHSHADERPROC glAttachShader;
 extern PFNGLLINKPROGRAMPROC glLinkProgram;
 extern PFNGLUSEPROGRAMPROC glUseProgram;
+extern PFNGLDELETEPROGRAMPROC glDeleteProgram;
 extern PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
 extern PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
 extern PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
@@ -104,6 +105,7 @@ extern PFNGLTEXSTORAGE3DPROC glTexStorage3D;
 extern PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
 extern PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
 extern PFNGLGENSAMPLERSPROC glGenSamplers;
+extern PFNGLDELETESAMPLERSPROC glDeleteSamplers;
 extern PFNGLBINDSAMPLERPROC glBindSampler;
 extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
 extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index e205a41c8..fbee93442 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -25,6 +25,7 @@ PFNGLCREATEPROGRAMPROC glCreateProgram;
 PFNGLATTACHSHADERPROC glAttachShader;
 PFNGLLINKPROGRAMPROC glLinkProgram;
 PFNGLUSEPROGRAMPROC glUseProgram;
+PFNGLDELETEPROGRAMPROC glDeleteProgram;
 PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
 PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
 PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
@@ -85,6 +86,7 @@ PFNGLTEXSTORAGE3DPROC glTexStorage3D;
 PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
 PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
 PFNGLGENSAMPLERSPROC glGenSamplers;
+PFNGLDELETESAMPLERSPROC glDeleteSamplers;
 PFNGLBINDSAMPLERPROC glBindSampler;
 PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
 PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
@@ -200,6 +202,7 @@ void initGL()
     glAttachShader = (PFNGLATTACHSHADERPROC)IRR_OGL_LOAD_EXTENSION("glAttachShader");
     glLinkProgram = (PFNGLLINKPROGRAMPROC)IRR_OGL_LOAD_EXTENSION("glLinkProgram");
     glUseProgram = (PFNGLUSEPROGRAMPROC)IRR_OGL_LOAD_EXTENSION("glUseProgram");
+    glDeleteProgram = (PFNGLDELETEPROGRAMPROC)IRR_OGL_LOAD_EXTENSION("glDeleteProgram");
     glEnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC)IRR_OGL_LOAD_EXTENSION("glEnableVertexAttribArray");
     glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)IRR_OGL_LOAD_EXTENSION("glGetUniformLocation");
     glUniformMatrix4fv = (PFNGLUNIFORMMATRIX4FVPROC)IRR_OGL_LOAD_EXTENSION("glUniformMatrix4fv");
@@ -255,6 +258,7 @@ void initGL()
     glBindImageTexture = (PFNGLBINDIMAGETEXTUREPROC)IRR_OGL_LOAD_EXTENSION("glBindImageTexture");
     glDispatchCompute = (PFNGLDISPATCHCOMPUTEPROC)IRR_OGL_LOAD_EXTENSION("glDispatchCompute");
     glGenSamplers = (PFNGLGENSAMPLERSPROC)IRR_OGL_LOAD_EXTENSION("glGenSamplers");
+    glDeleteSamplers = (PFNGLDELETESAMPLERSPROC)IRR_OGL_LOAD_EXTENSION("glDeleteSamplers");
     glBindSampler = (PFNGLBINDSAMPLERPROC)IRR_OGL_LOAD_EXTENSION("glBindSampler");
     glSamplerParameterf = (PFNGLSAMPLERPARAMETERFPROC)IRR_OGL_LOAD_EXTENSION("glSamplerParameterf");
     glSamplerParameteri = (PFNGLSAMPLERPARAMETERIPROC)IRR_OGL_LOAD_EXTENSION("glSamplerParameteri");
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index a18878bf3..f140e6bc9 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -103,6 +103,8 @@
 
 using namespace video;
 
+std::vector<void(*)()> CleanTable;
+
 Shaders::Shaders()
 {
     // Callbacks
@@ -397,6 +399,10 @@ void Shaders::loadShaders()
     }
 
     initGL();
+    // Clean alive shaders
+    for (unsigned i = 0; i < CleanTable.size(); i++)
+        CleanTable[i]();
+    CleanTable.clear();
     initQuadVBO();
     initQuadBuffer();
     initBillboardVBO();
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 49b88f97a..16c38fcb3 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -124,6 +124,8 @@ struct UniformHelper
 
 void bypassUBO(GLuint Program);
 
+extern std::vector<void(*)()> CleanTable;
+
 template<typename T, typename... Args>
 class ShaderHelperSingleton : public Singleton<T>
 {
@@ -151,6 +153,16 @@ protected:
 public:
     GLuint Program;
 
+    ShaderHelperSingleton()
+    {
+        CleanTable.push_back(this->kill);
+    }
+
+    ~ShaderHelperSingleton()
+    {
+        glDeleteProgram(Program);
+    }
+
     void setUniforms(const Args & ... args) const
     {
         if (needsUBO())
@@ -409,6 +421,12 @@ public:
         else
             BindTexture<tp...>::exec(TextureUnits, args, 0);
     }
+
+    ~TextureRead()
+    {
+        for (unsigned i = 0; i < SamplersId.size(); i++)
+            glDeleteSamplers(1, &SamplersId[i]);
+    }
 };
 
 namespace MeshShader

From 5abc404ed9b88adbe9661a9b27ff706f92b1d741 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Thu, 21 Aug 2014 01:17:16 +0200
Subject: [PATCH 068/248] Use stream_copy for tfb buffers.

---
 src/graphics/gpuparticles.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index ffa77e8ea..563852110 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -88,7 +88,7 @@ void ParticleSystemProxy::setHeightmap(const std::vector<std::vector<float> > &h
     has_height_map = true;
     glGenBuffers(1, &heighmapbuffer);
     glBindBuffer(GL_TEXTURE_BUFFER, heighmapbuffer);
-    glBufferData(GL_TEXTURE_BUFFER, width * height * sizeof(float), hm_array, GL_STATIC_DRAW);
+    glBufferData(GL_TEXTURE_BUFFER, width * height * sizeof(float), hm_array, GL_STREAM_COPY);
     glGenTextures(1, &heightmaptexture);
     glBindTexture(GL_TEXTURE_BUFFER, heightmaptexture);
     glTexBuffer(GL_TEXTURE_BUFFER, GL_R32F, heighmapbuffer);
@@ -386,12 +386,12 @@ void ParticleSystemProxy::generateVAOs()
     glBindVertexArray(0);
     glGenBuffers(1, &initial_values_buffer);
     glBindBuffer(GL_ARRAY_BUFFER, initial_values_buffer);
-    glBufferData(GL_ARRAY_BUFFER, count * sizeof(ParticleData), ParticleParams, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, count * sizeof(ParticleData), ParticleParams, GL_STREAM_COPY);
     glGenBuffers(2, tfb_buffers);
     glBindBuffer(GL_ARRAY_BUFFER, tfb_buffers[0]);
-    glBufferData(GL_ARRAY_BUFFER, count * sizeof(ParticleData), InitialValues, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, count * sizeof(ParticleData), InitialValues, GL_STREAM_COPY);
     glBindBuffer(GL_ARRAY_BUFFER, tfb_buffers[1]);
-    glBufferData(GL_ARRAY_BUFFER, count * sizeof(ParticleData), 0, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, count * sizeof(ParticleData), 0, GL_STREAM_COPY);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
 
     glGenVertexArrays(1, &current_rendering_vao);
@@ -420,7 +420,7 @@ void ParticleSystemProxy::generateVAOs()
         }
         glGenBuffers(1, &quaternionsbuffer);
         glBindBuffer(GL_ARRAY_BUFFER, quaternionsbuffer);
-        glBufferData(GL_ARRAY_BUFFER, 4 * count * sizeof(float), quaternions, GL_STATIC_DRAW);
+        glBufferData(GL_ARRAY_BUFFER, 4 * count * sizeof(float), quaternions, GL_STREAM_COPY);
         delete[] quaternions;
     }
 

From d968ce11bfb9b3735fe6e27d3c5960d4477f39f0 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Thu, 21 Aug 2014 02:19:33 +0200
Subject: [PATCH 069/248] Add a function that kills shaders and use it when
 reloading shader.

Thus there is no mesh corruption.
---
 src/graphics/irr_driver.cpp | 2 +-
 src/graphics/irr_driver.hpp | 2 +-
 src/graphics/shaders.cpp    | 9 ++++++---
 src/graphics/shaders.hpp    | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index d9fa4cdbc..66eaabe21 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -736,7 +736,7 @@ void IrrDriver::applyResolutionSettings()
     // FIXME: this load sequence is (mostly) duplicated from main.cpp!!
     // That's just error prone
     // (we're sure to update main.cpp at some point and forget this one...)
-
+    m_shaders->killShaders();
     // initDevice will drop the current device.
     initDevice();
 
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index eb2cc3f61..3fe360c36 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -570,7 +570,7 @@ public:
     // -----------------------------------------------------------------------
     inline video::E_MATERIAL_TYPE getShader(const ShaderType num)  {return m_shaders->getShader(num);}
     // -----------------------------------------------------------------------
-    inline void updateShaders()  {m_shaders->loadShaders();}
+    inline void updateShaders()  {m_shaders->killShaders();}
     // ------------------------------------------------------------------------
     inline video::IShaderConstantSetCallBack* getCallback(const ShaderType num)
     {
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index f140e6bc9..ab076906c 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -399,9 +399,6 @@ void Shaders::loadShaders()
     }
 
     initGL();
-    // Clean alive shaders
-    for (unsigned i = 0; i < CleanTable.size(); i++)
-        CleanTable[i]();
     CleanTable.clear();
     initQuadVBO();
     initQuadBuffer();
@@ -418,6 +415,12 @@ void Shaders::loadShaders()
     UtilShader::ColoredLine::init();
 }
 
+void Shaders::killShaders()
+{
+    for (unsigned i = 0; i < CleanTable.size(); i++)
+        CleanTable[i]();
+}
+
 Shaders::~Shaders()
 {
     u32 i;
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 16c38fcb3..efce0d589 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -1039,6 +1039,7 @@ public:
     video::IShaderConstantSetCallBack * m_callbacks[ES_COUNT];
 
     void loadShaders();
+    void killShaders();
 private:
     void check(const int num) const;
     

From c8b50c67ef5ec7a7f3f83f2b501988a85ba454dc Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Wed, 20 Aug 2014 20:38:05 -0400
Subject: [PATCH 070/248] Fix leak

---
 src/modes/world.cpp  | 2 ++
 src/tracks/track.cpp | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index d80ae7b7d..d6c7f82c8 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -391,6 +391,8 @@ World::~World()
     music_manager->stopMusic();
     m_world = NULL;
 
+    irr_driver->getSceneManager()->clear();
+
 #ifdef DEBUG
     m_magic_number = 0xDEADBEEF;
 #endif
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 36aab33c8..c406783c7 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -425,7 +425,6 @@ void Track::cleanup()
         }
 #endif
     }   // if verbose
-
 }   // cleanup
 
 //-----------------------------------------------------------------------------
@@ -2020,11 +2019,15 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
             }
 
             scene::ISceneNode* parent = irr_driver->getSceneManager()->addEmptySceneNode();
+#ifdef DEBUG
+            parent->setName(("libnode_" + name).c_str());
+#endif
             parent->setPosition(xyz);
             parent->setRotation(hpr);
             parent->setScale(scale);
             parent->updateAbsolutePosition();
             loadObjects(libroot, lib_path, model_def_loader, create_lod_definitions, parent, library_nodes);
+            //m_all_nodes.push_back(parent);
         }
         else if (name == "water")
         {

From 78df1bf3715c49f668bc4ab23fa290f02d1d51bb Mon Sep 17 00:00:00 2001
From: Stephen Just <stephenjust@gmail.com>
Date: Wed, 20 Aug 2014 14:30:06 -0600
Subject: [PATCH 071/248] Fix hasGLExtension on Windows.

Windows requires loading the glGetStringi function explicitly.
Also included fallback for when it is not found.
---
 src/graphics/glwrap.cpp | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index fbee93442..02db147a2 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -90,6 +90,7 @@ PFNGLDELETESAMPLERSPROC glDeleteSamplers;
 PFNGLBINDSAMPLERPROC glBindSampler;
 PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
 PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
+PFNGLGETSTRINGIPROC glGetStringi;
 #endif
 
 static bool is_gl_init = false;
@@ -262,6 +263,7 @@ void initGL()
     glBindSampler = (PFNGLBINDSAMPLERPROC)IRR_OGL_LOAD_EXTENSION("glBindSampler");
     glSamplerParameterf = (PFNGLSAMPLERPARAMETERFPROC)IRR_OGL_LOAD_EXTENSION("glSamplerParameterf");
     glSamplerParameteri = (PFNGLSAMPLERPARAMETERIPROC)IRR_OGL_LOAD_EXTENSION("glSamplerParameteri");
+    glGetStringi = (PFNGLGETSTRINGIPROC)IRR_OGL_LOAD_EXTENSION("glGetstringi");
 #ifdef DEBUG
     glDebugMessageCallbackARB = (PFNGLDEBUGMESSAGECALLBACKARBPROC)IRR_OGL_LOAD_EXTENSION("glDebugMessageCallbackARB");
 #endif
@@ -1175,23 +1177,27 @@ void GL32_draw2DRectangle(video::SColor color, const core::rect<s32>& position,
 
 bool hasGLExtension(const char* extension) 
 {
-#ifdef WIN32
-    return false;
-#else
-    GLint numExtensions = 0;
-    glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
-    Log::debug("GLWrap", "Found %d OpenGL Extensions", numExtensions);
-    for (GLint i = 0; i < numExtensions; i++)
+    if (glGetStringi != NULL)
     {
-        const char* foundExtension =
-            (const char*) glGetStringi(GL_EXTENSIONS, i);
-        if (foundExtension && strcmp(foundExtension, extension) == 0)
+        GLint numExtensions = 0;
+        glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
+        for (GLint i = 0; i < numExtensions; i++)
+        {
+            const char* foundExtension =
+                (const char*) glGetStringi(GL_EXTENSIONS, i);
+            if (foundExtension && strcmp(foundExtension, extension) == 0)
+            {
+                return true;
+            }
+        }
+    }
+    else
+    {
+        const char* extensions = (const char*) glGetString(GL_EXTENSIONS);
+        if (extensions && strstr(extensions, extension) != NULL)
         {
-            Log::debug("GLWrap", "Extension %s found", extension);
             return true;
         }
     }
-    Log::debug("GLWrap", "Extension %s not found", extension);
     return false;
-#endif
 }

From 856eb747b4c2cc4b6466a8068b25dad723cb64fe Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 21 Aug 2014 08:01:54 +1000
Subject: [PATCH 072/248] Fixed shadows with a hack.

---
 src/graphics/shadow.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/graphics/shadow.cpp b/src/graphics/shadow.cpp
index e092f8284..5a6fb5cdb 100644
--- a/src/graphics/shadow.cpp
+++ b/src/graphics/shadow.cpp
@@ -23,7 +23,8 @@
 #include <IMeshSceneNode.h>
 #include <ISceneNode.h>
 
-Shadow::Shadow(video::ITexture *texture, scene::ISceneNode *node, float scale = 1.0, float xOffset = 0.0, float yOffset = 0.0)
+Shadow::Shadow(video::ITexture *texture, scene::ISceneNode *node, 
+               float scale = 1.0, float xOffset = 0.0, float yOffset = 0.0)
 {
     video::SMaterial m;
     m.setTexture(0, texture);
@@ -49,6 +50,7 @@ Shadow::Shadow(video::ITexture *texture, scene::ISceneNode *node, float scale =
     buffer->recalculateBoundingBox();
 
     m_node   = irr_driver->addMesh(m_mesh);
+    m_node->setPosition(core::vector3df(0, -0.1f, 0));
 #ifdef DEBUG
     m_node->setName("shadow");
 #endif

From 171b442ae618cbff78c396d3363926b8a0ff8abf Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 21 Aug 2014 09:59:29 +1000
Subject: [PATCH 073/248] Removed artificial Y offset to allow evaluation of
 more karts.

---
 src/graphics/shadow.cpp  | 2 +-
 src/karts/kart.cpp       | 2 +-
 src/karts/kart_model.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/graphics/shadow.cpp b/src/graphics/shadow.cpp
index 5a6fb5cdb..c075d0ccc 100644
--- a/src/graphics/shadow.cpp
+++ b/src/graphics/shadow.cpp
@@ -50,7 +50,7 @@ Shadow::Shadow(video::ITexture *texture, scene::ISceneNode *node,
     buffer->recalculateBoundingBox();
 
     m_node   = irr_driver->addMesh(m_mesh);
-    m_node->setPosition(core::vector3df(0, -0.1f, 0));
+    m_node->setPosition(core::vector3df(0, 0.0f, 0));
 #ifdef DEBUG
     m_node->setName("shadow");
 #endif
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 4b8fe38bd..b337760eb 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -2429,7 +2429,7 @@ void Kart::kartIsInRestNow()
         f +=  wi.m_chassisConnectionPointCS.getY()
             - wi.m_raycastInfo.m_suspensionLength - wi.m_wheelsRadius;
     }
-    m_graphical_y_offset = f/m_vehicle->getNumWheels() + 0.1f;
+    m_graphical_y_offset = f/m_vehicle->getNumWheels() + 0.0f;
 
     m_kart_model->setDefaultSuspension();
 }   // kartIsInRestNow
diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index 2b5fd2866..3350938b8 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -541,7 +541,7 @@ bool KartModel::loadModels(const KartProperties &kart_properties)
         }
     }
     for(unsigned int i=0; i<4; i++)
-        m_wheel_graphics_position[i].setY(m_wheel_graphics_position[i].getY()-0.1f);
+        m_wheel_graphics_position[i].setY(m_wheel_graphics_position[i].getY()-0.0f);
 
     // Load the wheel models. This can't be done early, since the default
     // values for the graphical position must be defined, which in turn

From 15cccf9301f50bfa0bfd2129c75ecca81e13efe5 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 21 Aug 2014 17:28:06 +1000
Subject: [PATCH 074/248] Make the graphical y offset configurable (and
 basically disable it for now by setting it to 0).

---
 data/stk_config.xml           | 11 ++++++-----
 src/graphics/shadow.cpp       | 12 ++++++------
 src/graphics/shadow.hpp       |  5 ++---
 src/karts/kart.cpp            |  6 ++++--
 src/karts/kart_model.cpp      | 10 ++++++++--
 src/karts/kart_properties.cpp | 14 ++++++++++----
 src/karts/kart_properties.hpp | 13 +++++++++++--
 7 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/data/stk_config.xml b/data/stk_config.xml
index b45b46a6e..81135667a 100644
--- a/data/stk_config.xml
+++ b/data/stk_config.xml
@@ -155,12 +155,13 @@
                  otherwise obstricts too much of the view.  -->
     <camera distance="1.5" forward-up-angle="15"
             backward-up-angle="30"/>
+    <!-- Additional offset to move graphical chassis with regards to the physics. -->
+    <graphics y-offset="0.0"/>
 
-   <!-- Jump animation related values:
-        animation-time: only if the estimated time for a jump is larger
-                        than this value will the jump animation being
-                        shown. -->
-   <jump animation-time="0.5" />
+    <!-- Jump animation related values:
+         animation-time: only if the estimated time for a jump is larger
+                         than this value will the jump animation being shown. -->
+    <jump animation-time="0.5" />
 
     <!-- Skidding: increase: multiplicative increase of skidding factor in each frame.
          decrease: multiplicative decrease of skidding factor in each frame.
diff --git a/src/graphics/shadow.cpp b/src/graphics/shadow.cpp
index c075d0ccc..619a552fa 100644
--- a/src/graphics/shadow.cpp
+++ b/src/graphics/shadow.cpp
@@ -24,7 +24,8 @@
 #include <ISceneNode.h>
 
 Shadow::Shadow(video::ITexture *texture, scene::ISceneNode *node, 
-               float scale = 1.0, float xOffset = 0.0, float yOffset = 0.0)
+               float scale = 1.0, float x_offset = 0.0, float y_offset = 0.0,
+               float z_offset = 0.0)
 {
     video::SMaterial m;
     m.setTexture(0, texture);
@@ -34,10 +35,10 @@ Shadow::Shadow(video::ITexture *texture, scene::ISceneNode *node,
     m_mesh   = irr_driver->createQuadMesh(&m, /*create_one_quad*/true);
     scene::IMeshBuffer *buffer = m_mesh->getMeshBuffer(0);
     irr::video::S3DVertex* v=(video::S3DVertex*)buffer->getVertices();
-    v[0].Pos.X = -scale+xOffset; v[0].Pos.Z =  scale+yOffset; v[0].Pos.Y = 0.01f;
-    v[1].Pos.X =  scale+xOffset; v[1].Pos.Z =  scale+yOffset; v[1].Pos.Y = 0.01f;
-    v[2].Pos.X =  scale+xOffset; v[2].Pos.Z = -scale+yOffset; v[2].Pos.Y = 0.01f;
-    v[3].Pos.X = -scale+xOffset; v[3].Pos.Z = -scale+yOffset; v[3].Pos.Y = 0.01f;
+    v[0].Pos.X = -scale+x_offset; v[0].Pos.Z =  scale+z_offset; v[0].Pos.Y = 0.01f-y_offset;
+    v[1].Pos.X =  scale+x_offset; v[1].Pos.Z =  scale+z_offset; v[1].Pos.Y = 0.01f-y_offset;
+    v[2].Pos.X =  scale+x_offset; v[2].Pos.Z = -scale+z_offset; v[2].Pos.Y = 0.01f-y_offset;
+    v[3].Pos.X = -scale+x_offset; v[3].Pos.Z = -scale+z_offset; v[3].Pos.Y = 0.01f-y_offset;
     v[0].TCoords = core::vector2df(0,0);
     v[1].TCoords = core::vector2df(1,0);
     v[2].TCoords = core::vector2df(1,1);
@@ -50,7 +51,6 @@ Shadow::Shadow(video::ITexture *texture, scene::ISceneNode *node,
     buffer->recalculateBoundingBox();
 
     m_node   = irr_driver->addMesh(m_mesh);
-    m_node->setPosition(core::vector3df(0, 0.0f, 0));
 #ifdef DEBUG
     m_node->setName("shadow");
 #endif
diff --git a/src/graphics/shadow.hpp b/src/graphics/shadow.hpp
index d55977bde..e234e716b 100644
--- a/src/graphics/shadow.hpp
+++ b/src/graphics/shadow.hpp
@@ -46,9 +46,8 @@ private:
     /** The scene node of the kart to which this shadow belongs. */
     scene::ISceneNode  *m_parent_kart_node;
 public:
-         Shadow(video::ITexture *texture,
-                scene::ISceneNode *node,
-                float scale, float xOffset, float yOffset);
+         Shadow(video::ITexture *texture, scene::ISceneNode *node,
+                float scale, float x_offset, float y_offset,float z_offset);
         ~Shadow();
     void enableShadow();
     void disableShadow();
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index b337760eb..5dffe87e7 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -2379,7 +2379,8 @@ void Kart::loadData(RaceManager::KartType type, bool is_animated_model)
                           m_node,
                           m_kart_properties->getShadowScale(),
                           m_kart_properties->getShadowXOffset(),
-                          m_kart_properties->getShadowYOffset());
+                          m_kart_properties->getGraphicalYOffset(),
+                          m_kart_properties->getShadowZOffset());
 
     World::getWorld()->kartAdded(this, m_node);
 }   // loadData
@@ -2429,7 +2430,8 @@ void Kart::kartIsInRestNow()
         f +=  wi.m_chassisConnectionPointCS.getY()
             - wi.m_raycastInfo.m_suspensionLength - wi.m_wheelsRadius;
     }
-    m_graphical_y_offset = f/m_vehicle->getNumWheels() + 0.0f;
+    m_graphical_y_offset = f/m_vehicle->getNumWheels() 
+                         + getKartProperties()->getGraphicalYOffset();
 
     m_kart_model->setDefaultSuspension();
 }   // kartIsInRestNow
diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index 3350938b8..add90030c 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -540,8 +540,14 @@ bool KartModel::loadModels(const KartProperties &kart_properties)
                                                      : -0.5f*m_kart_length);
         }
     }
-    for(unsigned int i=0; i<4; i++)
-        m_wheel_graphics_position[i].setY(m_wheel_graphics_position[i].getY()-0.0f);
+
+    float y_off = kart_properties.getGraphicalYOffset();
+    if(y_off!=0)
+    {
+        for (unsigned int i = 0; i < 4; i++)
+            m_wheel_graphics_position[i].setY(
+                                  m_wheel_graphics_position[i].getY() - y_off);
+    }
 
     // Load the wheel models. This can't be done early, since the default
     // values for the graphical position must be defined, which in turn
diff --git a/src/karts/kart_properties.cpp b/src/karts/kart_properties.cpp
index 3b61b2764..a1598c4ed 100644
--- a/src/karts/kart_properties.cpp
+++ b/src/karts/kart_properties.cpp
@@ -57,7 +57,7 @@ KartProperties::KartProperties(const std::string &filename)
     m_shadow_file   = "";
     m_shadow_scale    = 1.0f;
     m_shadow_x_offset = 0.0f;
-    m_shadow_y_offset = 0.0f;
+    m_shadow_z_offset = 0.0f;
 
     m_groups.clear();
     m_custom_sfx_id.resize(SFXManager::NUM_CUSTOMS);
@@ -92,7 +92,8 @@ KartProperties::KartProperties(const std::string &filename)
         m_squash_duration = m_downward_impulse_factor =
         m_bubblegum_fade_in_time = m_bubblegum_speed_fraction =
         m_bubblegum_time = m_bubblegum_torque = m_jump_animation_time =
-        m_smooth_flying_impulse = m_physical_wheel_position =
+        m_smooth_flying_impulse = m_physical_wheel_position = 
+        m_graphical_y_offset =
             UNDEFINED;
 
     m_engine_power.resize(RaceManager::DIFFICULTY_COUNT, UNDEFINED);
@@ -322,7 +323,7 @@ void KartProperties::getAllData(const XMLNode * root)
 
     root->get("shadow-scale",      &m_shadow_scale     );
     root->get("shadow-x-offset",   &m_shadow_x_offset  );
-    root->get("shadow-y-offset",   &m_shadow_y_offset  );
+    root->get("shadow-z-offset",   &m_shadow_z_offset  );
 
     root->get("type",     &m_kart_type        );
 
@@ -615,6 +616,11 @@ void KartProperties::getAllData(const XMLNode * root)
         startup_node->get("boost", &m_startup_boost);
     }
 
+    if(const XMLNode *graphics_node = root->getNode("graphics"))
+    {
+        graphics_node->get("y-offset", &m_graphical_y_offset);
+    }
+
     if(m_kart_model)
         m_kart_model->loadInfo(*root);
 }   // getAllData
@@ -735,7 +741,7 @@ void KartProperties::checkAllSet(const std::string &filename)
     CHECK_NEG(m_explosion_invulnerability_time,
                                             "explosion invulnerability-time");
     CHECK_NEG(m_explosion_radius,           "explosion radius"              );
-
+    CHECK_NEG(m_graphical_y_offset,         "graphics y-offset"             );
     for(unsigned int i=RaceManager::DIFFICULTY_FIRST;
         i<=RaceManager::DIFFICULTY_LAST; i++)
     {
diff --git a/src/karts/kart_properties.hpp b/src/karts/kart_properties.hpp
index 4b39a375a..759675ab9 100644
--- a/src/karts/kart_properties.hpp
+++ b/src/karts/kart_properties.hpp
@@ -112,7 +112,7 @@ private:
                                        *   for this kart.*/
     float m_shadow_x_offset;          /**< X offset of the shadow plane
                                        *   for this kart.*/
-    float m_shadow_y_offset;          /**< Y offset of the shadow plane
+    float m_shadow_z_offset;          /**< Z offset of the shadow plane
                                        *   for this kart.*/
     video::ITexture *m_shadow_texture;/**< The texture with the shadow. */
     video::SColor m_color;            /**< Color the represents the kart in the
@@ -204,6 +204,10 @@ private:
     std::string m_wheel_filename[4];
     /**  Radius of the graphical wheels.  */
     float       m_wheel_graphics_radius[4];
+    /** An additional Y offset added to the y position of the graphical
+     *  chassis. Useful for karts that don't have enough space for suspension
+     *  compression. */
+    float       m_graphical_y_offset;
     /** If the kart is supposed to have random wheel rotation at start. */
     bool        m_has_rand_wheels;
     /** Max. length of plunger rubber band. */
@@ -568,6 +572,11 @@ public:
     /** Returns wheel radius. */
     float getWheelRadius            () const {return m_wheel_radius;          }
 
+    // ------------------------------------------------------------------------
+    /** Return the additional Y offset added to the y position of the graphical
+     *  chassis. Useful for karts that don't have enough space for suspension
+     *  compression. */
+    float getGraphicalYOffset() const {return m_graphical_y_offset; }
     // ------------------------------------------------------------------------
     /** Returns parameters for the speed-weighted objects */
     const SpeedWeightedObject::Properties& getSpeedWeightedObjectProperties() const
@@ -831,7 +840,7 @@ public:
     // ------------------------------------------------------------------------
     /** Returns the scale factor by which the shadow plane
      *  had to be set. */
-    float getShadowYOffset          () const {return m_shadow_y_offset;       }
+    float getShadowZOffset          () const {return m_shadow_z_offset;       }
 
     // ------------------------------------------------------------------------
     /** Returns a pointer to the skidding properties. */

From 1179ebf4e9a8f1b873d2af1f9ead50249c5b9f36 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 21 Aug 2014 21:33:26 +1000
Subject: [PATCH 075/248] Fix suspension to some more realistic values.

---
 src/karts/kart_model.cpp | 11 ++++++-----
 src/karts/kart_model.hpp |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index add90030c..403b2582d 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -113,8 +113,8 @@ KartModel::KartModel(bool is_master)
 
         // default value for kart suspensions. move to config file later
         // if we find each kart needs custom values
-        m_min_suspension[i] = -0.59f;
-        m_max_suspension[i] = 0.59f;
+        m_min_suspension[i] = -0.07;
+        m_max_suspension[i] = 0.20f;
         m_dampen_suspension_amplitude[i] = 2.5f;
     }
     m_wheel_filename[0] = "";
@@ -782,15 +782,16 @@ void KartModel::update(float dt, float rotation_dt, float steer,  float speed)
             m_wheel_node[i]->setVisible(wi.m_raycastInfo.m_isInContact);
         }
 #endif
-        float rel_suspension = m_default_physics_suspension[i] 
-                             - wi.m_raycastInfo.m_suspensionLength;
+        float rel_suspension = wi.m_raycastInfo.m_suspensionLength
+                             - m_default_physics_suspension[i];
+        // If the suspension is too compressed
         if(rel_suspension< m_min_suspension[i])
             rel_suspension = m_min_suspension[i];
         else if(rel_suspension > m_max_suspension[i])
             rel_suspension = m_max_suspension[i];
 
         core::vector3df pos =  m_wheel_graphics_position[i].toIrrVector();
-        pos.Y += rel_suspension;
+        pos.Y -= rel_suspension;
 
         m_wheel_node[i]->setPosition(pos);
 
diff --git a/src/karts/kart_model.hpp b/src/karts/kart_model.hpp
index a5cd92201..733fd8aba 100644
--- a/src/karts/kart_model.hpp
+++ b/src/karts/kart_model.hpp
@@ -172,12 +172,13 @@ private:
     /** Length of the physics suspension when the kart is at rest. */
     float m_default_physics_suspension[4];
 
-    /** Minimum suspension length. If the displayed suspension is
-     *  shorter than this, the wheel would look wrong. */
+    /** Minimum suspension length (i.e. most compressed). If the displayed
+     *  suspension is shorter than this, the wheel would look wrong. */
     float         m_min_suspension[4];
 
-    /** Maximum suspension length. If the displayed suspension is
-     *  any longer, the wheel would look too far away from the chassis. */
+    /** Maximum suspension length (i.e. most extended). If the displayed
+     *  suspension is any longer, the wheel would look too far away from the 
+     *  chassis. */
     float         m_max_suspension[4];
 
     /** value used to divide the visual movement of wheels (because the actual movement

From c6f7448911fab31164525e8d31fc7474c11a945b Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 21 Aug 2014 22:34:51 +1000
Subject: [PATCH 076/248] Use sqrt(speed) to scale the collision impulse, which
 results in weaker impulses when hitting the terrain.

---
 data/stk_config.xml | 2 +-
 src/karts/kart.cpp  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/stk_config.xml b/data/stk_config.xml
index 81135667a..5e0fdfbe0 100644
--- a/data/stk_config.xml
+++ b/data/stk_config.xml
@@ -421,7 +421,7 @@
            outside of the chassis and results in more stable physical
            behaviour of the karts. -->
     <collision impulse-type="normal" 
-               impulse="3000" impulse-time="0.1" terrain-impulse="8000"
+               impulse="3000" impulse-time="0.1" terrain-impulse="1600"
                restitution="1.0" bevel-factor="0.5 0.0 0.7"
                physical-wheel-position="-1" />
 			 
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 5dffe87e7..b84ca215c 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -1765,9 +1765,9 @@ void Kart::crashed(const Material *m, const Vec3 &normal)
             impulse.normalize();
         else
             impulse = Vec3(0, 0, -1); // Arbitrary
-        // impulse depends of kart speed
-        impulse *= 0.2f * m_body->getLinearVelocity().length();
-        impulse *= m_kart_properties->getCollisionTerrainImpulse();
+        // impulse depends of kart speed - and speed can be negative
+        impulse *= sqrt(fabsf(getSpeed()))
+                 * m_kart_properties->getCollisionTerrainImpulse();
         m_bounce_back_time = 0.2f;
         m_vehicle->setTimedCentralImpulse(0.1f, impulse);
     }

From 45844647980ccb26c7465d34c2bdd01e9724fd95 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Thu, 21 Aug 2014 21:38:59 +0200
Subject: [PATCH 077/248] Add icon to exe file as resource.

It's hard to test for me because currently I can compile it only on virtual machine and it takes long time.
But it should work.
---
 CMakeLists.txt                         | 6 ++++--
 sources.cmake                          | 1 +
 src/windows_installer/icon_rc.template | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 src/windows_installer/icon_rc.template

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d490b6bb7..16759b88f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,6 +173,9 @@ endif()
 # TODO: remove this switch
 add_definitions(-DHAVE_OGGVORBIS)
 
+if(WIN32)
+    configure_file("${STK_SOURCE_DIR}/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc")
+endif()
 
 # Provides list of source and header files (STK_SOURCES and STK_HEADERS)
 include(sources.cmake)
@@ -228,7 +231,7 @@ else()
     endif()
 
     # Build the final executable
-    add_executable(supertuxkart ${STK_SOURCES} ${STK_HEADERS})
+    add_executable(supertuxkart ${STK_SOURCES} ${STK_RESOURCES} ${STK_HEADERS})
     target_link_libraries(supertuxkart ${PTHREAD_LIBRARY})
 endif()
 
@@ -369,7 +372,6 @@ install(FILES ${PROJECT_BINARY_DIR}/supertuxkart.desktop DESTINATION share/appli
 install(FILES data/supertuxkart_32.png data/supertuxkart_128.png DESTINATION share/pixmaps)
 install(FILES data/supertuxkart.appdata DESTINATION share/appdata)
 
-
 set(PREFIX ${CMAKE_INSTALL_PREFIX})
 configure_file(data/supertuxkart_desktop.template supertuxkart.desktop)
 add_dependencies(supertuxkart supertuxkart.desktop)
diff --git a/sources.cmake b/sources.cmake
index 595e1c12f..d4f28ae4d 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -3,3 +3,4 @@
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")
+file(GLOB_RECURSE STK_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_BINARY_DIR}/tmp/*.rc")
diff --git a/src/windows_installer/icon_rc.template b/src/windows_installer/icon_rc.template
new file mode 100644
index 000000000..d9cc5fd32
--- /dev/null
+++ b/src/windows_installer/icon_rc.template
@@ -0,0 +1 @@
+100 ICON "@PROJECT_SOURCE_DIR@/src/windows_installer/icon.ico"

From c38a26b92a7707c662ea5c057048d4bc4585941c Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Thu, 21 Aug 2014 23:26:16 +0200
Subject: [PATCH 078/248] Use a separate rtt for diffuse/specular

---
 src/graphics/irr_driver.hpp      |  9 ++++++---
 src/graphics/render_geometry.cpp |  4 ++--
 src/graphics/render_lighting.cpp |  6 +++---
 src/graphics/rtts.cpp            | 12 ++++++++----
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 3fe360c36..86ca6490e 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -78,9 +78,10 @@ enum TypeFBO
 {
     FBO_SSAO,
     FBO_NORMAL_AND_DEPTHS,
-    FBO_COMBINED_TMP1_TMP2,
+    FBO_COMBINED_DIFFUSE_SPECULAR,
     FBO_COLORS,
-    FBO_LOG_LUMINANCE,
+    FBO_DIFFUSE,
+    FBO_SPECULAR,
     FBO_MLAA_COLORS,
     FBO_MLAA_BLEND,
     FBO_MLAA_TMP,
@@ -140,7 +141,9 @@ enum TypeRTT
     RTT_LINEAR_DEPTH,
     RTT_NORMAL_AND_DEPTH,
     RTT_COLOR,
-    RTT_LOG_LUMINANCE,
+    RTT_DIFFUSE,
+    RTT_SPECULAR,
+
 
     RTT_HALF1,
     RTT_HALF2,
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index ec27ac576..3edef84be 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -384,12 +384,12 @@ void IrrDriver::renderSolidSecondPass()
     if (irr_driver->getGLSLVersion() >= 330)
         glBindSampler(0, 0);
 #endif
-    setTexture(0, m_rtts->getRenderTarget(RTT_TMP1), GL_NEAREST, GL_NEAREST);
+    setTexture(0, m_rtts->getRenderTarget(RTT_DIFFUSE), GL_NEAREST, GL_NEAREST);
 #ifdef GL_VERSION_3_3
     if (irr_driver->getGLSLVersion() >= 330)
         glBindSampler(1, 0);
 #endif
-    setTexture(1, m_rtts->getRenderTarget(RTT_TMP2), GL_NEAREST, GL_NEAREST);
+    setTexture(1, m_rtts->getRenderTarget(RTT_SPECULAR), GL_NEAREST, GL_NEAREST);
 #ifdef GL_VERSION_3_3
     if (irr_driver->getGLSLVersion() >= 330)
         glBindSampler(2, 0);
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 36fd61aa2..ded49f872 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -169,14 +169,14 @@ void IrrDriver::renderLights(unsigned pointlightcount)
 
     for (unsigned i = 0; i < sun_ortho_matrix.size(); i++)
         sun_ortho_matrix[i] *= getInvViewMatrix();
-    m_rtts->getFBO(FBO_COMBINED_TMP1_TMP2).Bind();
+    m_rtts->getFBO(FBO_COMBINED_DIFFUSE_SPECULAR).Bind();
     if (!UserConfigParams::m_dynamic_lights)
         glClearColor(.5, .5, .5, .5);
     glClear(GL_COLOR_BUFFER_BIT);
     if (!UserConfigParams::m_dynamic_lights)
         return;
 
-    m_rtts->getFBO(FBO_TMP1_WITH_DS).Bind();
+    m_rtts->getFBO(FBO_DIFFUSE).Bind();
     if (UserConfigParams::m_gi)
     {
         ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_GI));
@@ -188,7 +188,7 @@ void IrrDriver::renderLights(unsigned pointlightcount)
         m_post_processing->renderDiffuseEnvMap(blueSHCoeff, greenSHCoeff, redSHCoeff);
     }
 
-    m_rtts->getFBO(FBO_COMBINED_TMP1_TMP2).Bind();
+    m_rtts->getFBO(FBO_COMBINED_DIFFUSE_SPECULAR).Bind();
 
     // Render sunlight if and only if track supports shadow
     if (!World::getWorld() || World::getWorld()->getTrack()->hasShadows())
diff --git a/src/graphics/rtts.cpp b/src/graphics/rtts.cpp
index aa6ecb6e2..c16921488 100644
--- a/src/graphics/rtts.cpp
+++ b/src/graphics/rtts.cpp
@@ -115,6 +115,8 @@ RTT::RTT(size_t width, size_t height)
     RenderTargetTextures[RTT_MLAA_BLEND] = generateRTT(res, GL_SRGB8_ALPHA8, GL_BGR, GL_UNSIGNED_BYTE);
     RenderTargetTextures[RTT_SSAO] = generateRTT(res, GL_R16F, GL_RED, GL_FLOAT);
     RenderTargetTextures[RTT_DISPLACE] = generateRTT(res, GL_RGBA16F, GL_BGRA, GL_FLOAT);
+    RenderTargetTextures[RTT_DIFFUSE] = generateRTT(res, GL_RGB16F, GL_BGR, GL_FLOAT);
+    RenderTargetTextures[RTT_SPECULAR] = generateRTT(res, GL_RGB16F, GL_BGR, GL_FLOAT);
 
     RenderTargetTextures[RTT_HALF1] = generateRTT(half, GL_RGBA16F, GL_BGRA, GL_FLOAT);
     RenderTargetTextures[RTT_QUARTER1] = generateRTT(quarter, GL_RGBA16F, GL_BGRA, GL_FLOAT);
@@ -133,7 +135,6 @@ RTT::RTT(size_t width, size_t height)
     RenderTargetTextures[RTT_TMP_256] = generateRTT(shadowsize2, GL_RGBA16F, GL_BGR, GL_FLOAT);
     RenderTargetTextures[RTT_BLOOM_128] = generateRTT(shadowsize3, GL_RGBA16F, GL_BGR, GL_FLOAT);
     RenderTargetTextures[RTT_TMP_128] = generateRTT(shadowsize3, GL_RGBA16F, GL_BGR, GL_FLOAT);
-    RenderTargetTextures[RTT_LOG_LUMINANCE] = generateRTT(shadowsize0, GL_R16F, GL_RED, GL_FLOAT);
 
     std::vector<GLuint> somevector;
     somevector.push_back(RenderTargetTextures[RTT_SSAO]);
@@ -143,14 +144,17 @@ RTT::RTT(size_t width, size_t height)
     somevector.push_back(RenderTargetTextures[RTT_NORMAL_AND_DEPTH]);
     FrameBuffers.push_back(new FrameBuffer(somevector, DepthStencilTexture, res.Width, res.Height));
     somevector.clear();
-    somevector.push_back(RenderTargetTextures[RTT_TMP1]);
-    somevector.push_back(RenderTargetTextures[RTT_TMP2]);
+    somevector.push_back(RenderTargetTextures[RTT_DIFFUSE]);
+    somevector.push_back(RenderTargetTextures[RTT_SPECULAR]);
     FrameBuffers.push_back(new FrameBuffer(somevector, DepthStencilTexture, res.Width, res.Height));
     somevector.clear();
     somevector.push_back(RenderTargetTextures[RTT_COLOR]);
     FrameBuffers.push_back(new FrameBuffer(somevector, DepthStencilTexture, res.Width, res.Height));
     somevector.clear();
-    somevector.push_back(RenderTargetTextures[RTT_LOG_LUMINANCE]);
+    somevector.push_back(RenderTargetTextures[RTT_DIFFUSE]);
+    FrameBuffers.push_back(new FrameBuffer(somevector, res.Width, res.Height));
+    somevector.clear();
+    somevector.push_back(RenderTargetTextures[RTT_SPECULAR]);
     FrameBuffers.push_back(new FrameBuffer(somevector, res.Width, res.Height));
     somevector.clear();
     somevector.push_back(RenderTargetTextures[RTT_MLAA_COLORS]);

From 187c9fca85ed2a7125cf5db29f395d5a5947bd36 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Thu, 21 Aug 2014 23:29:40 +0200
Subject: [PATCH 079/248] Port SunLight to TextureRead

---
 src/graphics/post_processing.cpp | 3 +--
 src/graphics/shaders.cpp         | 5 ++---
 src/graphics/shaders.hpp         | 4 +---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index b091ed348..a7c73a546 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -278,8 +278,7 @@ void PostProcessing::renderSunlight()
   glBlendFunc(GL_ONE, GL_ONE);
   glBlendEquation(GL_FUNC_ADD);
 
-  setTexture(FullScreenShader::SunLightShader::getInstance()->TU_ntex, irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), GL_NEAREST, GL_NEAREST);
-  setTexture(FullScreenShader::SunLightShader::getInstance()->TU_dtex, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
+  FullScreenShader::SunLightShader::getInstance()->SetTextureUnits(createVector<GLuint>(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture()));
   DrawFullScreenEffect<FullScreenShader::SunLightShader>(cb->getPosition(), video::SColorf(cb->getRed(), cb->getGreen(), cb->getBlue()));
 }
 
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index ab076906c..0f6031c39 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1608,9 +1608,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getSpecular.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/sunlight.frag").c_str());
-        TU_ntex = 0;
-        TU_dtex = 1;
-        AssignTextureUnit(Program, TexUnit(TU_ntex, "ntex"), TexUnit(TU_dtex, "dtex"));
+
+        AssignSamplerNames(Program, 0, "ntex", 1, "dtex");
         AssignUniforms("direction", "col");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index efce0d589..5c9219195 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -757,11 +757,9 @@ public:
     DepthOfFieldShader();
 };
 
-class SunLightShader : public ShaderHelperSingleton<SunLightShader, core::vector3df, video::SColorf>
+class SunLightShader : public ShaderHelperSingleton<SunLightShader, core::vector3df, video::SColorf>, public TextureRead<Nearest_Filtered, Nearest_Filtered>
 {
 public:
-    GLuint TU_ntex, TU_dtex;
-
     SunLightShader();
 };
 

From 062bcb1ff026cc834311d236275411a924eb364b Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Thu, 21 Aug 2014 23:31:45 +0200
Subject: [PATCH 080/248] Fix gl debug output rant about uninitialised sync

---
 src/graphics/render_geometry.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 3edef84be..381338745 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -231,6 +231,8 @@ void IrrDriver::renderSolidFirstPass()
     AnimatedListMatDetails::getInstance()->clear();
     AnimatedListMatUnlit::getInstance()->clear();
     // Add a 30 ms timeout
+    if (!m_sync)
+        m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
     GLenum reason = glClientWaitSync(m_sync, GL_SYNC_FLUSH_COMMANDS_BIT, 30000000);
 /*    switch (reason)
     {

From cee48821d3044e81544270c202ebd6f9450c72d3 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 22 Aug 2014 00:20:04 +0200
Subject: [PATCH 081/248] Port diffuse env map shaders

---
 src/graphics/post_processing.cpp |  6 +++---
 src/graphics/shaders.cpp         | 26 +++-----------------------
 src/graphics/shaders.hpp         | 15 +++++++++------
 3 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index a7c73a546..05d7250b3 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -228,12 +228,12 @@ void PostProcessing::renderDiffuseEnvMap(const float *bSHCoeff, const float *gSH
     glBlendEquation(GL_FUNC_ADD);
     glBlendFunc(GL_ONE, GL_ONE);
 
-    glUseProgram(FullScreenShader::DiffuseEnvMapShader::Program);
+    glUseProgram(FullScreenShader::DiffuseEnvMapShader::getInstance()->Program);
     glBindVertexArray(SharedObject::FullScreenQuadVAO);
 
-    setTexture(0, irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), GL_NEAREST, GL_NEAREST);
+    FullScreenShader::DiffuseEnvMapShader::getInstance()->SetTextureUnits(createVector<GLuint>(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH)));
     core::matrix4 TVM = irr_driver->getViewMatrix().getTransposed();
-    FullScreenShader::DiffuseEnvMapShader::setUniforms(TVM, bSHCoeff, gSHCoeff, rSHCoeff, 0);
+    FullScreenShader::DiffuseEnvMapShader::getInstance()->setUniforms(TVM, std::vector<float>(bSHCoeff, bSHCoeff + 9), std::vector<float>(gSHCoeff, gSHCoeff + 9), std::vector<float>(rSHCoeff, rSHCoeff + 9));
 
     glDrawArrays(GL_TRIANGLES, 0, 3);
     glBindVertexArray(0);
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 0f6031c39..c33a982cf 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -407,7 +407,6 @@ void Shaders::loadShaders()
     initFrustrumVBO();
     initShadowVPMUBO();
     initParticleQuadVBO();
-    FullScreenShader::DiffuseEnvMapShader::init();
     MeshShader::BubbleShader::init();
     LightShader::PointLightShader::init();
     MeshShader::SkyboxShader::init();
@@ -1616,33 +1615,14 @@ namespace FullScreenShader
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
     }
 
-    GLuint DiffuseEnvMapShader::Program;
-    GLuint DiffuseEnvMapShader::uniform_ntex;
-    GLuint DiffuseEnvMapShader::uniform_blueLmn;
-    GLuint DiffuseEnvMapShader::uniform_greenLmn;
-    GLuint DiffuseEnvMapShader::uniform_redLmn;
-    GLuint DiffuseEnvMapShader::uniform_TVM;
-
-    void DiffuseEnvMapShader::init()
+    DiffuseEnvMapShader::DiffuseEnvMapShader()
     {
         Program = LoadProgram(
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/decodeNormal.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/diffuseenvmap.frag").c_str());
-        uniform_ntex = glGetUniformLocation(Program, "ntex");
-        uniform_blueLmn = glGetUniformLocation(Program, "blueLmn[0]");
-        uniform_greenLmn = glGetUniformLocation(Program, "greenLmn[0]");
-        uniform_redLmn = glGetUniformLocation(Program, "redLmn[0]");
-        uniform_TVM = glGetUniformLocation(Program, "TransposeViewMatrix");
-    }
-
-    void DiffuseEnvMapShader::setUniforms(const core::matrix4 &TransposeViewMatrix, const float *blueSHCoeff, const float *greenSHCoeff, const float *redSHCoeff, unsigned TU_ntex)
-    {
-        glUniformMatrix4fv(uniform_TVM, 1, GL_FALSE, TransposeViewMatrix.pointer());
-        glUniform1i(uniform_ntex, TU_ntex);
-        glUniform1fv(uniform_blueLmn, 9, blueSHCoeff);
-        glUniform1fv(uniform_greenLmn, 9, greenSHCoeff);
-        glUniform1fv(uniform_redLmn, 9, redSHCoeff);
+        AssignUniforms("TransposeViewMatrix", "blueLmn[0]", "greenLmn[0]", "redLmn[0]");
+        AssignSamplerNames(Program, 0, "ntex");
     }
 
     ShadowedSunLightShader::ShadowedSunLightShader()
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 5c9219195..c2d009081 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -120,6 +120,13 @@ struct UniformHelper
         setUniformsHelper<N + 1>(uniforms, arg...);
     }
 
+    template<unsigned N = 0, typename... Args>
+    static void setUniformsHelper(const std::vector<GLuint> &uniforms, const std::vector<float> &v, Args... arg)
+    {
+        glUniform1fv(uniforms[N], v.size(), v.data());
+        setUniformsHelper<N + 1>(uniforms, arg...);
+    }
+
 };
 
 void bypassUBO(GLuint Program);
@@ -763,14 +770,10 @@ public:
     SunLightShader();
 };
 
-class DiffuseEnvMapShader
+class DiffuseEnvMapShader : public ShaderHelperSingleton<DiffuseEnvMapShader, core::matrix4, std::vector<float>, std::vector<float>, std::vector<float> >, public TextureRead<Nearest_Filtered>
 {
 public:
-    static GLuint Program;
-    static GLuint uniform_ntex, uniform_TVM, uniform_blueLmn, uniform_greenLmn, uniform_redLmn;
-
-    static void init();
-    static void setUniforms(const core::matrix4 &TransposeViewMatrix, const float *blueSHCoeff, const float *greenSHCoeff, const float *redSHCoeff, unsigned TU_ntex);
+    DiffuseEnvMapShader();
 };
 
 class ShadowedSunLightShader : public ShaderHelperSingleton<ShadowedSunLightShader, core::vector3df, video::SColorf>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Shadow_Sampler>

From 547018f0ab4079e080b0e842d54eefa0478d446e Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 22 Aug 2014 00:30:14 +0200
Subject: [PATCH 082/248] Port PointLight shader

---
 data/shaders/pointlight.frag     |  1 -
 src/graphics/render_lighting.cpp | 11 ++++-----
 src/graphics/shaders.cpp         | 41 +++++++-------------------------
 src/graphics/shaders.hpp         | 13 ++++------
 4 files changed, 17 insertions(+), 49 deletions(-)

diff --git a/data/shaders/pointlight.frag b/data/shaders/pointlight.frag
index c8913fd50..c479ec7ce 100644
--- a/data/shaders/pointlight.frag
+++ b/data/shaders/pointlight.frag
@@ -1,6 +1,5 @@
 uniform sampler2D ntex;
 uniform sampler2D dtex;
-uniform float spec;
 
 flat in vec3 center;
 flat in float energy;
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index ded49f872..6017141c8 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -45,17 +45,14 @@ static void renderPointLights(unsigned count)
     glEnable(GL_DEPTH_TEST);
     glDepthMask(GL_FALSE);
 
-    glUseProgram(LightShader::PointLightShader::Program);
-    glBindVertexArray(LightShader::PointLightShader::vao);
-    glBindBuffer(GL_ARRAY_BUFFER, LightShader::PointLightShader::vbo);
+    glUseProgram(LightShader::PointLightShader::getInstance()->Program);
+    glBindVertexArray(LightShader::PointLightShader::getInstance()->vao);
+    glBindBuffer(GL_ARRAY_BUFFER, LightShader::PointLightShader::getInstance()->vbo);
     glBufferSubData(GL_ARRAY_BUFFER, 0, count * sizeof(LightShader::PointLightInfo), PointLightsInfo);
 
     setTexture(0, irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), GL_NEAREST, GL_NEAREST);
     setTexture(1, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
-    LightShader::PointLightShader
-        ::setUniforms(core::vector2df(float(UserConfigParams::m_width),
-        float(UserConfigParams::m_height)),
-        200, 0, 1);
+    LightShader::PointLightShader::getInstance()->setUniforms();
 
     glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, count);
 }
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index c33a982cf..dc5fa8733 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -408,7 +408,6 @@ void Shaders::loadShaders()
     initShadowVPMUBO();
     initParticleQuadVBO();
     MeshShader::BubbleShader::init();
-    LightShader::PointLightShader::init();
     MeshShader::SkyboxShader::init();
     MeshShader::ViewFrustrumShader::init();
     UtilShader::ColoredLine::init();
@@ -1421,19 +1420,7 @@ namespace MeshShader
 
 namespace LightShader
 {
-
-    GLuint PointLightShader::Program;
-    GLuint PointLightShader::attrib_Position;
-    GLuint PointLightShader::attrib_Color;
-    GLuint PointLightShader::attrib_Energy;
-    GLuint PointLightShader::attrib_Radius;
-    GLuint PointLightShader::uniform_ntex;
-    GLuint PointLightShader::uniform_dtex;
-    GLuint PointLightShader::uniform_spec;
-    GLuint PointLightShader::vbo;
-    GLuint PointLightShader::vao;
-
-    void PointLightShader::init()
+    PointLightShader::PointLightShader()
     {
         Program = LoadProgram(
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/pointlight.vert").c_str(),
@@ -1441,13 +1428,9 @@ namespace LightShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getSpecular.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/pointlight.frag").c_str());
-        attrib_Position = glGetAttribLocation(Program, "Position");
-        attrib_Color = glGetAttribLocation(Program, "Color");
-        attrib_Energy = glGetAttribLocation(Program, "Energy");
-        attrib_Radius = glGetAttribLocation(Program, "Radius");
-        uniform_ntex = glGetUniformLocation(Program, "ntex");
-        uniform_dtex = glGetUniformLocation(Program, "dtex");
-        uniform_spec = glGetUniformLocation(Program, "spec");
+
+        AssignUniforms();
+        AssignSamplerNames(Program, 0, "ntex", 1, "dtex");
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
@@ -1456,6 +1439,11 @@ namespace LightShader
         glBindBuffer(GL_ARRAY_BUFFER, vbo);
         glBufferData(GL_ARRAY_BUFFER, MAXLIGHT * sizeof(PointLightInfo), 0, GL_DYNAMIC_DRAW);
 
+        GLuint attrib_Position = glGetAttribLocation(Program, "Position");
+        GLuint attrib_Color = glGetAttribLocation(Program, "Color");
+        GLuint attrib_Energy = glGetAttribLocation(Program, "Energy");
+        GLuint attrib_Radius = glGetAttribLocation(Program, "Radius");
+
         glEnableVertexAttribArray(attrib_Position);
         glVertexAttribPointer(attrib_Position, 3, GL_FLOAT, GL_FALSE, sizeof(PointLightInfo), 0);
         glEnableVertexAttribArray(attrib_Energy);
@@ -1470,17 +1458,6 @@ namespace LightShader
         glVertexAttribDivisor(attrib_Color, 1);
         glVertexAttribDivisor(attrib_Radius, 1);
     }
-
-    void PointLightShader::setUniforms(const core::vector2df &screen, unsigned spec, unsigned TU_ntex, unsigned TU_dtex)
-    {
-        if (irr_driver->needUBOWorkaround())
-            bypassUBO(Program);
-        glUniform1f(uniform_spec, 200);
-
-        glUniform1i(uniform_ntex, TU_ntex);
-        glUniform1i(uniform_dtex, TU_dtex);
-    }
-
 }
 
 
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index c2d009081..7fac9fd87 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -691,17 +691,12 @@ namespace LightShader
     };
 
 
-    class PointLightShader
+    class PointLightShader : public ShaderHelperSingleton<PointLightShader>, TextureRead<Nearest_Filtered, Nearest_Filtered>
     {
     public:
-        static GLuint Program;
-        static GLuint attrib_Position, attrib_Energy, attrib_Color, attrib_Radius;
-        static GLuint uniform_ntex, uniform_dtex, uniform_spec;
-        static GLuint vbo;
-        static GLuint vao;
-
-        static void init();
-        static void setUniforms(const core::vector2df &screen, unsigned spec, unsigned TU_ntex, unsigned TU_dtex);
+        GLuint vbo;
+        GLuint vao;
+        PointLightShader();
     };
 }
 

From 5c879b623f0b898b7046be9b2b9ff4da3da8e0b3 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 22 Aug 2014 00:38:45 +0200
Subject: [PATCH 083/248] Fix pointlight call

---
 src/graphics/render_lighting.cpp | 3 +--
 src/graphics/shaders.hpp         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 6017141c8..ecdb80bdb 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -50,8 +50,7 @@ static void renderPointLights(unsigned count)
     glBindBuffer(GL_ARRAY_BUFFER, LightShader::PointLightShader::getInstance()->vbo);
     glBufferSubData(GL_ARRAY_BUFFER, 0, count * sizeof(LightShader::PointLightInfo), PointLightsInfo);
 
-    setTexture(0, irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), GL_NEAREST, GL_NEAREST);
-    setTexture(1, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
+    LightShader::PointLightShader::getInstance()->SetTextureUnits(createVector<GLuint>(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture()));
     LightShader::PointLightShader::getInstance()->setUniforms();
 
     glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, count);
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 7fac9fd87..21386bda2 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -691,7 +691,7 @@ namespace LightShader
     };
 
 
-    class PointLightShader : public ShaderHelperSingleton<PointLightShader>, TextureRead<Nearest_Filtered, Nearest_Filtered>
+    class PointLightShader : public ShaderHelperSingleton<PointLightShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered>
     {
     public:
         GLuint vbo;

From c3821e703b05cafa0e3cf76d3843d48990d43da9 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 Aug 2014 09:49:55 +1000
Subject: [PATCH 084/248] Made line endings consistent.

---
 src/karts/kart.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 577f75b8e..c5aa2b865 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -612,14 +612,14 @@ void Kart::createPhysics()
                     if(f<0)
                     {
                         const Vec3 cs = getKartProperties()->getGravityCenterShift();
-                        wheel_pos[index].setX(x*0.5f*getKartWidth()+cs.getX());
-                        float radius = getKartProperties()->getWheelRadius();
-                        // Set the connection point so that a maximum compressed wheel
-                        // (susp. length=0) will still poke a little bit out under the
-                        // kart
-                        wheel_pos[index].setY(radius - 0.05f);
-                        wheel_pos[index].setZ((0.5f*getKartLength() - radius)* z
-                                               + cs.getZ());
+                        wheel_pos[index].setX(x*0.5f*getKartWidth()+cs.getX());
+                        float radius = getKartProperties()->getWheelRadius();
+                        // Set the connection point so that a maximum compressed wheel
+                        // (susp. length=0) will still poke a little bit out under the
+                        // kart
+                        wheel_pos[index].setY(radius - 0.05f);
+                        wheel_pos[index].setZ((0.5f*getKartLength() - radius)* z
+                                               + cs.getZ());
 
                     }
                     else

From dc35efa9d7df32542f621cb6bf148d4a287f6215 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 22 Aug 2014 02:08:05 +0200
Subject: [PATCH 085/248] Port nvidia workaround to TextureRead

---
 src/graphics/render_lighting.cpp | 5 ++---
 src/graphics/shaders.cpp         | 6 ++----
 src/graphics/shaders.hpp         | 4 +---
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index ecdb80bdb..fa3c3ec7f 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -139,9 +139,8 @@ void IrrDriver::renderLights(unsigned pointlightcount)
         if (irr_driver->needRHWorkaround())
         {
             glUseProgram(FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->Program);
-            setTexture(FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->TU_ctex, m_rtts->getRSM().getRTT()[0], GL_LINEAR, GL_LINEAR);
-            setTexture(FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->TU_ntex, m_rtts->getRSM().getRTT()[1], GL_LINEAR, GL_LINEAR);
-            setTexture(FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->TU_dtex, m_rtts->getRSM().getDepthTexture(), GL_LINEAR, GL_LINEAR);
+            FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->SetTextureUnits(
+                createVector<GLuint>(m_rtts->getRSM().getRTT()[0], m_rtts->getRSM().getRTT()[1], m_rtts->getRSM().getDepthTexture()));
             for (unsigned i = 0; i < 32; i++)
             {
                 FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->setUniforms(rsm_matrix, rh_matrix, rh_extend, i);
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index dc5fa8733..d3b90846d 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1651,10 +1651,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/rh.frag").c_str());
 
         AssignUniforms("RSMMatrix", "RHMatrix", "extents", "slice");
-        TU_ctex = 0;
-        TU_ntex = 1;
-        TU_dtex = 2;
-        AssignTextureUnit(Program, TexUnit(TU_ctex, "ctex"), TexUnit(TU_ntex, "ntex"), TexUnit(TU_dtex, "dtex"));
+
+        AssignSamplerNames(Program, 0, "ctex", 1, "ntex", 2, "dtex");
     }
 
     RHDebug::RHDebug()
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 21386bda2..d058d45dd 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -784,11 +784,9 @@ public:
 };
 
 // Workaround for a bug found in kepler nvidia linux and fermi nvidia windows
-class NVWorkaroundRadianceHintsConstructionShader : public ShaderHelperSingleton<NVWorkaroundRadianceHintsConstructionShader, core::matrix4, core::matrix4, core::vector3df, int>
+class NVWorkaroundRadianceHintsConstructionShader : public ShaderHelperSingleton<NVWorkaroundRadianceHintsConstructionShader, core::matrix4, core::matrix4, core::vector3df, int>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
 {
 public:
-    GLuint TU_ctex, TU_ntex, TU_dtex;
-
     NVWorkaroundRadianceHintsConstructionShader();
 };
 

From b5273d64267e228f6770885357ab8b010723aced Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 22 Aug 2014 02:21:20 +0200
Subject: [PATCH 086/248] Port gaussian17*shader (non compute) to TextureRead.

---
 src/graphics/post_processing.cpp | 15 ++-------------
 src/graphics/shaders.cpp         | 10 ++++------
 src/graphics/shaders.hpp         |  8 ++------
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 05d7250b3..14e39eaf3 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -342,13 +342,7 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
 #endif
         {
             auxiliary.Bind();
-
-            setTexture(FullScreenShader::Gaussian17TapHShader::getInstance()->TU_tex, in_fbo.getRTT()[0], GL_LINEAR, GL_LINEAR);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-            setTexture(FullScreenShader::Gaussian17TapHShader::getInstance()->TU_depth, irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0], GL_LINEAR, GL_LINEAR);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+            FullScreenShader::Gaussian17TapHShader::getInstance()->SetTextureUnits(createVector<GLuint>(in_fbo.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]));
             DrawFullScreenEffect<FullScreenShader::Gaussian17TapHShader>(core::vector2df(inv_width, inv_height));
         }
 #if WIN32
@@ -371,12 +365,7 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
         {
             in_fbo.Bind();
 
-            setTexture(FullScreenShader::Gaussian17TapVShader::getInstance()->TU_tex, auxiliary.getRTT()[0], GL_LINEAR, GL_LINEAR);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-            setTexture(FullScreenShader::Gaussian17TapVShader::getInstance()->TU_depth, irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0], GL_LINEAR, GL_LINEAR);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+            FullScreenShader::Gaussian17TapVShader::getInstance()->SetTextureUnits(createVector<GLuint>(auxiliary.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]));
             DrawFullScreenEffect<FullScreenShader::Gaussian17TapVShader>(core::vector2df(inv_width, inv_height));
         }
 #if WIN32
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index d3b90846d..3812c28ac 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1690,9 +1690,8 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/bilateralH.frag").c_str());
         AssignUniforms("pixel");
-        TU_tex = 0;
-        TU_depth = 1;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"), TexUnit(TU_depth, "depth"));
+
+        AssignSamplerNames(Program, 0, "tex", 1, "depth");
     }
 
     ComputeGaussian17TapHShader::ComputeGaussian17TapHShader()
@@ -1736,9 +1735,8 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/bilateralV.frag").c_str());
         AssignUniforms("pixel");
-        TU_tex = 0;
-        TU_depth = 1;
-        AssignTextureUnit(Program, TexUnit(TU_tex, "tex"), TexUnit(TU_depth, "depth"));
+
+        AssignSamplerNames(Program, 0, "tex", 1, "depth");
     }
 
     ComputeGaussian17TapVShader::ComputeGaussian17TapVShader()
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index d058d45dd..9ab88daa0 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -805,11 +805,9 @@ public:
     GlobalIlluminationReconstructionShader();
 };
 
-class Gaussian17TapHShader : public ShaderHelperSingleton<Gaussian17TapHShader, core::vector2df>
+class Gaussian17TapHShader : public ShaderHelperSingleton<Gaussian17TapHShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered, Bilinear_Clamped_Filtered>
 {
 public:
-    GLuint TU_tex, TU_depth;
-
     Gaussian17TapHShader();
 };
 
@@ -832,11 +830,9 @@ public:
     Gaussian3HBlurShader();
 };
 
-class Gaussian17TapVShader : public ShaderHelperSingleton<Gaussian17TapVShader, core::vector2df>
+class Gaussian17TapVShader : public ShaderHelperSingleton<Gaussian17TapVShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered, Bilinear_Clamped_Filtered>
 {
 public:
-    GLuint TU_tex, TU_depth;
-
     Gaussian17TapVShader();
 };
 

From f0f4b8d9f6273b10a9bf9654eacc62ddf97cbe80 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 Aug 2014 12:14:06 +1000
Subject: [PATCH 087/248] Improved error message.

---
 src/states_screens/register_screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/states_screens/register_screen.cpp b/src/states_screens/register_screen.cpp
index 067cfcf3b..244a96685 100644
--- a/src/states_screens/register_screen.cpp
+++ b/src/states_screens/register_screen.cpp
@@ -224,7 +224,7 @@ void RegisterScreen::doRegister()
     }
     else if (username.size() < 3 || username.size() > 30)
     {
-        m_info_widget->setText(_("Username has to be between 4 and 30 characters long!"), false);
+        m_info_widget->setText(_("Online username has to be between 4 and 30 characters long!"), false);
     }
     else if (password.size() < 8 || password.size() > 30)
     {

From 80e1effccfe597015a3efc963dc0861f0dcba9da Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 Aug 2014 12:44:46 +1000
Subject: [PATCH 088/248] Added some debug output to get more info for #1464
 (unnecessary download of addon icons). To be removed later.

---
 src/io/file_manager.cpp | 19 +++++++++++++++++++
 src/io/file_manager.hpp |  9 +--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/io/file_manager.cpp b/src/io/file_manager.cpp
index e4d0ff499..ec7d64e32 100644
--- a/src/io/file_manager.cpp
+++ b/src/io/file_manager.cpp
@@ -350,6 +350,25 @@ FileManager::~FileManager()
     m_file_system = NULL;
 }   // ~FileManager
 
+// ----------------------------------------------------------------------------
+/** Returns true if the specified file exists.
+ */
+bool FileManager::fileExists(const std::string& path) const
+{
+#ifdef DEBUG
+    bool exists = m_file_system->existFile(path.c_str());
+    if(exists) return true;
+    // Now the original file was not found. Test if replacing \ with / helps:
+    std::string s = StringUtils::replace(path, "\\", "/");
+    exists = m_file_system->existFile(s.c_str());
+    if(exists)
+        Log::warn("FileManager", "File '%s' does not exists, but '%s' does!",
+        path.c_str(), s.c_str());
+    return exists;
+#else
+    return m_file_system->existFile(path.c_str());
+#endif
+}   // fileExists
 //-----------------------------------------------------------------------------
 /** Adds paths to the list of stk root directories.
  *  \param roots A ":" separated string of directories to add.
diff --git a/src/io/file_manager.hpp b/src/io/file_manager.hpp
index cc77a32e5..986f0df69 100644
--- a/src/io/file_manager.hpp
+++ b/src/io/file_manager.hpp
@@ -133,6 +133,7 @@ public:
     std::string searchMusic(const std::string& file_name) const;
     std::string searchTexture(const std::string& fname) const;
     std::string getUserConfigFile(const std::string& fname) const;
+    bool        fileExists(const std::string& path) const;
     void        listFiles        (std::set<std::string>& result,
                                   const std::string& dir,
                                   bool make_full_path=false) const;
@@ -155,14 +156,6 @@ public:
         m_music_search_path.push_back(path);
     }   // pushMusicSearchPath
 
-    // ------------------------------------------------------------------------
-    /** Returns true if the specified file exists.
-     */
-    bool fileExists(const std::string& path) const
-    {
-        return m_file_system->existFile(path.c_str());
-    }   // fileExists
-
 };   // FileManager
 
 extern FileManager* file_manager;

From 52a7d071ddf4cc8e01dffe3d059870aba6a1a17e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 Aug 2014 16:34:18 +1000
Subject: [PATCH 089/248] Fixed some Log:: messages that used incorrect syntax
 and did not print some variables. Made all log:: messages use the same
 components 'addons'.

---
 src/addons/addons_manager.cpp | 36 +++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/addons/addons_manager.cpp b/src/addons/addons_manager.cpp
index e4d24e11f..c83a10dbc 100644
--- a/src/addons/addons_manager.cpp
+++ b/src/addons/addons_manager.cpp
@@ -114,13 +114,13 @@ void AddonsManager::init(const XMLNode *xml,
     
     if (download)
     {
-        Log::info("NetworkHttp", "Downloading updated addons.xml");
+        Log::info("addons", "Downloading updated addons.xml.");
         Online::HTTPRequest *download_request = new Online::HTTPRequest("addons.xml");
         download_request->setURL(addon_list_url);
         download_request->executeNow();
         if(download_request->hadDownloadError())
         {
-            Log::error("addons", "Error on download addons.xml: %s\n",
+            Log::error("addons", "Error on download addons.xml: %s.",
                        download_request->getDownloadErrorMessage());
             delete download_request;
             return;
@@ -129,12 +129,12 @@ void AddonsManager::init(const XMLNode *xml,
         UserConfigParams::m_addons_last_updated=StkTime::getTimeSinceEpoch();
     }
     else
-        Log::info("NetworkHttp", "Using cached addons.xml");
+        Log::info("addons", "Using cached addons.xml.");
         
     const XMLNode *xml_addons = new XMLNode(filename);
     addons_manager->initAddons(xml_addons);   // will free xml_addons
     if(UserConfigParams::logAddons())
-        Log::info("addons", "Addons manager list downloaded");
+        Log::info("addons", "Addons manager list downloaded.");
 }   // init
 
 // ----------------------------------------------------------------------------
@@ -195,7 +195,7 @@ void AddonsManager::initAddons(const XMLNode *xml)
                 if(file_manager->fileExists(full_path))
                 {
                     if(UserConfigParams::logAddons())
-                        Log::warn("[AddonsManager] Removing cached icon '%s'.\n",
+                        Log::warn("addons", "Removing cached icon '%s'.",
                                addon.getIconBasename().c_str());
                     file_manager->removeFile(full_path);
                 }
@@ -226,9 +226,9 @@ void AddonsManager::initAddons(const XMLNode *xml)
         }
         else
         {
-            Log::error("[AddonsManager]", "Found invalid node '%s' while downloading addons.",
+            Log::error("addons", "Found invalid node '%s' while downloading addons.",
                     node->getName().c_str());
-            Log::error("[AddonsManager]", "Ignored.");
+            Log::error("addons", "Ignored.");
         }
     }   // for i<xml->getNumNodes
     delete xml;
@@ -254,7 +254,7 @@ void AddonsManager::initAddons(const XMLNode *xml)
         // it from the list.
         if(UserConfigParams::logAddons())
             Log::warn(
-                "[AddonsManager] Removing '%s' which is not on the server anymore.\n",
+                "addons", "Removing '%s' which is not on the server anymore.",
                 m_addons_list.getData()[i].getId().c_str() );
         const std::string &icon = m_addons_list.getData()[i].getIconBasename();
         std::string icon_file =file_manager->getAddonsFile("icons/"+icon);
@@ -311,7 +311,7 @@ void AddonsManager::checkInstalledAddons()
         if(n<0) continue;
         if(!m_addons_list.getData()[n].isInstalled())
         {
-            Log::info("[AddonsManager] Marking '%s' as being installed.",
+            Log::info("addons", "Marking '%s' as being installed.",
                    kp->getIdent().c_str());
             m_addons_list.getData()[n].setInstalled(true);
             something_was_changed = true;
@@ -330,7 +330,7 @@ void AddonsManager::checkInstalledAddons()
         if(n<0) continue;
         if(!m_addons_list.getData()[n].isInstalled())
         {
-            Log::info("[AddonsManager] Marking '%s' as being installed.",
+            Log::info("addons", "Marking '%s' as being installed.",
                    track->getIdent().c_str());
             m_addons_list.getData()[n].setInstalled(true);
             something_was_changed = true;
@@ -361,7 +361,7 @@ void AddonsManager::downloadIcons()
             if(icon=="")
             {
                 if(UserConfigParams::logAddons())
-                    Log::error("[AddonsManager]", "No icon or image specified for '%s'.",
+                    Log::error("addons", "No icon or image specified for '%s'.",
                                 addon.getId().c_str());
                 continue;
             }
@@ -400,7 +400,7 @@ void AddonsManager::loadInstalledAddons()
     /* checking for installed addons */
     if(UserConfigParams::logAddons())
     {
-        Log::info("[AddonsManager]", "Loading an xml file for installed addons: %s",
+        Log::info("addons", "Loading an xml file for installed addons: %s.",
                     m_file_installed.c_str());
     }
     const XMLNode *xml = file_manager->createXMLTree(m_file_installed);
@@ -478,15 +478,15 @@ bool AddonsManager::install(const Addon &addon)
     if (!success)
     {
         // TODO: show a message in the interface
-        Log::error("[AddonsManager]", "Failed to unzip '%s' to '%s'",
+        Log::error("addons", "Failed to unzip '%s' to '%s'.",
                     from.c_str(), to.c_str());
-        Log::error("[AddonsManager]", "Zip file will not be removed.");
+        Log::error("addons", "Zip file will not be removed.");
         return false;
     }
 
     if(!file_manager->removeFile(from))
     {
-        Log::error("[AddonsManager]", "Problems removing temporary file '%s'",
+        Log::error("addons", "Problems removing temporary file '%s'.",
                     from.c_str());
     }
 
@@ -520,7 +520,7 @@ bool AddonsManager::install(const Addon &addon)
         }
         catch (std::exception& e)
         {
-            Log::error("[AddonsManager]", "ERROR: Cannot load track <%s> : %s",
+            Log::error("addons", "Cannot load track '%s' : %s.",
                         addon.getDataDir().c_str(), e.what());
         }
     }
@@ -535,8 +535,8 @@ bool AddonsManager::install(const Addon &addon)
  */
 bool AddonsManager::uninstall(const Addon &addon)
 {
-    Log::info("[AddonsManager]", "Uninstalling <%s>",
-                core::stringc(addon.getName()).c_str());
+    Log::info("addons", "Uninstalling '%s'.",
+               core::stringc(addon.getName()).c_str());
 
     // addon is a const reference, and to avoid removing the const, we
     // find the proper index again to modify the installed state

From ad870c37f4c615931b5c21887afe01e59d4f6422 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Fri, 22 Aug 2014 19:46:03 +0200
Subject: [PATCH 090/248] Back to previous resolution when escape was pressed
 in confirm resolution dialog

---
 src/states_screens/dialogs/confirm_resolution_dialog.cpp | 9 +++++++++
 src/states_screens/dialogs/confirm_resolution_dialog.hpp | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/src/states_screens/dialogs/confirm_resolution_dialog.cpp b/src/states_screens/dialogs/confirm_resolution_dialog.cpp
index 36f00240f..c4c1896ab 100644
--- a/src/states_screens/dialogs/confirm_resolution_dialog.cpp
+++ b/src/states_screens/dialogs/confirm_resolution_dialog.cpp
@@ -64,6 +64,15 @@ void ConfirmResolutionDialog::onUpdate(float dt)
 
 }
 
+// ----------------------------------------------------------------------------
+
+bool ConfirmResolutionDialog::onEscapePressed()
+{
+    ModalDialog::dismiss();
+    irr_driver->cancelResChange();
+    return true;
+}   // escapePressed
+
 // ------------------------------------------------------------------------------------------------------
 
 void ConfirmResolutionDialog::updateMessage()
diff --git a/src/states_screens/dialogs/confirm_resolution_dialog.hpp b/src/states_screens/dialogs/confirm_resolution_dialog.hpp
index 5a03bfc72..dc3ad1605 100644
--- a/src/states_screens/dialogs/confirm_resolution_dialog.hpp
+++ b/src/states_screens/dialogs/confirm_resolution_dialog.hpp
@@ -20,6 +20,7 @@
 #define HEADER_CONFIRM_RES_DIALOG_HPP
 
 #include "guiengine/modaldialog.hpp"
+#include "utils/cpp2011.hpp"
 
 /**
  * \brief Dialog shown after a resolution switch sot he user may confirm if
@@ -28,6 +29,7 @@
  */
 class ConfirmResolutionDialog : public GUIEngine::ModalDialog
 {
+private:
     /** number of seconds left before resolution is considered unplayable */
     float m_remaining_time;
         
@@ -40,6 +42,7 @@ public:
     GUIEngine::EventPropagation processEvent(const std::string& eventSource);
     
     virtual void onUpdate(float dt);
+    virtual bool onEscapePressed() OVERRIDE;
 };
   
 

From 8711955bdc9297b677759d2b137763b512216820 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Fri, 22 Aug 2014 19:59:30 +0200
Subject: [PATCH 091/248] Fixed onEscapePressed event in addons loading screen.

It actually was unused previously. I'm also not sure why there was assert(false) ?
---
 src/states_screens/dialogs/addons_loading.cpp | 6 +++---
 src/states_screens/dialogs/addons_loading.hpp | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/states_screens/dialogs/addons_loading.cpp b/src/states_screens/dialogs/addons_loading.cpp
index 1ebf2f3ad..a4959aafe 100644
--- a/src/states_screens/dialogs/addons_loading.cpp
+++ b/src/states_screens/dialogs/addons_loading.cpp
@@ -190,11 +190,12 @@ void AddonsLoading::init()
 }   // init
 
 // ----------------------------------------------------------------------------
-void AddonsLoading::escapePressed()
+bool AddonsLoading::onEscapePressed()
 {
     stopDownload();
     ModalDialog::dismiss();
-}   // escapePressed
+    return true;
+}   // onEscapePressed
 
 // ----------------------------------------------------------------------------
 
@@ -335,7 +336,6 @@ void AddonsLoading::stopDownload()
         // order to avoid a memory leak, we let network_http free
         // the request.
         //m_download_request->setManageMemory(true);
-        assert(false);
         m_download_request->cancel();
     };
 }   // startDownload
diff --git a/src/states_screens/dialogs/addons_loading.hpp b/src/states_screens/dialogs/addons_loading.hpp
index fdb7fd5e3..27f52a431 100644
--- a/src/states_screens/dialogs/addons_loading.hpp
+++ b/src/states_screens/dialogs/addons_loading.hpp
@@ -23,6 +23,7 @@
 #include "addons/addons_manager.hpp"
 #include "guiengine/widgets.hpp"
 #include "guiengine/modaldialog.hpp"
+#include "utils/cpp2011.hpp"
 #include "utils/synchronised.hpp"
 
 namespace Online { class HTTPRequest; }
@@ -32,7 +33,6 @@ namespace Online { class HTTPRequest; }
   */
 class AddonsLoading : public GUIEngine::ModalDialog
 {
-  virtual void escapePressed();
 private:
     GUIEngine::LabelWidget       *m_state;
     GUIEngine::ProgressBarWidget *m_progress;
@@ -70,6 +70,7 @@ public:
      * */
     void onUpdate(float delta);
     void voteClicked();
+    virtual bool onEscapePressed() OVERRIDE;
     
 };   // AddonsLoading
 

From 90ecf50414db72ae052ff6db62ec2dc08f3b06dd Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Fri, 22 Aug 2014 20:40:22 +0200
Subject: [PATCH 092/248] Show console on windows only in debug mode

---
 src/main.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 5f883661e..924590261 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1155,8 +1155,12 @@ void askForInternetPermission()
 
 //=============================================================================
 
-#if defined(DEBUG) && defined(WIN32) && !defined(__CYGWIN__)
-#pragma comment(linker, "/SUBSYSTEM:console")
+#if defined(WIN32) && defined(_MSC_VER)
+    #ifdef DEBUG
+        #pragma comment(linker, "/SUBSYSTEM:console")
+    #else
+        #pragma comment(linker, "/SUBSYSTEM:windows /ENTRY:mainCRTStartup")
+    #endif
 #endif
 
 // ----------------------------------------------------------------------------

From bc24c4558feaacae076e179760c397bce2aea418 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Mon, 18 Aug 2014 10:00:04 +0200
Subject: [PATCH 093/248] Register some api functions

---
 src/graphics/gl_headers.hpp | 11 +++++++++++
 src/graphics/glwrap.cpp     | 22 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp
index 8d53259c5..a7737c2c0 100644
--- a/src/graphics/gl_headers.hpp
+++ b/src/graphics/gl_headers.hpp
@@ -72,6 +72,8 @@ extern PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
 extern PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
 extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
 extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
+extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC glDrawElementsInstancedBaseVertexBaseInstance;
+extern PFNGLMULTIDRAWELEMENTSINDIRECTPROC glMultiDrawElementsIndirect;
 extern PFNGLDELETEBUFFERSPROC glDeleteBuffers;
 extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
 extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
@@ -80,6 +82,9 @@ extern PFNGLTEXBUFFERPROC glTexBuffer;
 extern PFNGLBUFFERSUBDATAPROC glBufferSubData;
 extern PFNGLMAPBUFFERPROC glMapBuffer;
 extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
+extern PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;
+extern PFNGLMEMORYBARRIERPROC glMemoryBarrier;
+extern PFNGLBUFFERSTORAGEPROC glBufferStorage;
 extern PFNGLUNMAPBUFFERPROC glUnmapBuffer;
 extern PFNGLFENCESYNCPROC glFenceSync;
 extern PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
@@ -109,6 +114,12 @@ extern PFNGLDELETESAMPLERSPROC glDeleteSamplers;
 extern PFNGLBINDSAMPLERPROC glBindSampler;
 extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
 extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
+extern PFNGLGETTEXTURESAMPLERHANDLEARBPROC glGetTextureSamplerHandleARB;
+extern PFNGLMAKETEXTUREHANDLERESIDENTARBPROC glMakeTextureHandleResidentARB;
+extern PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC glMakeTextureHandleNonResidentARB;
+extern PFNGLUNIFORMHANDLEUI64ARBPROC glUniformHandleui64ARB;
+extern PFNGLISTEXTUREHANDLERESIDENTARBPROC glIsTextureHandleResidentARB;
+extern PFNGLVERTEXATTRIBLPOINTERPROC glVertexAttribLPointer;
 #ifdef DEBUG
 extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
 #endif
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 02db147a2..1cc4aa2a3 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -52,6 +52,8 @@ PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
 PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
 PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
 PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
+PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC glDrawElementsInstancedBaseVertexBaseInstance;
+PFNGLMULTIDRAWELEMENTSINDIRECTPROC glMultiDrawElementsIndirect;
 PFNGLDELETEBUFFERSPROC glDeleteBuffers;
 PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
 PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
@@ -60,6 +62,9 @@ PFNGLTEXBUFFERPROC glTexBuffer;
 PFNGLBUFFERSUBDATAPROC glBufferSubData;
 PFNGLMAPBUFFERPROC glMapBuffer;
 PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
+PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;
+PFNGLMEMORYBARRIERPROC glMemoryBarrier;
+PFNGLBUFFERSTORAGEPROC glBufferStorage;
 PFNGLUNMAPBUFFERPROC glUnmapBuffer;
 PFNGLFENCESYNCPROC glFenceSync;
 PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
@@ -91,6 +96,12 @@ PFNGLBINDSAMPLERPROC glBindSampler;
 PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
 PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
 PFNGLGETSTRINGIPROC glGetStringi;
+PFNGLGETTEXTURESAMPLERHANDLEARBPROC glGetTextureSamplerHandleARB;
+PFNGLMAKETEXTUREHANDLERESIDENTARBPROC glMakeTextureHandleResidentARB;
+PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC glMakeTextureHandleNonResidentARB;
+PFNGLUNIFORMHANDLEUI64ARBPROC glUniformHandleui64ARB;
+PFNGLISTEXTUREHANDLERESIDENTARBPROC glIsTextureHandleResidentARB;
+PFNGLVERTEXATTRIBLPOINTERPROC glVertexAttribLPointer;
 #endif
 
 static bool is_gl_init = false;
@@ -192,6 +203,9 @@ void initGL()
     glBufferData = (PFNGLBUFFERDATAPROC)IRR_OGL_LOAD_EXTENSION("glBufferData");
     glMapBuffer = (PFNGLMAPBUFFERPROC)IRR_OGL_LOAD_EXTENSION("glMapBuffer");
     glMapBufferRange = (PFNGLMAPBUFFERRANGEPROC)IRR_OGL_LOAD_EXTENSION("glMapBufferRange");
+    glFlushMappedBufferRange = (PFNGLFLUSHMAPPEDBUFFERRANGEPROC)IRR_OGL_LOAD_EXTENSION("glFlushMappedBufferRange");
+    glMemoryBarrier = (PFNGLMEMORYBARRIERPROC)IRR_OGL_LOAD_EXTENSION("glMemoryBarrier");
+    glBufferStorage = (PFNGLBUFFERSTORAGEPROC)IRR_OGL_LOAD_EXTENSION("glBufferStorage");
     glUnmapBuffer = (PFNGLUNMAPBUFFERPROC)IRR_OGL_LOAD_EXTENSION("glUnmapBuffer");
     glFenceSync = (PFNGLFENCESYNCPROC)IRR_OGL_LOAD_EXTENSION("glFenceSync");
     glClientWaitSync = (PFNGLCLIENTWAITSYNCPROC)IRR_OGL_LOAD_EXTENSION("glClientWaitSync");
@@ -229,6 +243,8 @@ void initGL()
     glDrawElementsBaseVertex = (PFNGLDRAWELEMENTSBASEVERTEXPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsBaseVertex");
     glDrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsInstanced");
     glDrawElementsInstancedBaseVertex = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsInstancedBaseVertex");
+    glDrawElementsInstancedBaseVertexBaseInstance = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsInstancedBaseVertexBaseInstance");
+    glMultiDrawElementsIndirect = (PFNGLMULTIDRAWELEMENTSINDIRECTPROC)IRR_OGL_LOAD_EXTENSION("glMultiDrawElementsIndirect");
     glDeleteBuffers = (PFNGLDELETEBUFFERSPROC)IRR_OGL_LOAD_EXTENSION("glDeleteBuffers");
     glGenVertexArrays = (PFNGLGENVERTEXARRAYSPROC)IRR_OGL_LOAD_EXTENSION("glGenVertexArrays");
     glBindVertexArray = (PFNGLBINDVERTEXARRAYPROC)IRR_OGL_LOAD_EXTENSION("glBindVertexArray");
@@ -264,6 +280,12 @@ void initGL()
     glSamplerParameterf = (PFNGLSAMPLERPARAMETERFPROC)IRR_OGL_LOAD_EXTENSION("glSamplerParameterf");
     glSamplerParameteri = (PFNGLSAMPLERPARAMETERIPROC)IRR_OGL_LOAD_EXTENSION("glSamplerParameteri");
     glGetStringi = (PFNGLGETSTRINGIPROC)IRR_OGL_LOAD_EXTENSION("glGetstringi");
+    glGetTextureSamplerHandleARB = (PFNGLGETTEXTURESAMPLERHANDLEARBPROC)IRR_OGL_LOAD_EXTENSION("glGetTextureSamplerHandleARB");
+    glMakeTextureHandleResidentARB = (PFNGLMAKETEXTUREHANDLERESIDENTARBPROC)IRR_OGL_LOAD_EXTENSION("glMakeTextureHandleResidentARB");
+    glMakeTextureHandleNonResidentARB = (PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC)IRR_OGL_LOAD_EXTENSION("glMakeTextureHandleNonResidentARB");
+    glUniformHandleui64ARB = (PFNGLUNIFORMHANDLEUI64ARBPROC)IRR_OGL_LOAD_EXTENSION("glUniformHandleui64ARB");
+    glIsTextureHandleResidentARB = (PFNGLISTEXTUREHANDLERESIDENTARBPROC)IRR_OGL_LOAD_EXTENSION("glIsTextureHandleResidentARB");
+    glVertexAttribLPointer = (PFNGLVERTEXATTRIBLPOINTERPROC)IRR_OGL_LOAD_EXTENSION("glVertexAttribLPointer");
 #ifdef DEBUG
     glDebugMessageCallbackARB = (PFNGLDEBUGMESSAGECALLBACKARBPROC)IRR_OGL_LOAD_EXTENSION("glDebugMessageCallbackARB");
 #endif

From 6ac3d6947123f408b5ca1ad10fa274b822c39280 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Mon, 18 Aug 2014 17:49:44 +0200
Subject: [PATCH 094/248] Play with bindless textures

---
 data/shaders/detailledobject_pass2.frag |   8 +
 data/shaders/grass_pass2.frag           |  11 +-
 data/shaders/header.txt                 |   2 +-
 data/shaders/normalmap.frag             |   5 +
 data/shaders/object_pass1.frag          |   4 +
 data/shaders/object_pass2.frag          |   8 +
 data/shaders/object_unlit.frag          |   7 +
 data/shaders/objectpass_spheremap.frag  |   7 +
 data/shaders/objectref_pass1.frag       |   4 +
 data/shaders/objectref_pass2.frag       |   7 +
 data/shaders/splatting.frag             |  14 ++
 data/shaders/transparent.frag           |   7 +
 data/shaders/transparentfog.frag        |   8 +
 data/shaders/utils/getLightFactor.frag  |   6 +
 src/config/user_config.hpp              |   3 +
 src/graphics/gl_headers.hpp             |   5 +
 src/graphics/glwrap.cpp                 |   7 +
 src/graphics/render_geometry.cpp        | 229 +++++++++++++++++-------
 src/graphics/shaders.cpp                |  63 ++-----
 src/graphics/shaders.hpp                |  34 ++--
 src/graphics/stkmesh.hpp                |   1 +
 src/graphics/stkmeshscenenode.cpp       |  26 ++-
 22 files changed, 337 insertions(+), 129 deletions(-)

diff --git a/data/shaders/detailledobject_pass2.frag b/data/shaders/detailledobject_pass2.frag
index 6d9a94c04..18372dfab 100644
--- a/data/shaders/detailledobject_pass2.frag
+++ b/data/shaders/detailledobject_pass2.frag
@@ -1,5 +1,10 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D Albedo;
+layout(bindless_sampler) uniform sampler2D Detail;
+#else
 uniform sampler2D Albedo;
 uniform sampler2D Detail;
+#endif
 
 #if __VERSION__ >= 130
 in vec2 uv;
@@ -16,6 +21,9 @@ vec3 getLightFactor(float specMapValue);
 void main(void)
 {
     vec4 color = texture(Albedo, uv);
+#ifdef GL_ARB_bindless_texture
+    color.xyz = pow(color.xyz, vec3(2.2));
+#endif
     vec4 detail = texture(Detail, uv_bis);
     color *= detail;
     vec3 LightFactor = getLightFactor(1. - color.a);
diff --git a/data/shaders/grass_pass2.frag b/data/shaders/grass_pass2.frag
index 663232a72..b8e5e256c 100644
--- a/data/shaders/grass_pass2.frag
+++ b/data/shaders/grass_pass2.frag
@@ -1,6 +1,12 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D Albedo;
+layout(bindless_sampler) uniform sampler2D dtex;
+#else
 uniform sampler2D Albedo;
-uniform vec3 SunDir;
 uniform sampler2D dtex;
+#endif
+
+uniform vec3 SunDir;
 
 in vec3 nor;
 in vec2 uv;
@@ -26,6 +32,9 @@ void main(void)
     float scattering = mix(fPowEdotL, fLdotNBack, .5);
 
     vec4 color = texture(Albedo, uv);
+#ifdef GL_ARB_bindless_texture
+    color.xyz = pow(color.xyz, vec3(2.2));
+#endif
     if (color.a < 0.5) discard;
     vec3 LightFactor = (scattering * 0.3) + getLightFactor(1.);
     FragColor = vec4(color.xyz * LightFactor, 1.);
diff --git a/data/shaders/header.txt b/data/shaders/header.txt
index 74a2cb81b..ec5c45115 100644
--- a/data/shaders/header.txt
+++ b/data/shaders/header.txt
@@ -14,4 +14,4 @@ layout (std140) uniform MatrixesData
     mat4 ShadowViewProjMatrixes[4];
     vec2 screen;
 };
-#endif
+#endif
\ No newline at end of file
diff --git a/data/shaders/normalmap.frag b/data/shaders/normalmap.frag
index 255942efd..e7ba8efe4 100644
--- a/data/shaders/normalmap.frag
+++ b/data/shaders/normalmap.frag
@@ -1,5 +1,10 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D normalMap;
+layout(bindless_sampler) uniform sampler2D DiffuseForAlpha;
+#else
 uniform sampler2D normalMap;
 uniform sampler2D DiffuseForAlpha;
+#endif
 
 in vec3 tangent;
 in vec3 bitangent;
diff --git a/data/shaders/object_pass1.frag b/data/shaders/object_pass1.frag
index e8e0df6ba..cd193b5ec 100644
--- a/data/shaders/object_pass1.frag
+++ b/data/shaders/object_pass1.frag
@@ -1,4 +1,8 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D tex;
+#else
 uniform sampler2D tex;
+#endif
 
 #if __VERSION__ >= 130
 in vec3 nor;
diff --git a/data/shaders/object_pass2.frag b/data/shaders/object_pass2.frag
index d45ca01fb..f1b2200ad 100644
--- a/data/shaders/object_pass2.frag
+++ b/data/shaders/object_pass2.frag
@@ -1,4 +1,8 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D Albedo;
+#else
 uniform sampler2D Albedo;
+#endif
 
 in vec2 uv;
 in vec4 color;
@@ -8,7 +12,11 @@ vec3 getLightFactor(float specMapValue);
 
 void main(void)
 {
+#ifdef GL_ARB_bindless_texture
+    vec4 col = pow(texture(Albedo, uv), vec4(2.2));
+#else
     vec4 col = texture(Albedo, uv);
+#endif
     col.xyz *= pow(color.xyz, vec3(2.2));
     vec3 LightFactor = getLightFactor(1.);
     FragColor = vec4(col.xyz * LightFactor, 1.);
diff --git a/data/shaders/object_unlit.frag b/data/shaders/object_unlit.frag
index bf5c5f3c9..f13fc0812 100644
--- a/data/shaders/object_unlit.frag
+++ b/data/shaders/object_unlit.frag
@@ -1,4 +1,8 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D tex;
+#else
 uniform sampler2D tex;
+#endif
 
 in vec2 uv;
 in vec4 color;
@@ -7,6 +11,9 @@ out vec4 FragColor;
 void main(void)
 {
     vec4 col = texture(tex, uv);
+#ifdef GL_ARB_bindless_texture
+    col.xyz = pow(col.xyz, vec3(2.2));
+#endif
     col.xyz *= pow(color.xyz, vec3(2.2));
     if (col.a < 0.5) discard;
     FragColor = vec4(col.xyz, 1.);
diff --git a/data/shaders/objectpass_spheremap.frag b/data/shaders/objectpass_spheremap.frag
index 138936d23..025151184 100644
--- a/data/shaders/objectpass_spheremap.frag
+++ b/data/shaders/objectpass_spheremap.frag
@@ -1,6 +1,10 @@
 // See http://www.ozone3d.net/tutorials/glsl_texturing_p04.php for ref
 
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D tex;
+#else
 uniform sampler2D tex;
+#endif
 
 #if __VERSION__ >= 130
 in vec3 nor;
@@ -21,6 +25,9 @@ void main() {
     float m = 2.0 * sqrt(r.x * r.x + r.y * r.y + (r.z + 1.0) * (r.z + 1.0));
     r.y = - r.y;
     vec4 detail0 = texture(tex, r.xy / m + .5);
+#ifdef GL_ARB_bindless_texture
+    detail0.xyz = pow(detail0.xyz, vec3(2.2));
+#endif
     vec3 LightFactor = getLightFactor(1.);
 
     FragColor = vec4(detail0.xyz * LightFactor, 1.);
diff --git a/data/shaders/objectref_pass1.frag b/data/shaders/objectref_pass1.frag
index f4cf55e29..7738e82b8 100644
--- a/data/shaders/objectref_pass1.frag
+++ b/data/shaders/objectref_pass1.frag
@@ -1,4 +1,8 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D tex;
+#else
 uniform sampler2D tex;
+#endif
 
 #if __VERSION__ >= 130
 in vec3 nor;
diff --git a/data/shaders/objectref_pass2.frag b/data/shaders/objectref_pass2.frag
index c20b7e82e..7ee2d3de0 100644
--- a/data/shaders/objectref_pass2.frag
+++ b/data/shaders/objectref_pass2.frag
@@ -1,4 +1,8 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D Albedo;
+#else
 uniform sampler2D Albedo;
+#endif
 
 in vec2 uv;
 in vec4 color;
@@ -9,6 +13,9 @@ vec3 getLightFactor(float specMapValue);
 void main(void)
 {
     vec4 col = texture(Albedo, uv);
+#ifdef GL_ARB_bindless_texture
+    col.xyz = pow(col.xyz, vec3(2.2));
+#endif
     col.xyz *= pow(color.xyz, vec3(2.2));
     if (col.a * color.a < 0.5) discard;
     vec3 LightFactor = getLightFactor(1.);
diff --git a/data/shaders/splatting.frag b/data/shaders/splatting.frag
index d8bdc0555..ccb957cd7 100644
--- a/data/shaders/splatting.frag
+++ b/data/shaders/splatting.frag
@@ -1,8 +1,16 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D tex_layout;
+layout(bindless_sampler) uniform sampler2D tex_detail0;
+layout(bindless_sampler) uniform sampler2D tex_detail1;
+layout(bindless_sampler) uniform sampler2D tex_detail2;
+layout(bindless_sampler) uniform sampler2D tex_detail3;
+#else
 uniform sampler2D tex_layout;
 uniform sampler2D tex_detail0;
 uniform sampler2D tex_detail1;
 uniform sampler2D tex_detail2;
 uniform sampler2D tex_detail3;
+#endif
 
 #if __VERSION__ >= 130
 in vec2 uv;
@@ -24,6 +32,12 @@ void main() {
     vec4 detail2 = texture(tex_detail2, uv);
     vec4 detail3 = texture(tex_detail3, uv);
     vec4 detail4 = vec4(0.0);
+#ifdef GL_ARB_bindless_texture
+    detail0.xyz = pow(detail0.xyz, vec3(2.2));
+    detail1.xyz = pow(detail1.xyz, vec3(2.2));
+    detail2.xyz = pow(detail2.xyz, vec3(2.2));
+    detail3.xyz = pow(detail3.xyz, vec3(2.2));
+#endif
 
     vec4 splatted = splatting.r * detail0 +
         splatting.g * detail1 +
diff --git a/data/shaders/transparent.frag b/data/shaders/transparent.frag
index aaeba0601..5c84fee03 100644
--- a/data/shaders/transparent.frag
+++ b/data/shaders/transparent.frag
@@ -1,4 +1,8 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D tex;
+#else
 uniform sampler2D tex;
+#endif
 
 in vec2 uv;
 in vec4 color;
@@ -8,6 +12,9 @@ out vec4 FragColor;
 void main()
 {
     vec4 Color = texture(tex, uv);
+#ifdef GL_ARB_bindless_texture
+    Color.xyz = pow(Color.xyz, vec3(2.2));
+#endif
     Color.xyz *= pow(color.xyz, vec3(2.2));
     Color.a *= color.a;
     // Premultiply alpha
diff --git a/data/shaders/transparentfog.frag b/data/shaders/transparentfog.frag
index d6f0f3344..b73a06fdf 100644
--- a/data/shaders/transparentfog.frag
+++ b/data/shaders/transparentfog.frag
@@ -1,4 +1,9 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D tex;
+#else
 uniform sampler2D tex;
+#endif
+
 
 uniform float fogmax;
 uniform float startH;
@@ -15,6 +20,9 @@ out vec4 FragColor;
 void main()
 {
     vec4 diffusecolor = texture(tex, uv);
+#ifdef GL_ARB_bindless_texture
+    diffusecolor.xyz = pow(diffusecolor.xyz, vec3(2.2));
+#endif
     diffusecolor.xyz *= pow(color.xyz, vec3(2.2));
     diffusecolor.a *= color.a;
     vec3 tmp = vec3(gl_FragCoord.xy / screen, gl_FragCoord.z);
diff --git a/data/shaders/utils/getLightFactor.frag b/data/shaders/utils/getLightFactor.frag
index ec7fa5725..9bf4cdf58 100644
--- a/data/shaders/utils/getLightFactor.frag
+++ b/data/shaders/utils/getLightFactor.frag
@@ -1,6 +1,12 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D DiffuseMap;
+layout(bindless_sampler) uniform sampler2D SpecularMap;
+layout(bindless_sampler) uniform sampler2D SSAO;
+#else
 uniform sampler2D DiffuseMap;
 uniform sampler2D SpecularMap;
 uniform sampler2D SSAO;
+#endif
 
 vec3 getLightFactor(float specMapValue)
 {
diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index ae91e0b4d..88647b820 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -464,6 +464,9 @@ namespace UserConfigParams
     PARAM_PREFIX BoolUserConfigParam        m_gi
         PARAM_DEFAULT(BoolUserConfigParam(false, "enable_gi",
         &m_video_group, "Enable Global Illumination"));
+    PARAM_PREFIX BoolUserConfigParam        m_bindless_textures
+        PARAM_DEFAULT(BoolUserConfigParam(false, "enable_bindless_textures",
+        &m_video_group, "Enable Bindless Texture (Experimental !)"));
 
     // ---- Debug - not saved to config file
     /** If gamepad debugging is enabled. */
diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp
index a7737c2c0..81789ddf2 100644
--- a/src/graphics/gl_headers.hpp
+++ b/src/graphics/gl_headers.hpp
@@ -125,4 +125,9 @@ extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
 #endif
 #endif
 
+
+#ifdef WIN32
+#define Bindless_Texture_Support
+#endif
+
 #endif
\ No newline at end of file
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 1cc4aa2a3..c8b44bd5c 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -319,6 +319,13 @@ GLuint LoadShader(const char * file, unsigned type)
     char versionString[20];
     sprintf(versionString, "#version %d\n", irr_driver->getGLSLVersion());
     std::string Code = versionString;
+    if (UserConfigParams::m_bindless_textures)
+        Code += "#extension GL_ARB_bindless_texture : enable\n";
+    else
+    {
+        Code += "#extension GL_ARB_bindless_texture : disable\n";
+        Code += "#undef GL_ARB_bindless_texture\n";
+    }
     std::ifstream Stream(file, std::ios::in);
     Code += "//" + std::string(file) + "\n";
     if (irr_driver->needUBOWorkaround())
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 381338745..ae9d00c1d 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -123,13 +123,25 @@ void renderMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
     for (unsigned i = 0; i < meshes->size(); i++)
     {
         std::vector<GLuint> Textures;
+        std::vector<uint64_t> Handles;
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
         for (unsigned j = 0; j < TexUnits.size(); j++)
         {
-            if (!mesh.textures[j])
+            if (!mesh.textures[TexUnits[j].m_id])
                 mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-            compressTexture(mesh.textures[j], TexUnits[j].m_premul_alpha);
-            Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
+            compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
+            if (UserConfigParams::m_bindless_textures)
+            {
+#ifdef Bindless_Texture_Support
+                if (!mesh.TextureHandles[TexUnits[j].m_id])
+                    mesh.TextureHandles[TexUnits[j].m_id] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[TexUnits[j].m_id]), Shader::getInstance()->SamplersId[j]);
+                if (!glIsTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]))
+                    glMakeTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]);
+#endif
+                Handles.push_back(mesh.TextureHandles[TexUnits[j].m_id]);
+            }
+            else
+                Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
         }
         if (mesh.VAOType != VertexType)
         {
@@ -138,7 +150,11 @@ void renderMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
 #endif
             continue;
         }
-        Shader::getInstance()->SetTextureUnits(Textures);
+
+        if (UserConfigParams::m_bindless_textures)
+            Shader::getInstance()->SetTextureHandles(Handles);
+        else
+            Shader::getInstance()->SetTextureUnits(Textures);
         custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
 }
@@ -180,6 +196,7 @@ void renderInstancedMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vec
     glUseProgram(Shader::getInstance()->Program);
     for (unsigned i = 0; i < meshes->size(); i++)
     {
+        std::vector<uint64_t> Handles;
         std::vector<GLuint> Textures;
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
 #ifdef DEBUG
@@ -192,9 +209,23 @@ void renderInstancedMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vec
             if (!mesh.textures[TexUnits[j].m_id])
                 mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
             compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
-            Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
+            if (UserConfigParams::m_bindless_textures)
+            {
+#ifdef Bindless_Texture_Support
+                if (!mesh.TextureHandles[TexUnits[j].m_id])
+                    mesh.TextureHandles[TexUnits[j].m_id] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[TexUnits[j].m_id]), Shader::getInstance()->SamplersId[j]);
+                if (!glIsTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]))
+                    glMakeTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]);
+#endif
+                Handles.push_back(mesh.TextureHandles[TexUnits[j].m_id]);
+            }
+            else
+                Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
         }
-        Shader::getInstance()->SetTextureUnits(Textures);
+        if (UserConfigParams::m_bindless_textures)
+            Shader::getInstance()->SetTextureHandles(Handles);
+        else
+            Shader::getInstance()->SetTextureUnits(Textures);
         instanced_custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
 }
@@ -291,21 +322,34 @@ void IrrDriver::renderSolidFirstPass()
 }
 
 template<typename Shader, enum E_VERTEX_TYPE VertexType, int...List, typename... TupleType>
-void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes)
+void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes, const std::vector<uint64_t> &Prefilled_Handle,
+    const std::vector<GLuint> &Prefilled_Tex)
 {
     glUseProgram(Shader::getInstance()->Program);
     glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
     for (unsigned i = 0; i < meshes->size(); i++)
     {
-        std::vector<GLuint> Textures;
+        std::vector<uint64_t> Handles(Prefilled_Handle);
+        std::vector<GLuint> Textures(Prefilled_Tex);
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
         for (unsigned j = 0; j < TexUnits.size(); j++)
         {
             if (!mesh.textures[TexUnits[j].m_id])
                 mesh.textures[TexUnits[j].m_id] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
             compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
-            Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
-            if (irr_driver->getLightViz())
+            if (UserConfigParams::m_bindless_textures)
+            {
+#ifdef Bindless_Texture_Support
+                if (!mesh.TextureHandles[TexUnits[j].m_id])
+                    mesh.TextureHandles[TexUnits[j].m_id] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[TexUnits[j].m_id]), Shader::getInstance()->SamplersId[Handles.size()]);
+                if (!glIsTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]))
+                    glMakeTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]);
+                Handles.push_back(mesh.TextureHandles[TexUnits[j].m_id]);
+#endif
+            }
+            else
+                Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
+/*            if (irr_driver->getLightViz())
             {
                 GLint swizzleMask[] = { GL_ONE, GL_ONE, GL_ONE, GL_ALPHA };
                 glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
@@ -314,7 +358,7 @@ void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
             {
                 GLint swizzleMask[] = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA };
                 glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
-            }
+            }*/
         }
 
         if (mesh.VAOType != VertexType)
@@ -324,27 +368,44 @@ void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
 #endif
             continue;
         }
-        Shader::getInstance()->SetTextureUnits(Textures);
+
+        if (UserConfigParams::m_bindless_textures)
+            Shader::getInstance()->SetTextureHandles(Handles);
+        else
+            Shader::getInstance()->SetTextureUnits(Textures);
         custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
 }
 
 template<typename Shader, int...List, typename... TupleType>
-void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes)
+void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes, const std::vector<uint64_t> &Prefilled_Handles,
+    const std::vector<GLuint> &Prefilled_tex)
 {
     glUseProgram(Shader::getInstance()->Program);
     for (unsigned i = 0; i < meshes->size(); i++)
     {
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
         glBindVertexArray(mesh.vao);
-        std::vector<GLuint> Textures;
+
+        std::vector<GLuint> Textures(Prefilled_tex);
+        std::vector<uint64_t> Handles(Prefilled_Handles);
+
         for (unsigned j = 0; j < TexUnits.size(); j++)
         {
             if (!mesh.textures[TexUnits[j].m_id])
                 mesh.textures[TexUnits[j].m_id] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
             compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
-            Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
-            if (irr_driver->getLightViz())
+#ifdef Bindless_Texture_Support
+            if (!mesh.TextureHandles[TexUnits[j].m_id])
+                mesh.TextureHandles[TexUnits[j].m_id] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[TexUnits[j].m_id]), Shader::getInstance()->SamplersId[Handles.size()]);
+            if (!glIsTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]))
+                glMakeTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]);
+#endif
+            if (UserConfigParams::m_bindless_textures)
+                Handles.push_back(mesh.TextureHandles[TexUnits[j].m_id]);
+            else
+                Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
+/*            if (irr_driver->getLightViz())
             {
                 GLint swizzleMask[] = { GL_ONE, GL_ONE, GL_ONE, GL_ALPHA };
                 glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
@@ -353,9 +414,14 @@ void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vec
             {
                 GLint swizzleMask[] = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA };
                 glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
-            }
+            }*/
         }
-        Shader::getInstance()->SetTextureUnits(Textures);
+
+        if (UserConfigParams::m_bindless_textures)
+            Shader::getInstance()->SetTextureHandles(Handles);
+        else
+            Shader::getInstance()->SetTextureUnits(Textures);
+
         instanced_custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
 }
@@ -382,64 +448,74 @@ void IrrDriver::renderSolidSecondPass()
     glEnable(GL_DEPTH_TEST);
     glDisable(GL_ALPHA_TEST);
     glDisable(GL_BLEND);
-#ifdef GL_VERSION_3_3
-    if (irr_driver->getGLSLVersion() >= 330)
-        glBindSampler(0, 0);
+
+    uint64_t DiffuseHandle = 0, SpecularHandle = 0, SSAOHandle = 0, DepthHandle = 0;
+
+    if (UserConfigParams::m_bindless_textures)
+    {
+#ifdef Bindless_Texture_Support
+        DiffuseHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_DIFFUSE), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[0]);
+        if (!glIsTextureHandleResidentARB(DiffuseHandle))
+            glMakeTextureHandleResidentARB(DiffuseHandle);
+
+        SpecularHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_SPECULAR), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[1]);
+        if (!glIsTextureHandleResidentARB(SpecularHandle))
+            glMakeTextureHandleResidentARB(SpecularHandle);
+
+        SSAOHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_HALF1_R), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[2]);
+        if (!glIsTextureHandleResidentARB(SSAOHandle))
+            glMakeTextureHandleResidentARB(SSAOHandle);
+
+        DepthHandle = glGetTextureSamplerHandleARB(getDepthStencilTexture(), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[3]);
+        if (!glIsTextureHandleResidentARB(DepthHandle))
+            glMakeTextureHandleResidentARB(DepthHandle);
 #endif
-    setTexture(0, m_rtts->getRenderTarget(RTT_DIFFUSE), GL_NEAREST, GL_NEAREST);
-#ifdef GL_VERSION_3_3
-    if (irr_driver->getGLSLVersion() >= 330)
-        glBindSampler(1, 0);
-#endif
-    setTexture(1, m_rtts->getRenderTarget(RTT_SPECULAR), GL_NEAREST, GL_NEAREST);
-#ifdef GL_VERSION_3_3
-    if (irr_driver->getGLSLVersion() >= 330)
-        glBindSampler(2, 0);
-#endif
-    setTexture(2, m_rtts->getRenderTarget(RTT_HALF1_R), GL_LINEAR, GL_LINEAR);
+    }
 
     {
         ScopedGPUTimer Timer(getGPUTimer(Q_SOLID_PASS2));
 
         m_scene_manager->drawAll(scene::ESNRP_SOLID);
 
+        std::vector<GLuint> DiffSpecSSAOTex = createVector<GLuint>(m_rtts->getRenderTarget(RTT_DIFFUSE), m_rtts->getRenderTarget(RTT_SPECULAR), m_rtts->getRenderTarget(RTT_HALF1_R));
+
         renderMeshes2ndPass<MeshShader::ObjectPass2Shader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(0, true)
-        ), ListMatDefault::getInstance());
+        ), ListMatDefault::getInstance(),
+        createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
         renderMeshes2ndPass<MeshShader::ObjectPass2Shader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(0, true)
-            ), AnimatedListMatDefault::getInstance());
+            ), AnimatedListMatDefault::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
 
         renderMeshes2ndPass<MeshShader::ObjectRefPass2Shader, video::EVT_STANDARD, 3, 1 >(TexUnits(
             TexUnit(0, true)
-        ), ListMatAlphaRef::getInstance());
+            ), ListMatAlphaRef::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
         renderMeshes2ndPass<MeshShader::ObjectRefPass2Shader, video::EVT_STANDARD, 3, 1 >(TexUnits(
             TexUnit(0, true)
-            ), AnimatedListMatAlphaRef::getInstance());
+            ), AnimatedListMatAlphaRef::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
 
         renderMeshes2ndPass<MeshShader::SphereMapShader, video::EVT_STANDARD, 2, 1>(TexUnits(
             TexUnit(0, true)
-        ), ListMatSphereMap::getInstance());
+            ), ListMatSphereMap::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
 
         renderMeshes2ndPass<MeshShader::DetailledObjectPass2Shader, video::EVT_2TCOORDS, 1>(TexUnits(
             TexUnit(0, true),
             TexUnit(1, true)
-        ), ListMatDetails::getInstance());
+            ), ListMatDetails::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
         renderMeshes2ndPass<MeshShader::DetailledObjectPass2Shader, video::EVT_2TCOORDS, 1>(TexUnits(
             TexUnit(0, true),
             TexUnit(1, true)
-            ), AnimatedListMatDetails::getInstance());
-
+            ), AnimatedListMatDetails::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
         renderMeshes2ndPass<MeshShader::GrassPass2Shader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(0, true)
-        ), ListMatGrass::getInstance());
+            ), ListMatGrass::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
 
         renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(0, true)
-        ), ListMatUnlit::getInstance());
+            ), ListMatUnlit::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
         renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(0, true)
-            ), AnimatedListMatUnlit::getInstance());
+            ), AnimatedListMatUnlit::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
 
         renderMeshes2ndPass<MeshShader::SplattingShader, video::EVT_2TCOORDS, 1>(TexUnits(
             TexUnit(1, false),
@@ -447,26 +523,25 @@ void IrrDriver::renderSolidSecondPass()
             TexUnit(3, true),
             TexUnit(4, true),
             TexUnit(5, true)
-        ), ListMatSplatting::getInstance());
+            ), ListMatSplatting::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
 
         renderMeshes2ndPass<MeshShader::ObjectPass2Shader, video::EVT_TANGENTS, 3, 1>(TexUnits(
             TexUnit(0, true)
-        ), ListMatNormalMap::getInstance());
-
+            ), ListMatNormalMap::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
 
         renderInstancedMeshes2ndPass<MeshShader::InstancedObjectPass2Shader>(
             TexUnits(TexUnit(0, true)),
-            ListInstancedMatDefault::getInstance());
+            ListInstancedMatDefault::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
         renderInstancedMeshes2ndPass<MeshShader::InstancedObjectPass2Shader>(
             TexUnits(TexUnit(0, true)),
-            ListInstancedMatNormalMap::getInstance());
+            ListInstancedMatNormalMap::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
         renderInstancedMeshes2ndPass<MeshShader::InstancedObjectRefPass2Shader>(
             TexUnits(TexUnit(0, true)),
-            ListInstancedMatAlphaRef::getInstance());
-        setTexture(4, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
+            ListInstancedMatAlphaRef::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
+        DiffSpecSSAOTex.push_back(irr_driver->getDepthStencilTexture());
         renderInstancedMeshes2ndPass<MeshShader::InstancedGrassPass2Shader, 3, 2>(
             TexUnits(TexUnit(0, true)),
-            ListInstancedMatGrass::getInstance());
+            ListInstancedMatGrass::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, DepthHandle), DiffSpecSSAOTex);
     }
     m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
 }
@@ -504,8 +579,6 @@ void IrrDriver::renderNormalsVisualisation()
 
 }
 
-
-
 static video::ITexture *displaceTex = 0;
 
 void IrrDriver::renderTransparent()
@@ -531,22 +604,22 @@ void IrrDriver::renderTransparent()
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
         renderMeshes2ndPass<MeshShader::TransparentFogShader, video::EVT_STANDARD, 8, 7, 6, 5, 4, 3, 2, 1>(TexUnits(
             TexUnit(0, true)
-        ), ListBlendTransparentFog::getInstance());
+            ), ListBlendTransparentFog::getInstance(), createVector<uint64_t>(), createVector<GLuint>());
         glBlendFunc(GL_ONE, GL_ONE);
         renderMeshes2ndPass<MeshShader::TransparentFogShader, video::EVT_STANDARD, 8, 7, 6, 5, 4, 3, 2, 1>(TexUnits(
             TexUnit(0, true)
-        ), ListAdditiveTransparentFog::getInstance());
+            ), ListAdditiveTransparentFog::getInstance(), createVector<uint64_t>(), createVector<GLuint>());
     }
     else
     {
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
         renderMeshes2ndPass<MeshShader::TransparentShader, video::EVT_STANDARD, 2, 1>(TexUnits(
             TexUnit(0, true)
-        ), ListBlendTransparent::getInstance());
+            ), ListBlendTransparent::getInstance(), createVector<uint64_t>(), createVector<GLuint>());
         glBlendFunc(GL_ONE, GL_ONE);
         renderMeshes2ndPass<MeshShader::TransparentShader, video::EVT_STANDARD, 2, 1>(TexUnits(
             TexUnit(0, true)
-        ), ListAdditiveTransparent::getInstance());
+            ), ListAdditiveTransparent::getInstance(), createVector<uint64_t>(), createVector<GLuint>());
     }
 
     if (!UserConfigParams::m_dynamic_lights)
@@ -671,14 +744,29 @@ void renderShadow(const std::vector<GLuint> TextureUnits, const std::vector<STK:
     glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
     for (unsigned i = 0; i < t->size(); i++)
     {
+        std::vector<uint64_t> Handles;
         std::vector<GLuint> Textures;
-        const GLMesh *mesh = STK::tuple_get<0>(t->at(i));
+        GLMesh *mesh = STK::tuple_get<0>(t->at(i));
         for (unsigned j = 0; j < TextureUnits.size(); j++)
         {
             compressTexture(mesh->textures[TextureUnits[j]], true);
-            Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
+            if (UserConfigParams::m_bindless_textures)
+            {
+#ifdef Bindless_Texture_Support
+                if (!mesh->TextureHandles[TextureUnits[j]])
+                    mesh->TextureHandles[TextureUnits[j]] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh->textures[TextureUnits[j]]), T::getInstance()->SamplersId[j]);
+                if (!glIsTextureHandleResidentARB(mesh->TextureHandles[TextureUnits[j]]))
+                    glMakeTextureHandleResidentARB(mesh->TextureHandles[TextureUnits[j]]);
+#endif
+                Handles.push_back(mesh->TextureHandles[TextureUnits[j]]);
+            }
+            else
+                Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
         }
-        T::getInstance()->SetTextureUnits(Textures);
+        if (UserConfigParams::m_bindless_textures)
+            T::getInstance()->SetTextureHandles(Handles);
+        else
+            T::getInstance()->SetTextureUnits(Textures);
         shadow_custom_unroll_args<List...>::template exec<T>(T::getInstance(), t->at(i));
     }
 }
@@ -720,15 +808,30 @@ void renderInstancedShadow(const std::vector<GLuint> TextureUnits, const std::ve
     glUseProgram(T::getInstance()->Program);
     for (unsigned i = 0; i < t->size(); i++)
     {
+        std::vector<uint64_t> Handles;
         std::vector<GLuint> Textures;
-        const GLMesh *mesh = STK::tuple_get<0>(t->at(i));
+        GLMesh *mesh = STK::tuple_get<0>(t->at(i));
         glBindVertexArray(mesh->vao_shadow_pass);
         for (unsigned j = 0; j < TextureUnits.size(); j++)
         {
             compressTexture(mesh->textures[TextureUnits[j]], true);
-            Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
+            if (UserConfigParams::m_bindless_textures)
+            {
+#ifdef Bindless_Texture_Support
+                if (!mesh->TextureHandles[TextureUnits[j]])
+                    mesh->TextureHandles[TextureUnits[j]] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh->textures[TextureUnits[j]]), T::getInstance()->SamplersId[j]);
+                if (!glIsTextureHandleResidentARB(mesh->TextureHandles[TextureUnits[j]]))
+                    glMakeTextureHandleResidentARB(mesh->TextureHandles[TextureUnits[j]]);
+#endif
+                Handles.push_back(mesh->TextureHandles[TextureUnits[j]]);
+            }
+            else
+                Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
         }
-        T::getInstance()->SetTextureUnits(Textures);
+        if (UserConfigParams::m_bindless_textures)
+            T::getInstance()->SetTextureHandles(Handles);
+        else
+            T::getInstance()->SetTextureUnits(Textures);
         instanced_shadow_custom_unroll_args<List...>::template exec<T>(T::getInstance(), t->at(i));
     }
 }
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 3812c28ac..dc357c07f 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -884,11 +884,7 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        AssignTextureUnit(Program,
-            TexUnit(0, "DiffuseMap"),
-            TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"));
-        AssignSamplerNames(Program, 3, "Albedo");
+        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo");
     }
 
     InstancedObjectPass2Shader::InstancedObjectPass2Shader()
@@ -900,12 +896,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_pass2.frag").c_str());
         AssignUniforms();
 
-        AssignTextureUnit(Program,
-            TexUnit(0, "DiffuseMap"),
-            TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"));
-
-        AssignSamplerNames(Program, 3, "Albedo");
+        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -921,12 +912,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectref_pass2.frag").c_str());
         AssignUniforms();
 
-        AssignTextureUnit(Program,
-            TexUnit(0, "DiffuseMap"),
-            TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"));
-
-        AssignSamplerNames(Program, 3, "Albedo");
+        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -942,11 +928,7 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        AssignTextureUnit(Program,
-            TexUnit(0, "DiffuseMap"),
-            TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"));
-        AssignSamplerNames(Program, 3, "Albedo", 4, "Detail");
+        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "Detail");
     }
 
     ObjectUnlitShader::ObjectUnlitShader()
@@ -959,7 +941,7 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        AssignSamplerNames(Program, 3, "tex");
+        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
     }
 
     ObjectRefPass2Shader::ObjectRefPass2Shader()
@@ -973,11 +955,7 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        AssignTextureUnit(Program,
-            TexUnit(0, "DiffuseMap"),
-            TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"));
-        AssignSamplerNames(Program, 3, "Albedo");
+        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo");
     }
 
     GrassPass2Shader::GrassPass2Shader()
@@ -988,11 +966,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/grass_pass2.frag").c_str());
         AssignUniforms("ModelMatrix", "windDir");
 
-        AssignTextureUnit(Program,
-            TexUnit(0, "DiffuseMap"),
-            TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"));
-        AssignSamplerNames(Program, 3, "Albedo");
+        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo");
     }
 
     InstancedGrassPass2Shader::InstancedGrassPass2Shader()
@@ -1004,15 +978,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/grass_pass2.frag").c_str());
         AssignUniforms("windDir", "SunDir");
 
-        AssignTextureUnit(Program,
-            TexUnit(0, "DiffuseMap"),
-            TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"),
-            TexUnit(4, "dtex")
-            );
-
-        AssignSamplerNames(Program, 3, "Albedo");
-
+        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "dtex", 4, "Albedo");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -1030,11 +996,7 @@ namespace MeshShader
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
-        AssignTextureUnit(Program,
-            TexUnit(0, "DiffuseMap"),
-            TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"));
-        AssignSamplerNames(Program, 3, "tex");
+        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
     }
 
     SplattingShader::SplattingShader()
@@ -1045,11 +1007,10 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/splatting.frag").c_str());
         AssignUniforms("ModelMatrix");
 
-        AssignTextureUnit(Program,
-            TexUnit(0, "DiffuseMap"),
-            TexUnit(1, "SpecularMap"),
-            TexUnit(2, "SSAO"));
         AssignSamplerNames(Program,
+            0, "DiffuseMap",
+            1, "SpecularMap",
+            2, "SSAO",
             3, "tex_layout",
             4, "tex_detail0",
             5, "tex_detail1",
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 9ab88daa0..33ae728f9 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -395,15 +395,16 @@ private:
     void AssignTextureNames_impl(GLuint Program, GLuint TexUnit, const char *name, Args...args...)
     {
         GLuint location = glGetUniformLocation(Program, name);
+        TextureLocation.push_back(location);
         glUniform1i(location, TexUnit);
         TextureUnits.push_back(TexUnit);
         AssignTextureNames_impl<N + 1>(Program, args...);
     }
 
 protected:
-    std::vector<GLuint> SamplersId;
     std::vector<GLuint> TextureUnits;
     std::vector<GLenum> TextureType;
+    std::vector<GLenum> TextureLocation;
     template<typename...Args>
     void AssignSamplerNames(GLuint Program, Args...args)
     {
@@ -415,6 +416,7 @@ protected:
     }
 
 public:
+    std::vector<GLuint> SamplersId;
     void SetTextureUnits(const std::vector<GLuint> &args)
     {
         assert(args.size() == sizeof...(tp) && "Too much texture unit provided");
@@ -434,6 +436,16 @@ public:
         for (unsigned i = 0; i < SamplersId.size(); i++)
             glDeleteSamplers(1, &SamplersId[i]);
     }
+
+    void SetTextureHandles(const std::vector<uint64_t> &args)
+    {
+        for (unsigned i = 0; i < args.size(); i++)
+        {
+#ifdef Bindless_Texture_Support
+            glUniformHandleui64ARB(TextureLocation[i], args[i]);
+#endif
+        }
+    }
 };
 
 namespace MeshShader
@@ -486,61 +498,61 @@ public:
     InstancedNormalMapShader();
 };
 
-class ObjectPass2Shader : public ShaderHelperSingleton<ObjectPass2Shader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class ObjectPass2Shader : public ShaderHelperSingleton<ObjectPass2Shader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     ObjectPass2Shader();
 };
 
-class InstancedObjectPass2Shader : public ShaderHelperSingleton<InstancedObjectPass2Shader>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class InstancedObjectPass2Shader : public ShaderHelperSingleton<InstancedObjectPass2Shader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedObjectPass2Shader();
 };
 
-class InstancedObjectRefPass2Shader : public ShaderHelperSingleton<InstancedObjectRefPass2Shader>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class InstancedObjectRefPass2Shader : public ShaderHelperSingleton<InstancedObjectRefPass2Shader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedObjectRefPass2Shader();
 };
 
-class DetailledObjectPass2Shader : public ShaderHelperSingleton<DetailledObjectPass2Shader, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class DetailledObjectPass2Shader : public ShaderHelperSingleton<DetailledObjectPass2Shader, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     DetailledObjectPass2Shader();
 };
 
-class ObjectUnlitShader : public ShaderHelperSingleton<ObjectUnlitShader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class ObjectUnlitShader : public ShaderHelperSingleton<ObjectUnlitShader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     ObjectUnlitShader();
 };
 
-class ObjectRefPass2Shader : public ShaderHelperSingleton<ObjectRefPass2Shader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class ObjectRefPass2Shader : public ShaderHelperSingleton<ObjectRefPass2Shader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     ObjectRefPass2Shader();
 };
 
-class GrassPass2Shader : public ShaderHelperSingleton<GrassPass2Shader, core::matrix4, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class GrassPass2Shader : public ShaderHelperSingleton<GrassPass2Shader, core::matrix4, core::vector3df>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     GrassPass2Shader();
 };
 
-class InstancedGrassPass2Shader : public ShaderHelperSingleton<InstancedGrassPass2Shader, core::vector3df, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class InstancedGrassPass2Shader : public ShaderHelperSingleton<InstancedGrassPass2Shader, core::vector3df, core::vector3df>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Nearest_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedGrassPass2Shader();
 };
 
-class SphereMapShader : public ShaderHelperSingleton<SphereMapShader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class SphereMapShader : public ShaderHelperSingleton<SphereMapShader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     SphereMapShader();
 };
 
-class SplattingShader : public ShaderHelperSingleton<SplattingShader, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class SplattingShader : public ShaderHelperSingleton<SplattingShader, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     SplattingShader();
diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stkmesh.hpp
index 43f42c5a3..dd21eb6c6 100644
--- a/src/graphics/stkmesh.hpp
+++ b/src/graphics/stkmesh.hpp
@@ -47,6 +47,7 @@ struct GLMesh {
     size_t vaoBaseVertex;
     size_t vaoOffset;
     video::E_VERTEX_TYPE VAOType;
+    uint64_t TextureHandles[6];
 };
 
 GLMesh allocateMeshBuffer(scene::IMeshBuffer* mb);
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 0a8aabddd..1b4f7c737 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -341,7 +341,18 @@ void STKMeshSceneNode::render()
                         tmpcol.getBlue() / 255.0f);
 
                     compressTexture(mesh.textures[0], true);
-                    MeshShader::TransparentFogShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ getTextureGLuint(mesh.textures[0]) });
+                    if (UserConfigParams::m_bindless_textures)
+                    {
+#ifdef Bindless_Texture_Support
+                        if (!mesh.TextureHandles[0])
+                            mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::TransparentFogShader::getInstance()->SamplersId[0]);
+                        if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
+                            glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
+                        MeshShader::TransparentFogShader::getInstance()->SetTextureHandles(createVector<uint64_t>(mesh.TextureHandles[0]));
+#endif
+                    }
+                    else
+                        MeshShader::TransparentFogShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ getTextureGLuint(mesh.textures[0]) });
                     MeshShader::TransparentFogShader::getInstance()->setUniforms(AbsoluteTransformation, mesh.TextureMatrix, fogmax, startH, endH, start, end, col);
 
                     assert(mesh.vao);
@@ -362,7 +373,18 @@ void STKMeshSceneNode::render()
                     size_t count = mesh.IndexCount;
 
                     compressTexture(mesh.textures[0], true);
-                    MeshShader::TransparentShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ getTextureGLuint(mesh.textures[0]) });
+                    if (UserConfigParams::m_bindless_textures)
+                    {
+#ifdef Bindless_Texture_Support
+                        if (!mesh.TextureHandles[0])
+                            mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::TransparentShader::getInstance()->SamplersId[0]);
+                        if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
+                            glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
+                        MeshShader::TransparentShader::getInstance()->SetTextureHandles(createVector<uint64_t>(mesh.TextureHandles[0]));
+#endif
+                    }
+                    else
+                        MeshShader::TransparentShader::getInstance()->SetTextureUnits(std::vector<GLuint>{ getTextureGLuint(mesh.textures[0]) });
 
                     MeshShader::TransparentShader::getInstance()->setUniforms(AbsoluteTransformation, mesh.TextureMatrix);
                     assert(mesh.vao);

From fbc438b998136cbeca4c51fac37c22e48df696ac Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 23 Aug 2014 09:56:30 +1000
Subject: [PATCH 095/248] Fixed error message to correctly say that online user
 names needs to be at least 3 characters long - though at this stage we need
 to wait for the server to be updated as well, since it will now reject a
 shorter user name.

---
 src/states_screens/register_screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/states_screens/register_screen.cpp b/src/states_screens/register_screen.cpp
index 244a96685..8fad53ed4 100644
--- a/src/states_screens/register_screen.cpp
+++ b/src/states_screens/register_screen.cpp
@@ -224,7 +224,7 @@ void RegisterScreen::doRegister()
     }
     else if (username.size() < 3 || username.size() > 30)
     {
-        m_info_widget->setText(_("Online username has to be between 4 and 30 characters long!"), false);
+        m_info_widget->setText(_("Online username has to be between 3 and 30 characters long!"), false);
     }
     else if (password.size() < 8 || password.size() > 30)
     {

From 16b88d13db9da39433e19c360e271c40c5f63be6 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 23 Aug 2014 12:10:12 +1000
Subject: [PATCH 096/248] Fixed compiler warning.

---
 src/tracks/check_manager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tracks/check_manager.cpp b/src/tracks/check_manager.cpp
index 7ece0621e..1281fd1cb 100644
--- a/src/tracks/check_manager.cpp
+++ b/src/tracks/check_manager.cpp
@@ -150,6 +150,7 @@ unsigned int CheckManager::getLapLineIndex() const
     }
 
     Log::fatal("CheckManager", "Error, no kind of lap line for track found, aborting.");
+    return -1;
 }   // getLapLineIndex
 
 // ----------------------------------------------------------------------------

From a0b376f04d0dd8f5a8ae2343118f0773af212cb1 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 22 Aug 2014 22:21:46 +0200
Subject: [PATCH 097/248] Fix some warnings

---
 src/utils/debug.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/utils/debug.cpp b/src/utils/debug.cpp
index 62bbc8dd3..a6bfc6fcc 100644
--- a/src/utils/debug.cpp
+++ b/src/utils/debug.cpp
@@ -439,32 +439,32 @@ bool onEvent(const SEvent &event)
                 {
 #if !defined(__APPLE__)
                     DebugSliderDialog *dsd = new DebugSliderDialog();
-                    dsd->setSliderHook( "red_slider", 0, 255, [](){ return irr_driver->getAmbientLight().r * 255.; },
+                    dsd->setSliderHook( "red_slider", 0, 255, [](){ return irr_driver->getAmbientLight().r * 255.f; },
                         [](int v){
                             video::SColorf ambient = irr_driver->getAmbientLight();
-                            ambient.setColorComponentValue(0, v / 255.);
+                            ambient.setColorComponentValue(0, v / 255.f);
                             irr_driver->setAmbientLight(ambient); }
                     );
-                    dsd->setSliderHook("green_slider", 0, 255, [](){ return irr_driver->getAmbientLight().g * 255.; },
+                    dsd->setSliderHook("green_slider", 0, 255, [](){ return irr_driver->getAmbientLight().g * 255.f; },
                         [](int v){
                         video::SColorf ambient = irr_driver->getAmbientLight();
-                        ambient.setColorComponentValue(1, v / 255.);
+                        ambient.setColorComponentValue(1, v / 255.f);
                         irr_driver->setAmbientLight(ambient); }
                     );
-                    dsd->setSliderHook("blue_slider", 0, 255, [](){ return irr_driver->getAmbientLight().b * 255.; },
+                    dsd->setSliderHook("blue_slider", 0, 255, [](){ return irr_driver->getAmbientLight().b * 255.f; },
                         [](int v){
                         video::SColorf ambient = irr_driver->getAmbientLight();
-                        ambient.setColorComponentValue(2, v / 255.);
+                        ambient.setColorComponentValue(2, v / 255.f);
                         irr_driver->setAmbientLight(ambient); }
                     );
-                    dsd->setSliderHook("ssao_radius", 0, 100, [](){ return irr_driver->getSSAORadius() * 10; },
-                        [](int v){irr_driver->setSSAORadius(v / 10.); }
+                    dsd->setSliderHook("ssao_radius", 0, 100, [](){ return irr_driver->getSSAORadius() * 10.f; },
+                        [](int v){irr_driver->setSSAORadius(v / 10.f); }
                     );
-                    dsd->setSliderHook("ssao_k", 0, 100, [](){ return irr_driver->getSSAOK() * 10; },
-                        [](int v){irr_driver->setSSAOK(v / 10.); }
+                    dsd->setSliderHook("ssao_k", 0, 100, [](){ return irr_driver->getSSAOK() * 10.f; },
+                        [](int v){irr_driver->setSSAOK(v / 10.f); }
                     );
-                    dsd->setSliderHook("ssao_sigma", 0, 100, [](){ return irr_driver->getSSAOSigma() * 10; },
-                        [](int v){irr_driver->setSSAOSigma(v / 10.); }
+                    dsd->setSliderHook("ssao_sigma", 0, 100, [](){ return irr_driver->getSSAOSigma() * 10.f; },
+                        [](int v){irr_driver->setSSAOSigma(v / 10.f); }
                     );
 #endif
                 }

From 4a62fd7968d46db28428dc0bb408ec9a9d62d84f Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Fri, 22 Aug 2014 18:49:30 +0200
Subject: [PATCH 098/248] Use an instance manager

---
 src/graphics/gl_headers.hpp            |   1 +
 src/graphics/glwrap.cpp                |  83 ++++++++++++++++-
 src/graphics/glwrap.hpp                |  37 ++++++++
 src/graphics/irr_driver.cpp            |   8 ++
 src/graphics/irr_driver.hpp            |   6 ++
 src/graphics/render_geometry.cpp       |  47 +++++++++-
 src/graphics/stkinstancedscenenode.cpp | 122 +++++++++++++++----------
 src/graphics/stkinstancedscenenode.hpp |   4 +-
 src/graphics/stkmesh.hpp               |   1 +
 9 files changed, 252 insertions(+), 57 deletions(-)

diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp
index 81789ddf2..91c314ef2 100644
--- a/src/graphics/gl_headers.hpp
+++ b/src/graphics/gl_headers.hpp
@@ -128,6 +128,7 @@ extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
 
 #ifdef WIN32
 #define Bindless_Texture_Support
+#define Base_Instance_Support
 #endif
 
 #endif
\ No newline at end of file
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index c8b44bd5c..3baa27d22 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -4,6 +4,7 @@
 #include "config/user_config.hpp"
 #include "utils/profiler.hpp"
 #include "utils/cpp2011.hpp"
+#include "graphics/stkmesh.hpp"
 
 #ifdef _IRR_WINDOWS_API_
 #define IRR_OGL_LOAD_EXTENSION(X) wglGetProcAddress(reinterpret_cast<const char*>(X))
@@ -592,10 +593,33 @@ VAOManager::VAOManager()
     idx_cnt[0] = idx_cnt[1] = idx_cnt[2] = 0;
     vtx_mirror[0] = vtx_mirror[1] = vtx_mirror[2] = NULL;
     idx_mirror[0] = idx_mirror[1] = idx_mirror[2] = NULL;
+    instance_count[0] = 0;
+
+    glGenBuffers(1, &instance_vbo[0]);
+    glBindBuffer(GL_ARRAY_BUFFER, instance_vbo[0]);
+    glBufferData(GL_ARRAY_BUFFER, 10000 * sizeof(float)* 9, 0, GL_STATIC_DRAW);
+}
+
+static void cleanVAOMap(std::map<std::pair<video::E_VERTEX_TYPE, InstanceType>, GLuint> Map)
+{
+    std::map<std::pair<video::E_VERTEX_TYPE, InstanceType>, GLuint>::iterator It = Map.begin(), E = Map.end();
+    for (; It != E; It++)
+    {
+        glDeleteVertexArrays(1, &(It->second));
+    }
+}
+
+void VAOManager::cleanInstanceVAOs()
+{
+    cleanVAOMap(InstanceVAO);
+    cleanVAOMap(ShadowInstanceVAO);
+    InstanceVAO.clear();
+    ShadowInstanceVAO.clear();
 }
 
 VAOManager::~VAOManager()
 {
+    cleanInstanceVAOs();
     for (unsigned i = 0; i < 3; i++)
     {
         if (vtx_mirror[i])
@@ -609,7 +633,7 @@ VAOManager::~VAOManager()
         if (vao[i])
             glDeleteVertexArrays(1, &vao[i]);
     }
-
+    glDeleteBuffers(1, &instance_vbo[0]);
 }
 
 void VAOManager::regenerateBuffer(enum VTXTYPE tp)
@@ -697,6 +721,53 @@ void VAOManager::regenerateVAO(enum VTXTYPE tp)
     glBindVertexArray(0);
 }
 
+void VAOManager::regenerateInstancedVAO()
+{
+    cleanInstanceVAOs();
+
+    enum video::E_VERTEX_TYPE IrrVT[] = { video::EVT_STANDARD, video::EVT_2TCOORDS, video::EVT_TANGENTS };
+    for (unsigned i = 0; i < VTXTYPE_COUNT; i++)
+    {
+        for (unsigned j = 0; j < InstanceTypeCount; j++)
+        {
+            video::E_VERTEX_TYPE tp = IrrVT[i];
+            if (!vbo[tp] || !ibo[tp])
+                continue;
+            GLuint vao = createVAO(vbo[tp], ibo[tp], tp);
+            glBindBuffer(GL_ARRAY_BUFFER, instance_vbo[j]);
+
+            glEnableVertexAttribArray(7);
+            glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
+            glVertexAttribDivisor(7, 1);
+            glEnableVertexAttribArray(8);
+            glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(3 * sizeof(float)));
+            glVertexAttribDivisor(8, 1);
+            glEnableVertexAttribArray(9);
+            glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
+            glVertexAttribDivisor(9, 1);
+            InstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(tp, (InstanceType) j)] = vao;
+
+            GLuint shadow_vao = createVAO(vbo[tp], ibo[tp], tp);
+            glBindBuffer(GL_ARRAY_BUFFER, instance_vbo[j]);
+
+            glEnableVertexAttribArray(7);
+            glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
+            glVertexAttribDivisor(7, 4);
+            glEnableVertexAttribArray(8);
+            glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(3 * sizeof(float)));
+            glVertexAttribDivisor(8, 4);
+            glEnableVertexAttribArray(9);
+            glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
+            glVertexAttribDivisor(9, 4);
+            ShadowInstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(tp, (InstanceType)j)] = shadow_vao;
+            glBindVertexArray(0);
+        }
+    }
+
+
+
+}
+
 size_t VAOManager::getVertexPitch(enum VTXTYPE tp) const
 {
     switch (tp)
@@ -756,6 +827,7 @@ std::pair<unsigned, unsigned> VAOManager::getBase(scene::IMeshBuffer *mb)
         append(mb, tp);
         regenerateBuffer(tp);
         regenerateVAO(tp);
+        regenerateInstancedVAO();
     }
 
     std::map<scene::IMeshBuffer*, unsigned>::iterator It;
@@ -767,6 +839,15 @@ std::pair<unsigned, unsigned> VAOManager::getBase(scene::IMeshBuffer *mb)
     return std::pair<unsigned, unsigned>(vtx, It->second);
 }
 
+size_t VAOManager::appendInstance(enum InstanceType, const std::vector<InstanceData> &instance_data)
+{
+    glBindBuffer(GL_ARRAY_BUFFER, instance_vbo[0]);
+    glBufferSubData(GL_ARRAY_BUFFER, instance_count[0] * sizeof(InstanceData), instance_data.size() * sizeof(InstanceData), instance_data.data());
+    size_t result = instance_count[0];
+    instance_count[0] += instance_data.size();
+    return result;
+}
+
 ScopedGPUTimer::ScopedGPUTimer(GPUTimer &timer)
 {
     if (!UserConfigParams::m_profiler_enabled) return;
diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index 034af4090..c775bcebe 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -139,25 +139,62 @@ void compressTexture(irr::video::ITexture *tex, bool srgb, bool premul_alpha = f
 bool loadCompressedTexture(const std::string& compressed_tex);
 void saveCompressedTexture(const std::string& compressed_tex);
 
+enum InstanceType
+{
+    InstanceTypeDefault,
+    InstanceTypeCount,
+};
+
+struct InstanceData
+{
+    struct
+    {
+        float X;
+        float Y;
+        float Z;
+    } Origin;
+    struct
+    {
+        float X;
+        float Y;
+        float Z;
+    } Orientation;
+    struct
+    {
+        float X;
+        float Y;
+        float Z;
+    } Scale;
+    uint64_t Texture;
+};
+
 class VAOManager : public Singleton<VAOManager>
 {
     enum VTXTYPE { VTXTYPE_STANDARD, VTXTYPE_TCOORD, VTXTYPE_TANGENT, VTXTYPE_COUNT };
     GLuint vbo[VTXTYPE_COUNT], ibo[VTXTYPE_COUNT], vao[VTXTYPE_COUNT];
+    GLuint instance_vbo[1];
+    size_t instance_count[1];
     std::vector<scene::IMeshBuffer *> storedCPUBuffer[VTXTYPE_COUNT];
     void *vtx_mirror[VTXTYPE_COUNT], *idx_mirror[VTXTYPE_COUNT];
     size_t vtx_cnt[VTXTYPE_COUNT], idx_cnt[VTXTYPE_COUNT];
     std::map<scene::IMeshBuffer*, unsigned> mappedBaseVertex[VTXTYPE_COUNT], mappedBaseIndex[VTXTYPE_COUNT];
+    std::map<std::pair<video::E_VERTEX_TYPE, InstanceType>, GLuint> InstanceVAO, ShadowInstanceVAO;
 
+    void cleanInstanceVAOs();
     void regenerateBuffer(enum VTXTYPE);
     void regenerateVAO(enum VTXTYPE);
+    void regenerateInstancedVAO();
     size_t getVertexPitch(enum VTXTYPE) const;
     VTXTYPE getVTXTYPE(video::E_VERTEX_TYPE type);
     void append(scene::IMeshBuffer *, VTXTYPE tp);
 public:
     VAOManager();
     std::pair<unsigned, unsigned> getBase(scene::IMeshBuffer *);
+    size_t appendInstance(enum InstanceType, const std::vector<InstanceData> &instance_data);
     unsigned getVBO(video::E_VERTEX_TYPE type) { return vbo[getVTXTYPE(type)]; }
     unsigned getVAO(video::E_VERTEX_TYPE type) { return vao[getVTXTYPE(type)]; }
+    unsigned getInstanceVAO(video::E_VERTEX_TYPE vt, enum InstanceType it) { return InstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(vt, it)]; }
+    unsigned getShadowInstanceVAO(video::E_VERTEX_TYPE vt, enum InstanceType it) { return ShadowInstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(vt, it)]; }
     ~VAOManager();
 };
 
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 66eaabe21..b40d279d5 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -483,12 +483,20 @@ void IrrDriver::initDevice()
 
     // Parse extensions
     hasVSLayer = false;
+    hasBaseInstance = false;
     // Default false value for hasVSLayer if --no-graphics argument is used
     if (!ProfileWorld::isNoGraphics())
     {
         if (hasGLExtension("GL_AMD_vertex_shader_layer")) {
             hasVSLayer = true;
+            Log::info("GLDriver", "AMD Vertex Shader Layer enabled");
         }
+#ifdef Base_Instance_Support
+        if (hasGLExtension("GL_ARB_base_instance")) {
+            hasBaseInstance = true;
+            Log::info("GLDriver", "ARB Instance enabled");
+        }
+#endif
     }
 
 
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 86ca6490e..dec484903 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -199,6 +199,7 @@ class IrrDriver : public IEventReceiver, public NoCopy
 private:
     int GLMajorVersion, GLMinorVersion;
     bool hasVSLayer;
+    bool hasBaseInstance;
     bool m_need_ubo_workaround;
     bool m_need_rh_workaround;
     /** The irrlicht device. */
@@ -293,6 +294,11 @@ public:
         return m_need_rh_workaround;
     }
 
+    bool hasARB_base_instance() const
+    {
+        return hasBaseInstance;
+    }
+
     bool hasVSLayerExtension() const
     {
         return hasVSLayer;
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index ae9d00c1d..1b3d01acb 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -176,7 +176,12 @@ struct instanced_custom_unroll_args<>
         size_t count = mesh->IndexCount;
 
         Shader->setUniforms(args...);
-        glDrawElementsInstanced(ptype, count, itype, 0, instance_count);
+#ifdef Base_Instance_Support
+        if (irr_driver->hasARB_base_instance())
+            glDrawElementsInstancedBaseVertexBaseInstance(ptype, count, itype, (const void*)mesh->vaoOffset, instance_count, mesh->vaoBaseVertex, mesh->vaoBaseInstance);
+        else
+#endif
+            glDrawElementsInstanced(ptype, count, itype, 0, instance_count);
     }
 };
 
@@ -203,7 +208,8 @@ void renderInstancedMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vec
         if (mesh.VAOType != VertexType)
             Log::error("RenderGeometry", "Wrong instanced vertex format");
 #endif
-        glBindVertexArray(mesh.vao);
+        if (!irr_driver->hasARB_base_instance())
+            glBindVertexArray(mesh.vao);
         for (unsigned j = 0; j < TexUnits.size(); j++)
         {
             if (!mesh.textures[TexUnits[j].m_id])
@@ -306,15 +312,23 @@ void IrrDriver::renderSolidFirstPass()
         renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_2TCOORDS, 2, 1>(TexUnits(TexUnit(0, true)), AnimatedListMatDetails::getInstance());
         renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(0, true)), AnimatedListMatUnlit::getInstance());
 
+        if (irr_driver->hasARB_base_instance())
+            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
         renderInstancedMeshes1stPass<MeshShader::InstancedObjectPass1Shader, video::EVT_STANDARD>(
                     TexUnits(TexUnit(0, true)),
                     ListInstancedMatDefault::getInstance());
+        if (irr_driver->hasARB_base_instance())
+            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
         renderInstancedMeshes1stPass<MeshShader::InstancedObjectRefPass1Shader, video::EVT_STANDARD>(
                     TexUnits(TexUnit(0, true)),
                     ListInstancedMatAlphaRef::getInstance());
+        if (irr_driver->hasARB_base_instance())
+            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
         renderInstancedMeshes1stPass<MeshShader::InstancedGrassPass1Shader, video::EVT_STANDARD, 2>(
                     TexUnits(TexUnit(0, true)),
                     ListInstancedMatGrass::getInstance());
+        if (irr_driver->hasARB_base_instance())
+            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
         renderInstancedMeshes1stPass<MeshShader::InstancedNormalMapShader, video::EVT_TANGENTS>(
             TexUnits(TexUnit(1, false), TexUnit(0, true)),
             ListInstancedMatNormalMap::getInstance());
@@ -385,7 +399,8 @@ void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vec
     for (unsigned i = 0; i < meshes->size(); i++)
     {
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
-        glBindVertexArray(mesh.vao);
+        if (!irr_driver->hasARB_base_instance())
+            glBindVertexArray(mesh.vao);
 
         std::vector<GLuint> Textures(Prefilled_tex);
         std::vector<uint64_t> Handles(Prefilled_Handles);
@@ -529,15 +544,23 @@ void IrrDriver::renderSolidSecondPass()
             TexUnit(0, true)
             ), ListMatNormalMap::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
 
+        if (irr_driver->hasARB_base_instance())
+            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
         renderInstancedMeshes2ndPass<MeshShader::InstancedObjectPass2Shader>(
             TexUnits(TexUnit(0, true)),
             ListInstancedMatDefault::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
+        if (irr_driver->hasARB_base_instance())
+            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
         renderInstancedMeshes2ndPass<MeshShader::InstancedObjectPass2Shader>(
             TexUnits(TexUnit(0, true)),
             ListInstancedMatNormalMap::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
+        if (irr_driver->hasARB_base_instance())
+            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
         renderInstancedMeshes2ndPass<MeshShader::InstancedObjectRefPass2Shader>(
             TexUnits(TexUnit(0, true)),
             ListInstancedMatAlphaRef::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
+        if (irr_driver->hasARB_base_instance())
+            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
         DiffSpecSSAOTex.push_back(irr_driver->getDepthStencilTexture());
         renderInstancedMeshes2ndPass<MeshShader::InstancedGrassPass2Shader, 3, 2>(
             TexUnits(TexUnit(0, true)),
@@ -788,7 +811,12 @@ struct instanced_shadow_custom_unroll_args<>
         size_t count = mesh->IndexCount;
 
         Shader->setUniforms(args...);
-        glDrawElementsInstanced(ptype, count, itype, 0, 4 * instance_count);
+#ifdef Base_Instance_Support
+        if (irr_driver->hasARB_base_instance())
+            glDrawElementsInstancedBaseVertexBaseInstance(ptype, count, itype, (const void*) mesh->vaoOffset, 4 * instance_count, mesh->vaoBaseVertex, mesh->vaoBaseInstance);
+        else
+#endif
+            glDrawElementsInstanced(ptype, count, itype, 0, 4 * instance_count);
     }
 };
 
@@ -811,7 +839,8 @@ void renderInstancedShadow(const std::vector<GLuint> TextureUnits, const std::ve
         std::vector<uint64_t> Handles;
         std::vector<GLuint> Textures;
         GLMesh *mesh = STK::tuple_get<0>(t->at(i));
-        glBindVertexArray(mesh->vao_shadow_pass);
+        if (!irr_driver->hasARB_base_instance())
+            glBindVertexArray(mesh->vao_shadow_pass);
         for (unsigned j = 0; j < TextureUnits.size(); j++)
         {
             compressTexture(mesh->textures[TextureUnits[j]], true);
@@ -883,9 +912,17 @@ void IrrDriver::renderShadows()
     renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, AnimatedListMatUnlit::getInstance());
     renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, AnimatedListMatDetails::getInstance());
 
+    if (irr_driver->hasARB_base_instance())
+        glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
     renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, ListInstancedMatDefault::getInstance());
+    if (irr_driver->hasARB_base_instance())
+        glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
     renderInstancedShadow<MeshShader::InstancedRefShadowShader>(std::vector<GLuint>{ 0 }, ListInstancedMatAlphaRef::getInstance());
+    if (irr_driver->hasARB_base_instance())
+        glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
     renderInstancedShadow<MeshShader::InstancedGrassShadowShader, 2>(std::vector<GLuint>{ 0 }, ListInstancedMatGrass::getInstance());
+    if (irr_driver->hasARB_base_instance())
+        glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
     renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, ListInstancedMatNormalMap::getInstance());
 
     glDisable(GL_POLYGON_OFFSET_FILL);
diff --git a/src/graphics/stkinstancedscenenode.cpp b/src/graphics/stkinstancedscenenode.cpp
index 64c28206f..f12e27be7 100644
--- a/src/graphics/stkinstancedscenenode.cpp
+++ b/src/graphics/stkinstancedscenenode.cpp
@@ -50,41 +50,55 @@ void STKInstancedSceneNode::createGLMeshes()
     {
         scene::IMeshBuffer* mb = Mesh->getMeshBuffer(i);
         GLmeshes.push_back(allocateMeshBuffer(mb));
-        fillLocalBuffer(GLmeshes.back(), mb);
+        GLMesh &mesh = GLmeshes.back();
+        if (irr_driver->hasARB_base_instance())
+        {
+            std::pair<unsigned, unsigned> p = VAOManager::getInstance()->getBase(mb);
+            mesh.vaoBaseVertex = p.first;
+            mesh.vaoOffset = p.second;
+            mesh.VAOType = mb->getVertexType();
+        }
+        else
+            fillLocalBuffer(mesh, mb);
     }
     isMaterialInitialized = false;
 }
 
 void STKInstancedSceneNode::initinstancedvaostate(GLMesh &mesh)
 {
-    mesh.vao = createVAO(mesh.vertex_buffer, mesh.index_buffer, getVTXTYPEFromStride(mesh.Stride));
-    glGenBuffers(1, &instances_vbo);
-    glBindBuffer(GL_ARRAY_BUFFER, instances_vbo);
-    glBufferData(GL_ARRAY_BUFFER, instance_pos.size() * sizeof(float), instance_pos.data(), GL_STATIC_DRAW);
+    if (irr_driver->hasARB_base_instance())
+        mesh.vaoBaseInstance = VAOManager::getInstance()->appendInstance(InstanceTypeDefault, instanceData);
+    else
+    {
+        mesh.vao = createVAO(mesh.vertex_buffer, mesh.index_buffer, getVTXTYPEFromStride(mesh.Stride));
+        glGenBuffers(1, &instances_vbo);
+        glBindBuffer(GL_ARRAY_BUFFER, instances_vbo);
+        glBufferData(GL_ARRAY_BUFFER, instanceData.size() * sizeof(InstanceData), instanceData.data(), GL_STATIC_DRAW);
 
-    glEnableVertexAttribArray(7);
-    glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, 9 * sizeof(float), 0);
-    glVertexAttribDivisor(7, 1);
-    glEnableVertexAttribArray(8);
-    glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, 9 * sizeof(float), (GLvoid*)(3 * sizeof(float)));
-    glVertexAttribDivisor(8, 1);
-    glEnableVertexAttribArray(9);
-    glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, 9 * sizeof(float), (GLvoid*)(6 * sizeof(float)));
-    glVertexAttribDivisor(9, 1);
+        glEnableVertexAttribArray(7);
+        glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
+        glVertexAttribDivisor(7, 1);
+        glEnableVertexAttribArray(8);
+        glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(3 * sizeof(float)));
+        glVertexAttribDivisor(8, 1);
+        glEnableVertexAttribArray(9);
+        glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
+        glVertexAttribDivisor(9, 1);
 
-    mesh.vao_shadow_pass = createVAO(mesh.vertex_buffer, mesh.index_buffer, getVTXTYPEFromStride(mesh.Stride));
-    glBindBuffer(GL_ARRAY_BUFFER, instances_vbo);
-    glEnableVertexAttribArray(7);
-    glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, 9 * sizeof(float), 0);
-    glVertexAttribDivisor(7, 4);
-    glEnableVertexAttribArray(8);
-    glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, 9 * sizeof(float), (GLvoid*)(3 * sizeof(float)));
-    glVertexAttribDivisor(8, 4);
-    glEnableVertexAttribArray(9);
-    glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, 9 * sizeof(float), (GLvoid*)(6 * sizeof(float)));
-    glVertexAttribDivisor(9, 4);
+        mesh.vao_shadow_pass = createVAO(mesh.vertex_buffer, mesh.index_buffer, getVTXTYPEFromStride(mesh.Stride));
+        glBindBuffer(GL_ARRAY_BUFFER, instances_vbo);
+        glEnableVertexAttribArray(7);
+        glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
+        glVertexAttribDivisor(7, 4);
+        glEnableVertexAttribArray(8);
+        glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(3 * sizeof(float)));
+        glVertexAttribDivisor(8, 4);
+        glEnableVertexAttribArray(9);
+        glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
+        glVertexAttribDivisor(9, 4);
 
-    glBindVertexArray(0);
+        glBindVertexArray(0);
+    }
 }
 
 void STKInstancedSceneNode::setFirstTimeMaterial()
@@ -108,34 +122,44 @@ void STKInstancedSceneNode::setFirstTimeMaterial()
 
 void STKInstancedSceneNode::addInstance(const core::vector3df &origin, const core::vector3df &orientation, const core::vector3df &scale)
 {
-    instance_pos.push_back(origin.X);
-    instance_pos.push_back(origin.Y);
-    instance_pos.push_back(origin.Z);
-    instance_pos.push_back(orientation.X);
-    instance_pos.push_back(orientation.Y);
-    instance_pos.push_back(orientation.Z);
-    instance_pos.push_back(scale.X);
-    instance_pos.push_back(scale.Y);
-    instance_pos.push_back(scale.Z);
+    InstanceData instance = {
+        {
+            origin.X,
+            origin.Y,
+            origin.Z
+        },
+        {
+            orientation.X,
+            orientation.Y,
+            orientation.Z
+        },
+        {
+            scale.X,
+            scale.Y,
+            scale.Z
+        },
+        0
+    };
+    instanceData.push_back(instance);
 }
 
 core::matrix4 STKInstancedSceneNode::getInstanceTransform(int id)
 {
     core::matrix4 mat;
 
-    int offset = id * 9;
+    const InstanceData &instance = instanceData[id];
     mat.setTranslation(core::vector3df(
-        instance_pos[offset],
-        instance_pos[offset + 1],
-        instance_pos[offset + 2]));
+        instance.Origin.X,
+        instance.Origin.Y,
+        instance.Origin.Z));
     mat.setRotationDegrees(core::vector3df(
-        instance_pos[offset + 3],
-        instance_pos[offset + 4],
-        instance_pos[offset + 5]));
+        instance.Orientation.X,
+        instance.Orientation.Y,
+        instance.Orientation.Z));
     mat.setScale(core::vector3df(
-        instance_pos[offset + 6],
-        instance_pos[offset + 7],
-        instance_pos[offset + 8]));
+        instance.Scale.X,
+        instance.Scale.Y,
+        instance.Scale.Z));
 
     return mat;
 }
@@ -154,13 +178,13 @@ void STKInstancedSceneNode::render()
     for(unsigned i = 0; i < MeshSolidMaterial[MAT_DEFAULT].size(); i++)
     {
         GLMesh *mesh = MeshSolidMaterial[MAT_DEFAULT][i];
-        ListInstancedMatDefault::getInstance()->push_back(STK::make_tuple(mesh, instance_pos.size() / 9));
+        ListInstancedMatDefault::getInstance()->push_back(STK::make_tuple(mesh, instanceData.size()));
     }
 
     for(unsigned i = 0; i < MeshSolidMaterial[MAT_ALPHA_REF].size(); i++)
     {
         GLMesh *mesh = MeshSolidMaterial[MAT_ALPHA_REF][i];
-        ListInstancedMatAlphaRef::getInstance()->push_back(STK::make_tuple(mesh, instance_pos.size() / 9));
+        ListInstancedMatAlphaRef::getInstance()->push_back(STK::make_tuple(mesh, instanceData.size()));
     }
 
     windDir = getWind();
@@ -168,12 +192,12 @@ void STKInstancedSceneNode::render()
     for(unsigned i = 0; i < MeshSolidMaterial[MAT_GRASS].size(); i++)
     {
         GLMesh *mesh = MeshSolidMaterial[MAT_GRASS][i];
-        ListInstancedMatGrass::getInstance()->push_back(STK::make_tuple(mesh, instance_pos.size() / 9, windDir, cb->getPosition()));
+        ListInstancedMatGrass::getInstance()->push_back(STK::make_tuple(mesh, instanceData.size(), windDir, cb->getPosition()));
     }
 
     for(unsigned i = 0; i < MeshSolidMaterial[MAT_NORMAL_MAP].size(); i++)
     {
         GLMesh *mesh = MeshSolidMaterial[MAT_NORMAL_MAP][i];
-        ListInstancedMatNormalMap::getInstance()->push_back(STK::make_tuple(mesh, instance_pos.size() / 9));
+        ListInstancedMatNormalMap::getInstance()->push_back(STK::make_tuple(mesh, instanceData.size()));
     }
 }
diff --git a/src/graphics/stkinstancedscenenode.hpp b/src/graphics/stkinstancedscenenode.hpp
index d1063ca6d..35a38d8b1 100644
--- a/src/graphics/stkinstancedscenenode.hpp
+++ b/src/graphics/stkinstancedscenenode.hpp
@@ -22,7 +22,7 @@ protected:
     int m_ref_count;
     std::vector<GLMesh *> MeshSolidMaterial[MAT_COUNT];
     std::vector<GLMesh> GLmeshes;
-    std::vector<float> instance_pos;
+    std::vector<InstanceData> instanceData;
     core::matrix4 ModelViewProjectionMatrix, TransposeInverseModelView;
     GLuint instances_vbo;
     void createGLMeshes();
@@ -40,7 +40,7 @@ public:
     virtual void render();
     void addInstance(const core::vector3df &origin, const core::vector3df &orientation, const core::vector3df &scale);
 
-    int getInstanceCount() const { return instance_pos.size() / 9; }
+    int getInstanceCount() const { return instanceData.size(); }
 
     core::matrix4 getInstanceTransform(int id);
 
diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stkmesh.hpp
index dd21eb6c6..beaee62cb 100644
--- a/src/graphics/stkmesh.hpp
+++ b/src/graphics/stkmesh.hpp
@@ -46,6 +46,7 @@ struct GLMesh {
     core::matrix4 TextureMatrix;
     size_t vaoBaseVertex;
     size_t vaoOffset;
+    size_t vaoBaseInstance;
     video::E_VERTEX_TYPE VAOType;
     uint64_t TextureHandles[6];
 };

From db53dd6767e51bb962d54f7e56f2ccf1ea4f7587 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sun, 24 Aug 2014 17:18:06 +0200
Subject: [PATCH 099/248] xrandr: Simplify code a bit.

Fixed some memory leaks.
---
 .../source/Irrlicht/CIrrDeviceLinux.cpp       | 123 ++++++++----------
 .../source/Irrlicht/CIrrDeviceLinux.h         |   2 +-
 2 files changed, 58 insertions(+), 67 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
index 096309f15..b5423ca57 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
@@ -251,12 +251,10 @@ bool CIrrDeviceLinux::restoreResolution()
 	if (UseXRandR && CreationParams.Fullscreen && old_mode != BadRRMode)
 	{
 		XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display));
-		
 		if (!res)
 			return false;
 
 		XRROutputInfo* output = XRRGetOutputInfo(display, res, output_id);
-		
 		if (!output || !output->crtc || output->connection == RR_Disconnected) 
 		{
 			XRRFreeOutputInfo(output);
@@ -264,10 +262,8 @@ bool CIrrDeviceLinux::restoreResolution()
 		}
 
 		XRRCrtcInfo* crtc = XRRGetCrtcInfo(display, res, output->crtc);
-
 		if (!crtc) 
 		{
-			XRRFreeCrtcInfo(crtc);
 			XRRFreeOutputInfo(output);
 			return false;
 		}
@@ -288,7 +284,7 @@ bool CIrrDeviceLinux::restoreResolution()
 }
 
 
-bool CIrrDeviceLinux::switchToFullscreen()
+bool CIrrDeviceLinux::changeResolution()
 {
 	if (!CreationParams.Fullscreen)
 		return true;
@@ -356,22 +352,33 @@ bool CIrrDeviceLinux::switchToFullscreen()
 
 		XFree(modes);
 	}
-	else
 	#endif
 	#ifdef _IRR_LINUX_X11_RANDR_
-	if (XRRQueryExtension(display, &eventbase, &errorbase))
+	while (XRRQueryExtension(display, &eventbase, &errorbase))
 	{
-		XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display));
+		if (output_id == BadRROutput)
+			break;
 
-		if (!res || output_id == BadRROutput)
-		{
-			os::Printer::log("Could not get video output. Try to run in windowed mode.", ELL_WARNING);
-			CreationParams.Fullscreen = false;
-			return CreationParams.Fullscreen;
-		}
+		XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display));
+		if (!res)
+			break;
 
 		XRROutputInfo* output = XRRGetOutputInfo(display, res, output_id);
+		if (!output || !output->crtc || output->connection == RR_Disconnected)
+		{
+			XRRFreeOutputInfo(output);
+			XRRFreeScreenResources(res);
+			break;
+		}
+		
 		XRRCrtcInfo* crtc = XRRGetCrtcInfo(display, res, output->crtc);
+		if (!crtc)
+		{
+			XRRFreeOutputInfo(output);
+			XRRFreeScreenResources(res);
+			break;
+		}
+
 		float refresh_rate, refresh_rate_new;
 		core::dimension2d<u32> mode0_size = core::dimension2d<u32>(0, 0);
 
@@ -436,26 +443,22 @@ bool CIrrDeviceLinux::switchToFullscreen()
 		Status s = XRRSetCrtcConfig(display, res, output->crtc, CurrentTime,
 									crtc->x, crtc->y, output->modes[bestMode],
 									crtc->rotation, &output_id, 1);
+		
+		if (s == Success)
+			UseXRandR = true;
 
 		XRRFreeCrtcInfo(crtc);
 		XRRFreeOutputInfo(output);
 		XRRFreeScreenResources(res);
-
-		if (s != Success)
-		{
-			CreationParams.Fullscreen = false;
-			return CreationParams.Fullscreen;
-		}
-
-		UseXRandR=true;
+		break;
 	}
-	else
-	#endif
+	
+	if (UseXRandR == false)
 	{
-		os::Printer::log("VidMode or RandR extension must be installed to allow Irrlicht "
-		"to switch to fullscreen mode. Running in windowed mode instead.", ELL_WARNING);
+		os::Printer::log("Could not get video output. Try to run in windowed mode.", ELL_WARNING);
 		CreationParams.Fullscreen = false;
 	}
+	#endif
 
 	return CreationParams.Fullscreen;
 }
@@ -570,7 +573,7 @@ bool CIrrDeviceLinux::createWindow()
 
 	screennr = DefaultScreen(display);
 
-	switchToFullscreen();
+	changeResolution();
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
@@ -1625,7 +1628,6 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 				crtc_x = crtc_y = -1;
 
 				XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display));
-
 				if (!res)
 					break;
 				
@@ -1633,49 +1635,39 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 		
 				for (int i = 0; i < res->noutput; i++) 
 				{
-					output = XRRGetOutputInfo(display, res, res->outputs[i]);
-					
-					if (!output || !output->crtc || output->connection == RR_Disconnected) 
+					XRROutputInfo* output_tmp = XRRGetOutputInfo(display, res, res->outputs[i]);
+					if (!output_tmp || !output_tmp->crtc || output_tmp->connection == RR_Disconnected) 
 					{
-						XRRFreeOutputInfo(output);
+						XRRFreeOutputInfo(output_tmp);
 						continue;
 					}
 		
-					crtc = XRRGetCrtcInfo(display, res, output->crtc);
-		
-					if (!crtc) 
+					XRRCrtcInfo* crtc_tmp = XRRGetCrtcInfo(display, res, output_tmp->crtc);
+					if (!crtc_tmp) 
+					{
+						XRRFreeOutputInfo(output_tmp);
+						continue;
+					}
+					
+					if (res->outputs[i] == primary_id ||
+						output_id == BadRROutput || crtc_tmp->x < crtc->x ||
+						(crtc_tmp->x == crtc->x && crtc_tmp->y < crtc->y))
 					{
 						XRRFreeCrtcInfo(crtc);
-						XRRFreeOutputInfo(output);
-						continue;
+						XRRFreeOutputInfo(output);		
+						
+						output = output_tmp;
+						crtc = crtc_tmp;					
+						output_id = res->outputs[i];
+					}
+					else
+					{
+						XRRFreeCrtcInfo(crtc_tmp);
+						XRRFreeOutputInfo(output_tmp);			
 					}
 					
 					if (res->outputs[i] == primary_id)
-					{
-						crtc_x = crtc->x;
-						crtc_y = crtc->y;	
-						output_id = res->outputs[i];
-						
-						XRRFreeCrtcInfo(crtc);
-						XRRFreeOutputInfo(output);
 						break;
-					}
-					
-					if (crtc_x == -1 || crtc->x < crtc_x)
-					{
-						crtc_x = crtc->x;
-						crtc_y = crtc->y;						
-						output_id = res->outputs[i];
-					}
-					else if (crtc_x == crtc->x && crtc->y < crtc_y)
-					{
-						crtc_x = crtc->x;
-						crtc_y = crtc->y;
-						output_id = res->outputs[i];			
-					}
-					
-					XRRFreeCrtcInfo(crtc);
-					XRRFreeOutputInfo(output);
 				}
 				
 				if (output_id == BadRROutput)
@@ -1683,9 +1675,9 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 					os::Printer::log("Could not get video output.", ELL_WARNING);
 					break;
 				}
-
-				output = XRRGetOutputInfo(display, res, output_id);
-				crtc = XRRGetCrtcInfo(display, res, output->crtc);
+				
+				crtc_x = crtc->x;
+				crtc_y = crtc->y;
 
 				for (int i = 0; i < res->nmode; i++)
 				{
@@ -1719,8 +1711,7 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 				
 				XRRFreeCrtcInfo(crtc);
 				XRRFreeOutputInfo(output);
-				XRRFreeScreenResources(res);	
-							
+				XRRFreeScreenResources(res);						
 				break;
 			}
 			#endif
diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
index d2fd06899..c808b8ebd 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
@@ -151,7 +151,7 @@ namespace irr
 		void initXAtoms();
 
 		bool restoreResolution();
-		bool switchToFullscreen();
+		bool changeResolution();
 
 		//! Implementation of the linux cursor control
 		class CCursorControl : public gui::ICursorControl

From 7bff68870c0ef2ed236a95b799bc72b5486651b5 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sat, 23 Aug 2014 00:18:14 +0200
Subject: [PATCH 100/248] Read sampler from attributes.

---
 data/shaders/instanced_grass.vert           |  10 ++
 data/shaders/instanced_grass_pass2.frag     |  45 +++++++++
 data/shaders/instanced_normalmap.frag       |  35 +++++++
 data/shaders/instanced_object_pass.vert     |  13 +++
 data/shaders/instanced_object_pass1.frag    |  23 +++++
 data/shaders/instanced_object_pass2.frag    |  24 +++++
 data/shaders/instanced_objectref_pass1.frag |  25 +++++
 data/shaders/instanced_objectref_pass2.frag |  26 +++++
 data/shaders/instanced_shadow.geom          |  28 ++++++
 data/shaders/instanced_shadowref.frag       |  21 ++++
 data/shaders/instanciedgrassshadow.vert     |  16 +++
 data/shaders/instanciedshadow.vert          |  16 +++
 src/graphics/glwrap.cpp                     |  12 +++
 src/graphics/glwrap.hpp                     |   1 +
 src/graphics/render_geometry.cpp            | 104 ++++++--------------
 src/graphics/shaders.cpp                    |  28 +++---
 src/graphics/shaders.hpp                    |   4 +-
 src/graphics/stkinstancedscenenode.cpp      |  74 +++++++++-----
 src/graphics/stkinstancedscenenode.hpp      |   2 +-
 19 files changed, 388 insertions(+), 119 deletions(-)
 create mode 100644 data/shaders/instanced_grass_pass2.frag
 create mode 100644 data/shaders/instanced_normalmap.frag
 create mode 100644 data/shaders/instanced_object_pass1.frag
 create mode 100644 data/shaders/instanced_object_pass2.frag
 create mode 100644 data/shaders/instanced_objectref_pass1.frag
 create mode 100644 data/shaders/instanced_objectref_pass2.frag
 create mode 100644 data/shaders/instanced_shadow.geom
 create mode 100644 data/shaders/instanced_shadowref.frag

diff --git a/data/shaders/instanced_grass.vert b/data/shaders/instanced_grass.vert
index 803fa7f92..b65a08d1f 100644
--- a/data/shaders/instanced_grass.vert
+++ b/data/shaders/instanced_grass.vert
@@ -9,6 +9,10 @@ layout(location = 3) in vec2 Texcoord;
 layout(location = 7) in vec3 Origin;
 layout(location = 8) in vec3 Orientation;
 layout(location = 9) in vec3 Scale;
+#ifdef GL_ARB_bindless_texture
+layout(location = 10) in sampler2D Handle;
+#endif
+
 #else
 in vec3 Position;
 in vec3 Normal;
@@ -22,6 +26,9 @@ in vec3 Scale;
 
 out vec3 nor;
 out vec2 uv;
+#ifdef GL_ARB_bindless_texture
+flat out sampler2D handle;
+#endif
 
 mat4 getWorldMatrix(vec3 translation, vec3 rotation, vec3 scale);
 mat4 getInverseWorldMatrix(vec3 translation, vec3 rotation, vec3 scale);
@@ -33,4 +40,7 @@ void main()
     gl_Position = ProjectionMatrix * ViewMatrix *  ModelMatrix * vec4(Position, 1.);
     nor = (TransposeInverseModelView * vec4(Normal, 0.)).xyz;
     uv = Texcoord;
+#ifdef GL_ARB_bindless_texture
+    handle = Handle;
+#endif
 }
diff --git a/data/shaders/instanced_grass_pass2.frag b/data/shaders/instanced_grass_pass2.frag
new file mode 100644
index 000000000..f3134047d
--- /dev/null
+++ b/data/shaders/instanced_grass_pass2.frag
@@ -0,0 +1,45 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D dtex;
+#else
+uniform sampler2D Albedo;
+uniform sampler2D dtex;
+#endif
+
+uniform vec3 SunDir;
+
+#ifdef GL_ARB_bindless_texture
+flat in sampler2D handle;
+#endif
+in vec3 nor;
+in vec2 uv;
+out vec4 FragColor;
+
+vec3 getLightFactor(float specMapValue);
+
+void main(void)
+{
+    vec2 texc = gl_FragCoord.xy / screen;
+    float z = texture(dtex, texc).x;
+
+    vec4 xpos = 2.0 * vec4(texc, z, 1.0) - 1.0f;
+    xpos = InverseProjectionMatrix * xpos;
+    xpos /= xpos.w;
+    vec3 eyedir = normalize(xpos.xyz);
+
+    // Inspired from http://http.developer.nvidia.com/GPUGems3/gpugems3_ch16.html
+    float fEdotL = max(0., dot(SunDir, eyedir));
+    float fPowEdotL = pow(fEdotL, 4.);
+
+    float fLdotNBack  = max(0., - dot(nor, SunDir) * 0.6 + 0.4);
+    float scattering = mix(fPowEdotL, fLdotNBack, .5);
+
+#ifdef GL_ARB_bindless_texture
+    vec4 color = texture(handle, uv);
+    color.xyz = pow(color.xyz, vec3(2.2));
+#else
+    vec4 color = texture(Albedo, uv);
+#endif
+    if (color.a < 0.5) discard;
+    vec3 LightFactor = (scattering * 0.3) + getLightFactor(1.);
+    FragColor = vec4(color.xyz * LightFactor, 1.);
+}
diff --git a/data/shaders/instanced_normalmap.frag b/data/shaders/instanced_normalmap.frag
new file mode 100644
index 000000000..4b4ecadcd
--- /dev/null
+++ b/data/shaders/instanced_normalmap.frag
@@ -0,0 +1,35 @@
+#ifndef GL_ARB_bindless_texture
+uniform sampler2D normalMap;
+uniform sampler2D DiffuseForAlpha;
+#endif
+
+#ifdef GL_ARB_bindless_texture
+flat in sampler2D handle;
+flat in sampler2D secondhandle;
+#endif
+in vec3 tangent;
+in vec3 bitangent;
+in vec2 uv;
+out vec3 EncodedNormal;
+
+vec2 EncodeNormal(vec3 n);
+
+void main()
+{
+    // normal in Tangent Space
+#ifdef GL_ARB_bindless_texture
+    vec3 TS_normal = 2.0 * texture(secondhandle, uv).rgb - 1.0;
+    float alpha = texture(handle, uv).a;
+#else
+    vec3 TS_normal = 2.0 * texture(normalMap, uv).rgb - 1.0;
+    float alpha = texture(DiffuseForAlpha, uv).a;
+#endif
+    // Because of interpolation, we need to renormalize
+    vec3 Frag_tangent = normalize(tangent);
+    vec3 Frag_normal = normalize(cross(Frag_tangent, bitangent));
+    vec3 Frag_bitangent = cross(Frag_normal, Frag_tangent);
+
+    vec3 FragmentNormal = TS_normal.x * Frag_tangent + TS_normal.y * Frag_bitangent - TS_normal.z * Frag_normal;
+    EncodedNormal.xy = 0.5 * EncodeNormal(normalize(FragmentNormal)) + 0.5;
+    EncodedNormal.z = exp2(10. * (1. - alpha) + 1.);
+}
diff --git a/data/shaders/instanced_object_pass.vert b/data/shaders/instanced_object_pass.vert
index f83c7f7b5..eb8a9e018 100644
--- a/data/shaders/instanced_object_pass.vert
+++ b/data/shaders/instanced_object_pass.vert
@@ -9,6 +9,11 @@ layout(location = 6) in vec3 Bitangent;
 layout(location = 7) in vec3 Origin;
 layout(location = 8) in vec3 Orientation;
 layout(location = 9) in vec3 Scale;
+#ifdef GL_ARB_bindless_texture
+layout(location = 10) in sampler2D Handle;
+layout(location = 11) in sampler2D SecondHandle;
+#endif
+
 #else
 in vec3 Position;
 in vec3 Normal;
@@ -27,6 +32,10 @@ out vec3 tangent;
 out vec3 bitangent;
 out vec2 uv;
 out vec4 color;
+#ifdef GL_ARB_bindless_texture
+flat out sampler2D handle;
+flat out sampler2D secondhandle;
+#endif
 
 mat4 getWorldMatrix(vec3 translation, vec3 rotation, vec3 scale);
 mat4 getInverseWorldMatrix(vec3 translation, vec3 rotation, vec3 scale);
@@ -41,4 +50,8 @@ void main(void)
     bitangent = (TransposeInverseModelView * vec4(Bitangent, 1.)).xyz;
     uv = Texcoord;
     color = Color.zyxw;
+#ifdef GL_ARB_bindless_texture
+    handle = Handle;
+    secondhandle = SecondHandle;
+#endif
 }
diff --git a/data/shaders/instanced_object_pass1.frag b/data/shaders/instanced_object_pass1.frag
new file mode 100644
index 000000000..fc04aa63f
--- /dev/null
+++ b/data/shaders/instanced_object_pass1.frag
@@ -0,0 +1,23 @@
+#ifndef GL_ARB_bindless_texture
+uniform sampler2D tex;
+#endif
+
+#ifdef GL_ARB_bindless_texture
+flat in sampler2D handle;
+#endif
+in vec3 nor;
+in vec2 uv;
+out vec3 EncodedNormal;
+
+vec2 EncodeNormal(vec3 n);
+
+void main(void)
+{
+#ifdef GL_ARB_bindless_texture
+    vec4 col = texture(handle, uv);
+#else
+    vec4 col = texture(tex, uv);
+#endif
+    EncodedNormal.xy = 0.5 * EncodeNormal(normalize(nor)) + 0.5;
+    EncodedNormal.z = exp2(10. * (1. - col.a) + 1.);
+}
diff --git a/data/shaders/instanced_object_pass2.frag b/data/shaders/instanced_object_pass2.frag
new file mode 100644
index 000000000..6cb4296a8
--- /dev/null
+++ b/data/shaders/instanced_object_pass2.frag
@@ -0,0 +1,24 @@
+#ifndef GL_ARB_bindless_texture
+uniform sampler2D Albedo;
+#endif
+
+#ifdef GL_ARB_bindless_texture
+flat in sampler2D handle;
+#endif
+in vec2 uv;
+in vec4 color;
+out vec4 FragColor;
+
+vec3 getLightFactor(float specMapValue);
+
+void main(void)
+{
+#ifdef GL_ARB_bindless_texture
+    vec4 col = pow(texture(handle, uv), vec4(2.2));
+#else
+    vec4 col = texture(Albedo, uv);
+#endif
+    col.xyz *= pow(color.xyz, vec3(2.2));
+    vec3 LightFactor = getLightFactor(1.);
+    FragColor = vec4(col.xyz * LightFactor, 1.);
+}
diff --git a/data/shaders/instanced_objectref_pass1.frag b/data/shaders/instanced_objectref_pass1.frag
new file mode 100644
index 000000000..c24fcddf7
--- /dev/null
+++ b/data/shaders/instanced_objectref_pass1.frag
@@ -0,0 +1,25 @@
+#ifndef GL_ARB_bindless_texture
+uniform sampler2D tex;
+#endif
+
+#ifdef GL_ARB_bindless_texture
+flat in sampler2D handle;
+#endif
+in vec3 nor;
+in vec2 uv;
+out vec3 EncodedNormal;
+
+vec2 EncodeNormal(vec3 n);
+
+void main() {
+#ifdef GL_ARB_bindless_texture
+    vec4 col = texture(handle, uv);
+#else
+    vec4 col = texture(tex, uv);
+#endif
+    if (col.a < 0.5)
+        discard;
+    EncodedNormal.xy = 0.5 * EncodeNormal(normalize(nor)) + 0.5;
+    EncodedNormal.z = 1.;
+}
+
diff --git a/data/shaders/instanced_objectref_pass2.frag b/data/shaders/instanced_objectref_pass2.frag
new file mode 100644
index 000000000..27d1bd03d
--- /dev/null
+++ b/data/shaders/instanced_objectref_pass2.frag
@@ -0,0 +1,26 @@
+#ifndef GL_ARB_bindless_texture
+uniform sampler2D Albedo;
+#endif
+
+#ifdef GL_ARB_bindless_texture
+flat in sampler2D handle;
+#endif
+in vec2 uv;
+in vec4 color;
+out vec4 FragColor;
+
+vec3 getLightFactor(float specMapValue);
+
+void main(void)
+{
+#ifdef GL_ARB_bindless_texture
+    vec4 col = texture(handle, uv);
+    col.xyz = pow(col.xyz, vec3(2.2));
+#else
+    vec4 col = texture(Albedo, uv);
+#endif
+    col.xyz *= pow(color.xyz, vec3(2.2));
+    if (col.a * color.a < 0.5) discard;
+    vec3 LightFactor = getLightFactor(1.);
+    FragColor = vec4(col.xyz * LightFactor, 1.);
+}
diff --git a/data/shaders/instanced_shadow.geom b/data/shaders/instanced_shadow.geom
new file mode 100644
index 000000000..1ecc55a46
--- /dev/null
+++ b/data/shaders/instanced_shadow.geom
@@ -0,0 +1,28 @@
+layout(triangles) in;
+layout(triangle_strip, max_vertices=3) out;
+
+#ifdef GL_ARB_bindless_texture
+flat in sampler2D hdle[3];
+#endif
+in vec2 tc[3];
+in int layerId[3];
+
+out vec2 uv;
+#ifdef GL_ARB_bindless_texture
+out flat sampler2D handle;
+#endif
+
+void main(void)
+{
+  gl_Layer = layerId[0];
+#ifdef GL_ARB_bindless_texture
+  handle = hdle[0];
+#endif
+  for(int i=0; i<3; i++)
+  {
+    uv = tc[i];
+    gl_Position = gl_in[i].gl_Position;
+    EmitVertex();
+  }
+  EndPrimitive();
+}
diff --git a/data/shaders/instanced_shadowref.frag b/data/shaders/instanced_shadowref.frag
new file mode 100644
index 000000000..7ed4ab3ae
--- /dev/null
+++ b/data/shaders/instanced_shadowref.frag
@@ -0,0 +1,21 @@
+#ifndef GL_ARB_bindless_texture
+uniform sampler2D tex;
+#endif
+
+#ifdef GL_ARB_bindless_texture
+flat in sampler2D handle;
+#endif
+in vec2 uv;
+in vec4 color;
+out vec4 FragColor;
+
+void main(void)
+{
+#ifdef GL_ARB_bindless_texture
+    vec4 col = texture(handle, uv);
+#else
+    vec4 col = texture(tex, uv);
+#endif
+    if (col.a < 0.5) discard;
+    FragColor = vec4(1.);
+}
diff --git a/data/shaders/instanciedgrassshadow.vert b/data/shaders/instanciedgrassshadow.vert
index d27f2e808..1a88fbf6a 100644
--- a/data/shaders/instanciedgrassshadow.vert
+++ b/data/shaders/instanciedgrassshadow.vert
@@ -7,6 +7,10 @@ layout(location = 3) in vec2 Texcoord;
 layout(location = 7) in vec3 Origin;
 layout(location = 8) in vec3 Orientation;
 layout(location = 9) in vec3 Scale;
+#ifdef GL_ARB_bindless_texture
+layout(location = 10) in sampler2D Handle;
+#endif
+
 #else
 in vec3 Position;
 in vec4 Color;
@@ -19,9 +23,15 @@ in vec3 Scale;
 
 #ifdef VSLayer
 out vec2 uv;
+#ifdef GL_ARB_bindless_texture
+flat out sampler2D handle;
+#endif
 #else
 out vec2 tc;
 out int layerId;
+#ifdef GL_ARB_bindless_texture
+flat out sampler2D hdle;
+#endif
 #endif
 
 mat4 getWorldMatrix(vec3 translation, vec3 rotation, vec3 scale);
@@ -34,9 +44,15 @@ void main(void)
     gl_Layer = gl_InstanceID & 3;
     gl_Position = ShadowViewProjMatrixes[gl_Layer] * ModelMatrix * vec4(Position + windDir * Color.r, 1.);
     uv = Texcoord;
+#ifdef GL_ARB_bindless_texture
+    handle = Handle;
+#endif
 #else
     layerId = gl_InstanceID & 3;
     gl_Position = ShadowViewProjMatrixes[layerId] * ModelMatrix * vec4(Position + windDir * Color.r, 1.);
     tc = Texcoord;
+#ifdef GL_ARB_bindless_texture
+    hdle = Handle;
+#endif
 #endif
 }
\ No newline at end of file
diff --git a/data/shaders/instanciedshadow.vert b/data/shaders/instanciedshadow.vert
index a9f5fc34d..0bfc9426b 100644
--- a/data/shaders/instanciedshadow.vert
+++ b/data/shaders/instanciedshadow.vert
@@ -5,6 +5,10 @@ layout(location = 3) in vec2 Texcoord;
 layout(location = 7) in vec3 Origin;
 layout(location = 8) in vec3 Orientation;
 layout(location = 9) in vec3 Scale;
+#ifdef GL_ARB_bindless_texture
+layout(location = 10) in sampler2D Handle;
+#endif
+
 #else
 in vec3 Position;
 in vec2 Texcoord;
@@ -16,9 +20,15 @@ in vec3 Scale;
 
 #ifdef VSLayer
 out vec2 uv;
+#ifdef GL_ARB_bindless_texture
+flat out sampler2D handle;
+#endif
 #else
 out vec2 tc;
 out int layerId;
+#ifdef GL_ARB_bindless_texture
+flat out sampler2D hdle;
+#endif
 #endif
 
 mat4 getWorldMatrix(vec3 translation, vec3 rotation, vec3 scale);
@@ -31,9 +41,15 @@ void main(void)
     gl_Layer = gl_InstanceID & 3;
     gl_Position = ShadowViewProjMatrixes[gl_Layer] * ModelMatrix * vec4(Position, 1.);
     uv = Texcoord;
+#ifdef GL_ARB_bindless_texture
+    handle = Handle;
+#endif
 #else
     layerId = gl_InstanceID & 3;
     gl_Position = ShadowViewProjMatrixes[layerId] * ModelMatrix * vec4(Position, 1.);
     tc = Texcoord;
+#ifdef GL_ARB_bindless_texture
+    hdle = Handle;
+#endif
 #endif
 }
\ No newline at end of file
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 3baa27d22..219e2f558 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -745,6 +745,12 @@ void VAOManager::regenerateInstancedVAO()
             glEnableVertexAttribArray(9);
             glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
             glVertexAttribDivisor(9, 1);
+            glEnableVertexAttribArray(10);
+            glVertexAttribIPointer(10, 2, GL_UNSIGNED_INT, sizeof(InstanceData), (GLvoid*)(9 * sizeof(float)));
+            glVertexAttribDivisor(10, 1);
+            glEnableVertexAttribArray(11);
+            glVertexAttribIPointer(11, 2, GL_UNSIGNED_INT, sizeof(InstanceData), (GLvoid*)(9 * sizeof(float) + 2 * sizeof(unsigned)));
+            glVertexAttribDivisor(11, 1);
             InstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(tp, (InstanceType) j)] = vao;
 
             GLuint shadow_vao = createVAO(vbo[tp], ibo[tp], tp);
@@ -759,6 +765,12 @@ void VAOManager::regenerateInstancedVAO()
             glEnableVertexAttribArray(9);
             glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
             glVertexAttribDivisor(9, 4);
+            glEnableVertexAttribArray(10);
+            glVertexAttribIPointer(10, 2, GL_UNSIGNED_INT, sizeof(InstanceData), (GLvoid*)(9 * sizeof(float)));
+            glVertexAttribDivisor(10, 4);
+            glEnableVertexAttribArray(11);
+            glVertexAttribIPointer(11, 2, GL_UNSIGNED_INT, sizeof(InstanceData), (GLvoid*)(9 * sizeof(float)+2 * sizeof(unsigned)));
+            glVertexAttribDivisor(11, 1);
             ShadowInstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(tp, (InstanceType)j)] = shadow_vao;
             glBindVertexArray(0);
         }
diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index c775bcebe..6d45bbba5 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -166,6 +166,7 @@ struct InstanceData
         float Z;
     } Scale;
     uint64_t Texture;
+    uint64_t SecondTexture;
 };
 
 class VAOManager : public Singleton<VAOManager>
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 1b3d01acb..20e6e4620 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -201,7 +201,6 @@ void renderInstancedMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vec
     glUseProgram(Shader::getInstance()->Program);
     for (unsigned i = 0; i < meshes->size(); i++)
     {
-        std::vector<uint64_t> Handles;
         std::vector<GLuint> Textures;
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
 #ifdef DEBUG
@@ -210,28 +209,17 @@ void renderInstancedMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vec
 #endif
         if (!irr_driver->hasARB_base_instance())
             glBindVertexArray(mesh.vao);
-        for (unsigned j = 0; j < TexUnits.size(); j++)
+        if (!UserConfigParams::m_bindless_textures)
         {
-            if (!mesh.textures[TexUnits[j].m_id])
-                mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-            compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
-            if (UserConfigParams::m_bindless_textures)
+            for (unsigned j = 0; j < TexUnits.size(); j++)
             {
-#ifdef Bindless_Texture_Support
-                if (!mesh.TextureHandles[TexUnits[j].m_id])
-                    mesh.TextureHandles[TexUnits[j].m_id] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[TexUnits[j].m_id]), Shader::getInstance()->SamplersId[j]);
-                if (!glIsTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]))
-                    glMakeTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]);
-#endif
-                Handles.push_back(mesh.TextureHandles[TexUnits[j].m_id]);
-            }
-            else
+                if (!mesh.textures[TexUnits[j].m_id])
+                    mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
+                compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
                 Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
-        }
-        if (UserConfigParams::m_bindless_textures)
-            Shader::getInstance()->SetTextureHandles(Handles);
-        else
+            }
             Shader::getInstance()->SetTextureUnits(Textures);
+        }
         instanced_custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
 }
@@ -363,16 +351,6 @@ void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
             }
             else
                 Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
-/*            if (irr_driver->getLightViz())
-            {
-                GLint swizzleMask[] = { GL_ONE, GL_ONE, GL_ONE, GL_ALPHA };
-                glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
-            }
-            else
-            {
-                GLint swizzleMask[] = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA };
-                glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
-            }*/
         }
 
         if (mesh.VAOType != VertexType)
@@ -402,40 +380,25 @@ void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vec
         if (!irr_driver->hasARB_base_instance())
             glBindVertexArray(mesh.vao);
 
-        std::vector<GLuint> Textures(Prefilled_tex);
-        std::vector<uint64_t> Handles(Prefilled_Handles);
-
-        for (unsigned j = 0; j < TexUnits.size(); j++)
-        {
-            if (!mesh.textures[TexUnits[j].m_id])
-                mesh.textures[TexUnits[j].m_id] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-            compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
-#ifdef Bindless_Texture_Support
-            if (!mesh.TextureHandles[TexUnits[j].m_id])
-                mesh.TextureHandles[TexUnits[j].m_id] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[TexUnits[j].m_id]), Shader::getInstance()->SamplersId[Handles.size()]);
-            if (!glIsTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]))
-                glMakeTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]);
-#endif
-            if (UserConfigParams::m_bindless_textures)
-                Handles.push_back(mesh.TextureHandles[TexUnits[j].m_id]);
-            else
-                Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
-/*            if (irr_driver->getLightViz())
-            {
-                GLint swizzleMask[] = { GL_ONE, GL_ONE, GL_ONE, GL_ALPHA };
-                glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
-            }
-            else
-            {
-                GLint swizzleMask[] = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA };
-                glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
-            }*/
-        }
-
         if (UserConfigParams::m_bindless_textures)
+        {
+            std::vector<uint64_t> Handles(Prefilled_Handles);
+            for (unsigned i = 0; i < TexUnits.size(); i++)
+                Handles.push_back(0);
             Shader::getInstance()->SetTextureHandles(Handles);
+        }
         else
-            Shader::getInstance()->SetTextureUnits(Textures);
+        {
+            std::vector<GLuint> Textures(Prefilled_tex);
+            for (unsigned j = 0; j < TexUnits.size(); j++)
+            {
+                if (!mesh.textures[TexUnits[j].m_id])
+                    mesh.textures[TexUnits[j].m_id] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
+                compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
+                Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
+                Shader::getInstance()->SetTextureUnits(Textures);
+            }
+        }
 
         instanced_custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
@@ -841,26 +804,15 @@ void renderInstancedShadow(const std::vector<GLuint> TextureUnits, const std::ve
         GLMesh *mesh = STK::tuple_get<0>(t->at(i));
         if (!irr_driver->hasARB_base_instance())
             glBindVertexArray(mesh->vao_shadow_pass);
-        for (unsigned j = 0; j < TextureUnits.size(); j++)
+        if (!UserConfigParams::m_bindless_textures)
         {
-            compressTexture(mesh->textures[TextureUnits[j]], true);
-            if (UserConfigParams::m_bindless_textures)
+            for (unsigned j = 0; j < TextureUnits.size(); j++)
             {
-#ifdef Bindless_Texture_Support
-                if (!mesh->TextureHandles[TextureUnits[j]])
-                    mesh->TextureHandles[TextureUnits[j]] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh->textures[TextureUnits[j]]), T::getInstance()->SamplersId[j]);
-                if (!glIsTextureHandleResidentARB(mesh->TextureHandles[TextureUnits[j]]))
-                    glMakeTextureHandleResidentARB(mesh->TextureHandles[TextureUnits[j]]);
-#endif
-                Handles.push_back(mesh->TextureHandles[TextureUnits[j]]);
-            }
-            else
+                compressTexture(mesh->textures[TextureUnits[j]], true);
                 Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
+                T::getInstance()->SetTextureUnits(Textures);
+            }
         }
-        if (UserConfigParams::m_bindless_textures)
-            T::getInstance()->SetTextureHandles(Handles);
-        else
-            T::getInstance()->SetTextureUnits(Textures);
         instanced_shadow_custom_unroll_args<List...>::template exec<T>(T::getInstance(), t->at(i));
     }
 }
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index dc357c07f..968642db9 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -818,7 +818,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_pass1.frag").c_str());
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_object_pass1.frag").c_str());
 
         AssignUniforms();
         AssignSamplerNames(Program, 0, "tex");
@@ -833,7 +833,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectref_pass1.frag").c_str());
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_objectref_pass1.frag").c_str());
 
         AssignUniforms();
         AssignSamplerNames(Program, 0, "tex");
@@ -848,7 +848,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_grass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectref_pass1.frag").c_str());
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_objectref_pass1.frag").c_str());
         AssignUniforms("windDir");
 
         AssignSamplerNames(Program, 0, "tex");
@@ -863,7 +863,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/normalmap.frag").c_str());
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_normalmap.frag").c_str());
         AssignUniforms();
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
@@ -893,7 +893,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_pass2.frag").c_str());
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_object_pass2.frag").c_str());
         AssignUniforms();
 
         AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo");
@@ -909,7 +909,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectref_pass2.frag").c_str());
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_objectref_pass2.frag").c_str());
         AssignUniforms();
 
         AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo");
@@ -975,7 +975,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_grass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/grass_pass2.frag").c_str());
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_grass_pass2.frag").c_str());
         AssignUniforms("windDir", "SunDir");
 
         AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "dtex", 4, "Albedo");
@@ -1158,7 +1158,7 @@ namespace MeshShader
             Program = LoadProgram(
                 GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
                 GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanciedshadow.vert").c_str(),
-                GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/shadow.geom").c_str(),
+                GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/instanced_shadow.geom").c_str(),
                 GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/white.frag").c_str());
         }
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
@@ -1200,15 +1200,15 @@ namespace MeshShader
             Program = LoadProgram(
                 GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
                 GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanciedshadow.vert").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_unlit.frag").c_str());
+                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_shadowref.frag").c_str());
         }
         else
         {
             Program = LoadProgram(
                 GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
                 GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanciedshadow.vert").c_str(),
-                GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/shadow.geom").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_unlit.frag").c_str());
+                GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/instanced_shadow.geom").c_str(),
+                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_shadowref.frag").c_str());
         }
 
         AssignSamplerNames(Program, 0, "tex");
@@ -1251,15 +1251,15 @@ namespace MeshShader
             Program = LoadProgram(
                 GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
                 GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanciedgrassshadow.vert").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_unlit.frag").c_str());
+                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_shadowref.frag").c_str());
         }
         else
         {
             Program = LoadProgram(
                 GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
                 GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanciedgrassshadow.vert").c_str(),
-                GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/shadow.geom").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_unlit.frag").c_str());
+                GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/instanced_shadow.geom").c_str(),
+                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_shadowref.frag").c_str());
         }
 
         AssignSamplerNames(Program, 0, "tex");
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 33ae728f9..ce4481cb9 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -439,10 +439,12 @@ public:
 
     void SetTextureHandles(const std::vector<uint64_t> &args)
     {
+        assert(args.size() == TextureLocation.size() && "Wrong Handle count");
         for (unsigned i = 0; i < args.size(); i++)
         {
 #ifdef Bindless_Texture_Support
-            glUniformHandleui64ARB(TextureLocation[i], args[i]);
+            if (args[i])
+                glUniformHandleui64ARB(TextureLocation[i], args[i]);
 #endif
         }
     }
diff --git a/src/graphics/stkinstancedscenenode.cpp b/src/graphics/stkinstancedscenenode.cpp
index f12e27be7..ff0c7384a 100644
--- a/src/graphics/stkinstancedscenenode.cpp
+++ b/src/graphics/stkinstancedscenenode.cpp
@@ -57,6 +57,7 @@ void STKInstancedSceneNode::createGLMeshes()
             mesh.vaoBaseVertex = p.first;
             mesh.vaoOffset = p.second;
             mesh.VAOType = mb->getVertexType();
+            instanceData.push_back(std::vector<InstanceData>());
         }
         else
             fillLocalBuffer(mesh, mb);
@@ -66,9 +67,7 @@ void STKInstancedSceneNode::createGLMeshes()
 
 void STKInstancedSceneNode::initinstancedvaostate(GLMesh &mesh)
 {
-    if (irr_driver->hasARB_base_instance())
-        mesh.vaoBaseInstance = VAOManager::getInstance()->appendInstance(InstanceTypeDefault, instanceData);
-    else
+    if (!irr_driver->hasARB_base_instance())
     {
         mesh.vao = createVAO(mesh.vertex_buffer, mesh.index_buffer, getVTXTYPEFromStride(mesh.Stride));
         glGenBuffers(1, &instances_vbo);
@@ -115,6 +114,7 @@ void STKInstancedSceneNode::setFirstTimeMaterial()
         GLMesh &mesh = GLmeshes[i];
         MeshMaterial MatType = MaterialTypeToMeshMaterial(type, mb->getVertexType());
         initinstancedvaostate(mesh);
+        mesh.vaoBaseInstance = VAOManager::getInstance()->appendInstance(InstanceTypeDefault, instanceData[i]);
         MeshSolidMaterial[MatType].push_back(&mesh);
     }
     isMaterialInitialized = true;
@@ -122,32 +122,53 @@ void STKInstancedSceneNode::setFirstTimeMaterial()
 
 void STKInstancedSceneNode::addInstance(const core::vector3df &origin, const core::vector3df &orientation, const core::vector3df &scale)
 {
-    InstanceData instance = {
+    for (unsigned i = 0; i < GLmeshes.size(); i++)
+    {
+        GLMesh &mesh = GLmeshes[i];
+#ifdef Bindless_Texture_Support
+        if (UserConfigParams::m_bindless_textures)
         {
-            origin.X,
-            origin.Y,
-            origin.Z
-        },
-        {
-            orientation.X,
-            orientation.Y,
-            orientation.Z
-        },
-        {
-            scale.X,
-            scale.Y,
-            scale.Z
-        },
-        0
-    };
-    instanceData.push_back(instance);
+            for (unsigned j = 0; j < 2; j++)
+            {
+                if (!mesh.textures[j])
+                    mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
+                compressTexture(mesh.textures[j], true);
+
+                if (!mesh.TextureHandles[j])
+                    mesh.TextureHandles[j] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[j]), MeshShader::InstancedNormalMapShader::getInstance()->SamplersId[j]);
+                if (!glIsTextureHandleResidentARB(mesh.TextureHandles[j]))
+                    glMakeTextureHandleResidentARB(mesh.TextureHandles[j]);
+            }
+        }
+#endif
+        InstanceData instance = {
+            {
+                origin.X,
+                origin.Y,
+                origin.Z
+            },
+            {
+                orientation.X,
+                orientation.Y,
+                orientation.Z
+            },
+            {
+                scale.X,
+                scale.Y,
+                scale.Z
+            },
+            mesh.TextureHandles[0],
+            mesh.TextureHandles[1]
+        };
+        instanceData[i].push_back(instance);
+    }
 }
 
 core::matrix4 STKInstancedSceneNode::getInstanceTransform(int id)
 {
     core::matrix4 mat;
 
-    const InstanceData &instance = instanceData[id];
+    const InstanceData &instance = instanceData[0][id];
     mat.setTranslation(core::vector3df(
         instance.Origin.X,
         instance.Origin.Y,
@@ -174,17 +195,16 @@ void STKInstancedSceneNode::render()
 
     setFirstTimeMaterial();
 
-    
     for(unsigned i = 0; i < MeshSolidMaterial[MAT_DEFAULT].size(); i++)
     {
         GLMesh *mesh = MeshSolidMaterial[MAT_DEFAULT][i];
-        ListInstancedMatDefault::getInstance()->push_back(STK::make_tuple(mesh, instanceData.size()));
+        ListInstancedMatDefault::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
     }
 
     for(unsigned i = 0; i < MeshSolidMaterial[MAT_ALPHA_REF].size(); i++)
     {
         GLMesh *mesh = MeshSolidMaterial[MAT_ALPHA_REF][i];
-        ListInstancedMatAlphaRef::getInstance()->push_back(STK::make_tuple(mesh, instanceData.size()));
+        ListInstancedMatAlphaRef::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
     }
 
     windDir = getWind();
@@ -192,12 +212,12 @@ void STKInstancedSceneNode::render()
     for(unsigned i = 0; i < MeshSolidMaterial[MAT_GRASS].size(); i++)
     {
         GLMesh *mesh = MeshSolidMaterial[MAT_GRASS][i];
-        ListInstancedMatGrass::getInstance()->push_back(STK::make_tuple(mesh, instanceData.size(), windDir, cb->getPosition()));
+        ListInstancedMatGrass::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size(), windDir, cb->getPosition()));
     }
 
     for(unsigned i = 0; i < MeshSolidMaterial[MAT_NORMAL_MAP].size(); i++)
     {
         GLMesh *mesh = MeshSolidMaterial[MAT_NORMAL_MAP][i];
-        ListInstancedMatNormalMap::getInstance()->push_back(STK::make_tuple(mesh, instanceData.size()));
+        ListInstancedMatNormalMap::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
     }
 }
diff --git a/src/graphics/stkinstancedscenenode.hpp b/src/graphics/stkinstancedscenenode.hpp
index 35a38d8b1..c6787a02f 100644
--- a/src/graphics/stkinstancedscenenode.hpp
+++ b/src/graphics/stkinstancedscenenode.hpp
@@ -22,7 +22,7 @@ protected:
     int m_ref_count;
     std::vector<GLMesh *> MeshSolidMaterial[MAT_COUNT];
     std::vector<GLMesh> GLmeshes;
-    std::vector<InstanceData> instanceData;
+    std::vector<std::vector<InstanceData> > instanceData;
     core::matrix4 ModelViewProjectionMatrix, TransposeInverseModelView;
     GLuint instances_vbo;
     void createGLMeshes();

From 0fa38161b54cc0b8d614590654fadfb790491dba Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sun, 24 Aug 2014 21:57:56 +0200
Subject: [PATCH 101/248] Install icons in $PREFIX/share/icons/hicolor path.

Don't use static paths in .desktop file. Actually I don't know about any application which uses it :P
---
 CMakeLists.txt                                            | 8 +++-----
 ...supertuxkart_desktop.template => supertuxkart.desktop} | 5 ++---
 2 files changed, 5 insertions(+), 8 deletions(-)
 rename data/{supertuxkart_desktop.template => supertuxkart.desktop} (66%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16759b88f..0c447a46d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -368,10 +368,8 @@ install(DIRECTORY ${STK_DATA_DIR} DESTINATION ${STK_INSTALL_DATA_DIR} PATTERN ".
 if(STK_ASSETS_DIR AND CHECK_ASSETS)
   install(DIRECTORY ${STK_ASSETS_DIR} DESTINATION ${STK_INSTALL_DATA_DIR}/data PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE)
 endif()
-install(FILES ${PROJECT_BINARY_DIR}/supertuxkart.desktop DESTINATION share/applications)
+install(FILES ${STK_DATA_DIR}/supertuxkart.desktop DESTINATION share/applications)
+install(FILES data/supertuxkart_32.png DESTINATION share/icons/hicolor/32x32 RENAME supertuxkart.png)
+install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128 RENAME supertuxkart.png)
 install(FILES data/supertuxkart_32.png data/supertuxkart_128.png DESTINATION share/pixmaps)
 install(FILES data/supertuxkart.appdata DESTINATION share/appdata)
-
-set(PREFIX ${CMAKE_INSTALL_PREFIX})
-configure_file(data/supertuxkart_desktop.template supertuxkart.desktop)
-add_dependencies(supertuxkart supertuxkart.desktop)
diff --git a/data/supertuxkart_desktop.template b/data/supertuxkart.desktop
similarity index 66%
rename from data/supertuxkart_desktop.template
rename to data/supertuxkart.desktop
index 789b21442..034f20da6 100644
--- a/data/supertuxkart_desktop.template
+++ b/data/supertuxkart.desktop
@@ -1,15 +1,14 @@
 [Desktop Entry]
 Name=SuperTuxKart
-Icon=@PREFIX@/share/pixmaps/supertuxkart_128.png
+Icon=supertuxkart
 GenericName=A kart racing game
 GenericName[de]=Ein Kart-Rennspiel
 GenericName[fr]=Un jeu de karting
 GenericName[gl]=Xogo de carreiras con karts
 GenericName[pl]=Wyścigi gokartów
 GenericName[ro]=Un joc de curse cu carturi
-Exec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart --no-console
+Exec=supertuxkart
 Terminal=false
 StartupNotify=false
 Type=Application
-TryExec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart
 Categories=Game;ArcadeGame;

From aa6e3570dfcc4f10430855664b7e56dff4660f28 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Mon, 25 Aug 2014 00:37:36 +0200
Subject: [PATCH 102/248] Fix attempt for crash.

---
 src/graphics/stkinstancedscenenode.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/stkinstancedscenenode.hpp b/src/graphics/stkinstancedscenenode.hpp
index c6787a02f..d3fe05b32 100644
--- a/src/graphics/stkinstancedscenenode.hpp
+++ b/src/graphics/stkinstancedscenenode.hpp
@@ -40,7 +40,7 @@ public:
     virtual void render();
     void addInstance(const core::vector3df &origin, const core::vector3df &orientation, const core::vector3df &scale);
 
-    int getInstanceCount() const { return instanceData.size(); }
+    int getInstanceCount() const { return instanceData[0].size(); }
 
     core::matrix4 getInstanceTransform(int id);
 

From b401d1e082e0b1f330633b61d4018805e573bd82 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Mon, 25 Aug 2014 01:09:52 +0200
Subject: [PATCH 103/248] Push empty InstanceData independently of gl level

---
 src/graphics/stkinstancedscenenode.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/stkinstancedscenenode.cpp b/src/graphics/stkinstancedscenenode.cpp
index ff0c7384a..f286e229c 100644
--- a/src/graphics/stkinstancedscenenode.cpp
+++ b/src/graphics/stkinstancedscenenode.cpp
@@ -57,10 +57,10 @@ void STKInstancedSceneNode::createGLMeshes()
             mesh.vaoBaseVertex = p.first;
             mesh.vaoOffset = p.second;
             mesh.VAOType = mb->getVertexType();
-            instanceData.push_back(std::vector<InstanceData>());
         }
         else
             fillLocalBuffer(mesh, mb);
+        instanceData.push_back(std::vector<InstanceData>());
     }
     isMaterialInitialized = false;
 }

From 44de38bf107a1392934ea98ebf3962f6560099b1 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sat, 23 Aug 2014 21:35:50 +0200
Subject: [PATCH 104/248] Pack instanceData

---
 src/graphics/glwrap.hpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index 6d45bbba5..62f192864 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -145,6 +145,9 @@ enum InstanceType
     InstanceTypeCount,
 };
 
+#ifdef WIN32
+#pragma pack(push, 1)
+#endif
 struct InstanceData
 {
     struct
@@ -167,7 +170,12 @@ struct InstanceData
     } Scale;
     uint64_t Texture;
     uint64_t SecondTexture;
+#ifdef WIN32
 };
+#pragma pack(pop)
+#else
+} __attribute__((packed));
+#endif
 
 class VAOManager : public Singleton<VAOManager>
 {

From f3752a03f0745c86442722b75ba3365e4be1c126 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Mon, 25 Aug 2014 01:53:05 +0200
Subject: [PATCH 105/248] Enable arb debug output on all non apple platform

---
 src/graphics/glwrap.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 219e2f558..031b08ef4 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -108,7 +108,7 @@ PFNGLVERTEXATTRIBLPOINTERPROC glVertexAttribLPointer;
 static bool is_gl_init = false;
 
 #ifdef DEBUG
-#ifdef WIN32
+#if !defined(__APPLE__)
 #define ARB_DEBUG_OUTPUT
 #endif
 #endif

From 55346185d7ffaaeed5b803b301baa8cbf2d69ca1 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Mon, 25 Aug 2014 02:13:01 +0200
Subject: [PATCH 106/248] Fix instancing without base instance support

---
 src/graphics/stkinstancedscenenode.cpp | 9 +++++----
 src/graphics/stkinstancedscenenode.hpp | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/graphics/stkinstancedscenenode.cpp b/src/graphics/stkinstancedscenenode.cpp
index f286e229c..bfec20701 100644
--- a/src/graphics/stkinstancedscenenode.cpp
+++ b/src/graphics/stkinstancedscenenode.cpp
@@ -65,14 +65,14 @@ void STKInstancedSceneNode::createGLMeshes()
     isMaterialInitialized = false;
 }
 
-void STKInstancedSceneNode::initinstancedvaostate(GLMesh &mesh)
+void STKInstancedSceneNode::initinstancedvaostate(GLMesh &mesh, const std::vector<InstanceData> &instances)
 {
     if (!irr_driver->hasARB_base_instance())
     {
         mesh.vao = createVAO(mesh.vertex_buffer, mesh.index_buffer, getVTXTYPEFromStride(mesh.Stride));
         glGenBuffers(1, &instances_vbo);
         glBindBuffer(GL_ARRAY_BUFFER, instances_vbo);
-        glBufferData(GL_ARRAY_BUFFER, instanceData.size() * sizeof(InstanceData), instanceData.data(), GL_STATIC_DRAW);
+        glBufferData(GL_ARRAY_BUFFER, instances.size() * sizeof(InstanceData), instances.data(), GL_STATIC_DRAW);
 
         glEnableVertexAttribArray(7);
         glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
@@ -113,8 +113,9 @@ void STKInstancedSceneNode::setFirstTimeMaterial()
 
         GLMesh &mesh = GLmeshes[i];
         MeshMaterial MatType = MaterialTypeToMeshMaterial(type, mb->getVertexType());
-        initinstancedvaostate(mesh);
-        mesh.vaoBaseInstance = VAOManager::getInstance()->appendInstance(InstanceTypeDefault, instanceData[i]);
+        initinstancedvaostate(mesh, instanceData[i]);
+        if (irr_driver->hasARB_base_instance())
+            mesh.vaoBaseInstance = VAOManager::getInstance()->appendInstance(InstanceTypeDefault, instanceData[i]);
         MeshSolidMaterial[MatType].push_back(&mesh);
     }
     isMaterialInitialized = true;
diff --git a/src/graphics/stkinstancedscenenode.hpp b/src/graphics/stkinstancedscenenode.hpp
index d3fe05b32..74dbc719d 100644
--- a/src/graphics/stkinstancedscenenode.hpp
+++ b/src/graphics/stkinstancedscenenode.hpp
@@ -28,7 +28,7 @@ protected:
     void createGLMeshes();
     bool isMaterialInitialized;
     void setFirstTimeMaterial();
-    void initinstancedvaostate(GLMesh &mesh);
+    void initinstancedvaostate(GLMesh &mesh, const std::vector<InstanceData> &);
     void cleanGL();
     core::vector3df windDir;
 public:

From 805d35a5e6d9f0b12fb1a810c44d9d34d83ddca3 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Mon, 25 Aug 2014 02:17:23 +0200
Subject: [PATCH 107/248] Do not draw twice the second pass instanced mesh

---
 src/graphics/stkinstancedscenenode.cpp | 43 ++++++++++++++------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/graphics/stkinstancedscenenode.cpp b/src/graphics/stkinstancedscenenode.cpp
index bfec20701..3b7b8e225 100644
--- a/src/graphics/stkinstancedscenenode.cpp
+++ b/src/graphics/stkinstancedscenenode.cpp
@@ -196,29 +196,32 @@ void STKInstancedSceneNode::render()
 
     setFirstTimeMaterial();
 
-    for(unsigned i = 0; i < MeshSolidMaterial[MAT_DEFAULT].size(); i++)
+    if (irr_driver->getPhase() == SOLID_NORMAL_AND_DEPTH_PASS || irr_driver->getPhase() == SHADOW_PASS)
     {
-        GLMesh *mesh = MeshSolidMaterial[MAT_DEFAULT][i];
-        ListInstancedMatDefault::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
-    }
+        for (unsigned i = 0; i < MeshSolidMaterial[MAT_DEFAULT].size(); i++)
+        {
+            GLMesh *mesh = MeshSolidMaterial[MAT_DEFAULT][i];
+            ListInstancedMatDefault::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
+        }
 
-    for(unsigned i = 0; i < MeshSolidMaterial[MAT_ALPHA_REF].size(); i++)
-    {
-        GLMesh *mesh = MeshSolidMaterial[MAT_ALPHA_REF][i];
-        ListInstancedMatAlphaRef::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
-    }
+        for (unsigned i = 0; i < MeshSolidMaterial[MAT_ALPHA_REF].size(); i++)
+        {
+            GLMesh *mesh = MeshSolidMaterial[MAT_ALPHA_REF][i];
+            ListInstancedMatAlphaRef::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
+        }
 
-    windDir = getWind();
-    SunLightProvider * const cb = (SunLightProvider *)irr_driver->getCallback(ES_SUNLIGHT);
-    for(unsigned i = 0; i < MeshSolidMaterial[MAT_GRASS].size(); i++)
-    {
-        GLMesh *mesh = MeshSolidMaterial[MAT_GRASS][i];
-        ListInstancedMatGrass::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size(), windDir, cb->getPosition()));
-    }
+        windDir = getWind();
+        SunLightProvider * const cb = (SunLightProvider *)irr_driver->getCallback(ES_SUNLIGHT);
+        for (unsigned i = 0; i < MeshSolidMaterial[MAT_GRASS].size(); i++)
+        {
+            GLMesh *mesh = MeshSolidMaterial[MAT_GRASS][i];
+            ListInstancedMatGrass::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size(), windDir, cb->getPosition()));
+        }
 
-    for(unsigned i = 0; i < MeshSolidMaterial[MAT_NORMAL_MAP].size(); i++)
-    {
-        GLMesh *mesh = MeshSolidMaterial[MAT_NORMAL_MAP][i];
-        ListInstancedMatNormalMap::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
+        for (unsigned i = 0; i < MeshSolidMaterial[MAT_NORMAL_MAP].size(); i++)
+        {
+            GLMesh *mesh = MeshSolidMaterial[MAT_NORMAL_MAP][i];
+            ListInstancedMatNormalMap::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
+        }
     }
 }

From bf23f31a10c7fbbe9b87d8a4dc618e4db09e3011 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 25 Aug 2014 10:33:29 +1000
Subject: [PATCH 108/248] Fixed typo.

---
 src/states_screens/dialogs/race_paused_dialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/states_screens/dialogs/race_paused_dialog.cpp b/src/states_screens/dialogs/race_paused_dialog.cpp
index 8da45da27..33c8adc15 100644
--- a/src/states_screens/dialogs/race_paused_dialog.cpp
+++ b/src/states_screens/dialogs/race_paused_dialog.cpp
@@ -103,7 +103,7 @@ void RacePausedDialog::onEnterPressedInternal()
 GUIEngine::EventPropagation
            RacePausedDialog::processEvent(const std::string& eventSource)
 {
-    GUIEngine::RibbonWidget* chocie_ribbon =
+    GUIEngine::RibbonWidget* choice_ribbon =
             getWidget<GUIEngine::RibbonWidget>("choiceribbon");
 
     if (eventSource == "backbtn")
@@ -115,7 +115,7 @@ GUIEngine::EventPropagation
     else if (eventSource == "choiceribbon")
     {
         const std::string& selection =
-            chocie_ribbon->getSelectionIDString(PLAYER_ID_GAME_MASTER);
+            choice_ribbon->getSelectionIDString(PLAYER_ID_GAME_MASTER);
 
         if (selection == "exit")
         {

From 0de942b5f334b9fd52401a4f40eedc7ffaa124f7 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 25 Aug 2014 10:40:37 +1000
Subject: [PATCH 109/248] Alpha version of a track info screen (instead of a
 dialog).

---
 data/gui/track_info.stkgui               |  94 +++++++
 src/states_screens/track_info_screen.cpp | 330 +++++++++++++++++++++++
 src/states_screens/track_info_screen.hpp |  85 ++++++
 3 files changed, 509 insertions(+)
 create mode 100644 data/gui/track_info.stkgui
 create mode 100644 src/states_screens/track_info_screen.cpp
 create mode 100644 src/states_screens/track_info_screen.hpp

diff --git a/data/gui/track_info.stkgui b/data/gui/track_info.stkgui
new file mode 100644
index 000000000..d79e550a5
--- /dev/null
+++ b/data/gui/track_info.stkgui
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+
+    <div x="1%" y="1%" width="98%" height="98%">
+        <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
+
+            <label id="name" width="100%" text_align="center"/>
+
+            <spacer width="1" height="5%"/>
+
+            <box width="95%" height="40%" padding="10" layout="horizontal-row">
+                    <!-- Left pane -->
+                    <div proportion="1" height="100%" layout="vertical-row">
+                        <label id="highscores" width="100%" text_align="center" text="= Highscores ="/>
+
+                        <spacer width="1" height="2%"/>
+
+                        <div width="95%" height="fit" layout="horizontal-row">
+                            <icon id="iconscore1" icon="gui/random_kart.png" width="font" height="font"/>
+                            <spacer width="2%" height="1"/>
+                            <label id="highscore1" proportion="1" text="(Empty)"/>
+                        </div>
+
+                        <spacer width="1" height="2%"/>
+
+                        <div width="95%" height="fit" layout="horizontal-row">
+                            <icon id="iconscore2" icon="gui/random_kart.png" width="font" height="font"/>
+                            <spacer width="2%" height="1"/>
+                            <label id="highscore2" proportion="1" text="(Empty)"/>
+                        </div>
+
+                        <spacer width="1" height="2%"/>
+
+                        <div width="95%" height="fit" layout="horizontal-row">
+                            <icon id="iconscore3" icon="gui/random_kart.png" width="font" height="font"/>
+                            <spacer width="2%" height="1"/>
+                            <label id="highscore3" proportion="1" text="(Empty)"/>
+                        </div>
+
+                        <spacer width="1" proportion="1"/>
+
+                        <label id="author" width="100%" text_align="center" word_wrap="true"/>
+                    </div>
+
+                    <!-- Right pane -->
+                    <div proportion="1" height="100%" layout="vertical-row">
+                        <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
+                        </placeholder>
+
+                    </div>
+            </box>
+            <spacer width="1" height="5%"/>
+            <box width="95%" height="25%" padding="10" layout="vertical-row">
+                <spacer width="1" height="5%"/>
+
+                <div width="75%" height="fit" layout="horizontal-row" >
+                    <spacer width="40" height="2" />
+                    <label id="lap-text" height="100%" width="40%" I18N="Number of laps" text="Number of laps"/>
+                    <spacer witdh="40" height="2" />
+                    <spinner id="lapcountspinner" width="20%" min_value="1" max_value="20" align="center"
+                             wrap_around="true" />
+                    <spacer proportion="1" height="2" />
+                </div>
+                <div width="75%" height="fit" layout="horizontal-row" >
+                    <spacer width="40" height="2" />
+                    <label id="karts-text" height="100%" width="40%" I18N="Number of AI karts" text="Number of AI karts"/>
+                    <spacer with="40" height="2" />
+                    <spinner id="kartcountspinner" width="20%" min_value="1" max_value="20" align="center"
+                             wrap_around="true" />
+                    <spacer proportion="1" height="2" />
+                </div>
+                <div width="75%" height="fit" layout="horizontal-row" >
+                    <spacer width="40" height="2" />
+                    <label id="reverse-text" height="100%" width="40%" I18N="Drive the track reverse" text="Drive in reverse"/>
+                    <spacer width="40" height="2" />
+                    <checkbox id="reverse"/>
+                    <spacer proportion="1" height="2" />
+                </div>
+                <spacer width="1" height="2%"/>
+            </box>
+            <spacer width="1" height="5%"/>
+            <buttonbar id="buttons" height="15%" width="100%" align="center">
+
+                <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
+                        I18N="Start race" text="Start Race"/>
+
+                <icon-button id="back" width="64" height="64" icon="gui/back.png"
+                        I18N="Back to previous screen" text="Back"/>
+            </buttonbar>>
+        </div>
+
+    </div>
+</stkgui>
diff --git a/src/states_screens/track_info_screen.cpp b/src/states_screens/track_info_screen.cpp
new file mode 100644
index 000000000..569477ca2
--- /dev/null
+++ b/src/states_screens/track_info_screen.cpp
@@ -0,0 +1,330 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2009-2014 Marianne Gagnon
+//                2014      Joerg Henrichs
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "states_screens/track_info_screen.hpp"
+
+#include "challenges/unlock_manager.hpp"
+#include "config/player_manager.hpp"
+#include "config/user_config.hpp"
+#include "graphics/irr_driver.hpp"
+#include "guiengine/engine.hpp"
+#include "guiengine/screen.hpp"
+#include "guiengine/widgets/button_widget.hpp"
+#include "guiengine/widgets/check_box_widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "guiengine/widgets/spinner_widget.hpp"
+#include "io/file_manager.hpp"
+#include "karts/kart_properties.hpp"
+#include "karts/kart_properties_manager.hpp"
+#include "race/highscores.hpp"
+#include "race/highscore_manager.hpp"
+#include "race/race_manager.hpp"
+#include "states_screens/state_manager.hpp"
+#include "states_screens/tracks_screen.hpp"
+#include "tracks/track.hpp"
+#include "tracks/track_manager.hpp"
+#include "utils/string_utils.hpp"
+#include "utils/translation.hpp"
+
+#include <IGUIEnvironment.h>
+#include <IGUIImage.h>
+#include <IGUIStaticText.h>
+
+using namespace irr::gui;
+using namespace irr::video;
+using namespace irr::core;
+using namespace GUIEngine;
+
+DEFINE_SCREEN_SINGLETON( TrackInfoScreen );
+
+// ------------------------------------------------------------------------------------------------------
+
+//TrackInfoScreen::TrackInfoScreen(const std::string& ribbonItem, const std::string& trackIdent,
+//                     const irr::core::stringw& trackName, ITexture* screenshot)
+TrackInfoScreen::TrackInfoScreen()
+          : Screen("track_info.stkgui")
+{
+}   // TrackInfoScreen
+
+// ----------------------------------------------------------------------------
+void TrackInfoScreen::setTrack(const Track *track)
+{
+    m_track = track;
+}   // setTrack
+
+// ----------------------------------------------------------------------------
+/** Initialised the display. The previous screen has to setup m_track before
+ *  pushing this screen using TrackInfoScreen::getInstance()->setTrack().
+ */
+void TrackInfoScreen::init()
+{
+    RaceManager::MinorRaceModeType minor = race_manager->getMinorMode();
+
+    const bool has_AI         = race_manager->hasAI(minor);
+    const bool has_laps       = race_manager->modeHasLaps();
+    const bool has_highscores = race_manager->modeHasHighscores();
+
+    getWidget<LabelWidget>("name")->setText(m_track->getName(), false);
+
+    //I18N: when showing who is the author of track '%s'
+    //I18N: (place %s where the name of the author should appear)
+    getWidget<LabelWidget>("author")->setText( _("Track by %s", m_track->getDesigner()),
+                                               false );
+
+    // ---- Track screenshot
+    Widget* screenshot_div = getWidget("screenshot_div");
+    IconButtonWidget* screenshot_widget = 
+        new IconButtonWidget(IconButtonWidget::SCALE_MODE_KEEP_CUSTOM_ASPECT_RATIO,
+                             false /* tab stop */, false /* focusable */);
+    // images are saved squared, but must be stretched to 4:
+    screenshot_widget->setCustomAspectRatio(4.0f / 3.0f);
+
+    screenshot_widget->m_x = screenshot_div->m_x;
+    screenshot_widget->m_y = screenshot_div->m_y;
+    screenshot_widget->m_w = screenshot_div->m_w;
+    screenshot_widget->m_h = screenshot_div->m_h;
+
+    // temporary icon, will replace it just after (but it will be shown if the given icon is not found)
+    screenshot_widget->m_properties[PROP_ICON] = "gui/main_help.png";
+    //FIXME screenshot_widget->setParent(m_irrlicht_window);
+    screenshot_widget->add();
+
+    ITexture* screenshot = irr_driver->getTexture(m_track->getScreenshotFile(),
+                                    "While loading screenshot for track '%s':",
+                                           m_track->getFilename()            );
+    if (screenshot != NULL)
+        screenshot_widget->setImage(screenshot);
+    m_widgets.push_back(screenshot_widget);
+
+    // Lap count m_lap_spinner
+    // -----------------------
+    if (has_laps)
+    {
+        m_lap_spinner = getWidget<SpinnerWidget>("lapcountspinner");
+        m_lap_spinner->setVisible(true);
+        getWidget<LabelWidget>("lap-text")->setVisible(true);
+        if (UserConfigParams::m_artist_debug_mode)
+            m_lap_spinner->setMin(0);
+
+        m_lap_spinner->setValue(m_track->getActualNumberOfLap());
+        race_manager->setNumLaps(m_lap_spinner->getValue());
+    }
+    else
+    {
+        getWidget<SpinnerWidget>("lapcountspinner")->setVisible(false);
+        getWidget<LabelWidget>("lap-text")->setVisible(false);
+        m_lap_spinner = NULL;
+    }
+
+    // Number of AIs
+    // -------------
+    if (has_AI)
+    {
+        m_ai_kart_spinner = getWidget<SpinnerWidget>("kartcountspinner");
+        m_ai_kart_spinner->setActivated();
+
+        // Avoid negative numbers (which can happen if e.g. the number of karts
+        // in a previous race was lower than the number of players now.
+        int num_ai = UserConfigParams::m_num_karts - race_manager->getNumLocalPlayers();
+        if (num_ai < 0) num_ai = 0;
+        m_ai_kart_spinner->setValue(num_ai);
+        m_ai_kart_spinner->setMax(stk_config->m_max_karts - race_manager->getNumLocalPlayers());
+        race_manager->setNumKarts(num_ai + race_manager->getNumLocalPlayers());
+    }
+    else
+    {
+        getWidget<SpinnerWidget>("kartcountspinner")->setVisible(false);
+        m_ai_kart_spinner = NULL;
+    }
+
+    // Reverse track
+    // -------------
+    const bool reverse_available = m_track->reverseAvailable() &&
+               race_manager->getMinorMode() != RaceManager::MINOR_MODE_EASTER_EGG;
+    if (reverse_available)
+    {
+        m_checkbox = getWidget<CheckBoxWidget>("reverse");
+        m_checkbox->setState(race_manager->getReverseTrack());
+    }
+    else
+    {
+        getWidget<CheckBoxWidget>("reverse")->setVisible(false);
+        getWidget<LabelWidget>("reverse-text")->setVisible(false);
+        m_checkbox = NULL;
+        race_manager->setReverseTrack(false);
+    }
+
+    // ---- High Scores
+    if (has_highscores)
+    {
+        m_kart_icons[0] = getWidget<IconButtonWidget>("iconscore1");
+        m_kart_icons[1] = getWidget<IconButtonWidget>("iconscore2");
+        m_kart_icons[2] = getWidget<IconButtonWidget>("iconscore3");
+
+        m_highscore_entries[0] = getWidget<LabelWidget>("highscore1");
+        m_highscore_entries[1] = getWidget<LabelWidget>("highscore2");
+        m_highscore_entries[2] = getWidget<LabelWidget>("highscore3");
+
+        updateHighScores();
+    }
+    else
+    {
+        getWidget<IconButtonWidget>("iconscore1")->setVisible(false);
+        getWidget<IconButtonWidget>("iconscore2")->setVisible(false);
+        getWidget<IconButtonWidget>("iconscore3")->setVisible(false);
+
+        getWidget<LabelWidget>("highscores")->setVisible(false);
+        getWidget<LabelWidget>("highscore1")->setVisible(false);
+        getWidget<LabelWidget>("highscore2")->setVisible(false);
+        getWidget<LabelWidget>("highscore3")->setVisible(false);
+    }
+
+    //FIXME getWidget<ButtonWidget>("start")->setFocusForPlayer( PLAYER_ID_GAME_MASTER );
+
+}   // TrackInfoScreen
+
+// ----------------------------------------------------------------------------
+
+TrackInfoScreen::~TrackInfoScreen()
+{
+}   // ~TrackInfoScreen
+
+// ----------------------------------------------------------------------------
+
+void TrackInfoScreen::updateHighScores()
+{
+    std::string game_mode_ident = RaceManager::getIdentOf( race_manager->getMinorMode() );
+    const Highscores::HighscoreType type = "HST_" + game_mode_ident;
+
+    Highscores* highscores =
+        highscore_manager->getHighscores(type,
+                                         race_manager->getNumberOfKarts(),
+                                         race_manager->getDifficulty(),
+                                         m_track->getIdent(),
+                                         race_manager->getNumLaps(),
+                                         race_manager->getReverseTrack()  );
+    const int amount = highscores->getNumberEntries();
+
+    std::string kart_name;
+    core::stringw name;
+    float time;
+
+    // fill highscore entries
+    for (int n=0; n<HIGHSCORE_COUNT; n++)
+    {
+        irr::core::stringw line;
+
+        // Check if this entry is filled or still empty
+        if (n < amount)
+        {
+            highscores->getEntry(n, kart_name, name, &time);
+
+            std::string time_string = StringUtils::timeToString(time);
+
+            const KartProperties* prop = kart_properties_manager->getKart(kart_name);
+            if (prop != NULL)
+            {
+                const std::string &icon_path = prop->getAbsoluteIconFile();
+                ITexture* kart_icon_texture = irr_driver->getTexture( icon_path );
+                m_kart_icons[n]->setImage(kart_icon_texture);
+            }
+            line = name + "\t" + core::stringw(time_string.c_str());
+        }
+        else
+        {
+            //I18N: for empty highscores entries
+            line = _("(Empty)");
+
+            ITexture* no_kart_texture = irr_driver->getTexture(
+                                 file_manager->getAsset(FileManager::GUI,
+                                                        "random_kart.png") );
+            m_kart_icons[n]->setImage(no_kart_texture);
+
+        }
+
+        m_highscore_entries[n]->setText( line.c_str(), false );
+
+    }
+}   // updateHighScores
+
+// ----------------------------------------------------------------------------
+
+void TrackInfoScreen::onEnterPressedInternal()
+{
+
+    // Create a copy of member variables we still need, since they will
+    // not be accessible after dismiss:
+    const int num_laps = (m_lap_spinner == NULL ? -1 : m_lap_spinner->getValue());
+    const bool reverse_track = m_checkbox == NULL ? false
+                                                  : m_checkbox->getState();
+   //FIXME m_track->setActualNumberOfLaps(num_laps);
+    race_manager->setReverseTrack(reverse_track);
+
+    // Disable accidentally unlocking of a challenge
+    PlayerManager::getCurrentPlayer()->setCurrentChallenge("");
+
+    race_manager->startSingleRace(m_track->getIdent(), num_laps, false);
+}   // onEnterPressedInternal
+
+// ----------------------------------------------------------------------------
+void TrackInfoScreen::eventCallback(Widget* widget, const std::string& name,
+                                   const int playerID)
+{
+    if (name == "buttons")
+    {
+        const std::string &button = getWidget<GUIEngine::RibbonWidget>("buttons")
+                                  ->getSelectionIDString(PLAYER_ID_GAME_MASTER);
+        if(button=="start")
+            onEnterPressedInternal();
+        else if(button=="back")
+            StateManager::get()->escapePressed();
+    }
+    else if (name == "back")
+    {
+        StateManager::get()->escapePressed();
+    }
+    else if (name == "reverse")
+    {
+        race_manager->setReverseTrack(m_checkbox->getState());
+        // Makes sure the highscores get swapped when clicking the 'reverse'
+        // checkbox.
+        if (race_manager->modeHasHighscores())
+        {
+            updateHighScores();
+        }
+    }
+    else if (name == "lapcountspinner")
+    {
+        assert(m_lap_spinner != NULL);
+        const int num_laps = m_lap_spinner->getValue();
+        race_manager->setNumLaps(num_laps);
+        UserConfigParams::m_num_laps = num_laps;
+        updateHighScores();
+    }
+    else if (name=="kartcountspinner")
+    {
+        SpinnerWidget* w = dynamic_cast<SpinnerWidget*>(widget);
+        race_manager->setNumKarts( race_manager->getNumLocalPlayers() + w->getValue() );
+        UserConfigParams::m_num_karts = race_manager->getNumLocalPlayers() + w->getValue();
+
+    }
+}   // eventCallback
+
+// ----------------------------------------------------------------------------
diff --git a/src/states_screens/track_info_screen.hpp b/src/states_screens/track_info_screen.hpp
new file mode 100644
index 000000000..64335d583
--- /dev/null
+++ b/src/states_screens/track_info_screen.hpp
@@ -0,0 +1,85 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2009-2014 Marianne Gagnon
+//                2014      Joerg Henrichs
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+#ifndef HEADER_TRACK_INFO_SCREEN_HPP
+#define HEADER_TRACK_INFO_SCREEN_HPP
+
+#include "guiengine/screen.hpp"
+
+//#include "guiengine/widgets/check_box_widget.hpp"
+
+
+namespace GUIEngine
+{
+    class CheckBoxWidget;
+    class IconButtonWidget;
+    class LabelWidget;
+    class SpinnerWidget;
+    class Widget;
+}
+class Track;
+
+/**
+ * \brief Dialog that shows the information about a given track
+ * \ingroup states_screens
+ */
+class TrackInfoScreen : public GUIEngine::Screen,
+                  public GUIEngine::ScreenSingleton<TrackInfoScreen>
+{
+    static const int HIGHSCORE_COUNT = 3;
+
+    /** A pointer to the track of which the info is shown. */
+    const Track *m_track;
+
+    // When there is no need to tab through / click on images/labels, we can add directly
+    // irrlicht labels (more complicated uses require the use of our widget set)
+    /** Spinner for number of laps. */
+    GUIEngine::SpinnerWidget* m_lap_spinner;
+
+    /** Spinner for number of AI karts. */
+    GUIEngine::SpinnerWidget* m_ai_kart_spinner;
+
+    /** */
+    GUIEngine::CheckBoxWidget* m_checkbox;
+    GUIEngine::IconButtonWidget* m_kart_icons[HIGHSCORE_COUNT];
+    GUIEngine::LabelWidget* m_highscore_entries[HIGHSCORE_COUNT];
+    
+    void updateHighScores();
+    
+public:
+    /**
+     * \brief Creates a track info modal dialog with given percentage of screen width and height
+     * \param ribbonItem identifier name of the ribbon item that was clicked in the track selection
+     *        screen to get there (often will be 'trackIdent' but may also be the random item)
+     * \param trackIdent identifier name of the track to show information about
+     * \param trackName  human-readable, possibly translated, name of the track to show information about
+     * \param screenshot screenshot of the track to show information about
+     */
+    TrackInfoScreen();
+    virtual ~TrackInfoScreen();
+    
+    virtual void init();
+    virtual void loadedFromFile() {}
+    virtual void eventCallback(GUIEngine::Widget *,const std::string &name ,
+                               const int player_id);
+    void onEnterPressedInternal();
+    void setTrack(const Track *track);
+};
+
+#endif

From c9936ffb97c66399c1769b94c91d0e531d081f51 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 25 Aug 2014 10:47:36 +1000
Subject: [PATCH 110/248] Forgot to actually add the new files :(

---
 data/gui/racesetup.stkgui                | 12 -----------
 sources.cmake                            |  2 +-
 src/states_screens/main_menu_screen.cpp  |  9 ++++++++
 src/states_screens/race_setup_screen.cpp | 27 ------------------------
 src/states_screens/tracks_screen.cpp     | 22 +++++--------------
 src/tracks/track.hpp                     |  3 ++-
 6 files changed, 17 insertions(+), 58 deletions(-)

diff --git a/data/gui/racesetup.stkgui b/data/gui/racesetup.stkgui
index fe940123f..83a619741 100644
--- a/data/gui/racesetup.stkgui
+++ b/data/gui/racesetup.stkgui
@@ -6,18 +6,6 @@
 
         <spacer proportion="1" width="25"/>
 
-        <div layout="horizontal-row" width="100%" height="50" align="center">
-            <bright proportion="1" height="100%"
-                    I18N="In race setup menu" text="Number of AI karts" text_align="right" />
-            <spacer width="50" height="25"/>
-            <!--
-            <spinner id="aikartamount" proportion="3" height="100%" min_value="0" max_value="8" icon="gui/karts%i.png"/> -->
-            <!-- The maximum is set by stk from data/stk_config.xml. -->
-            <spinner id="aikartamount" proportion="1" height="100%" min_value="0" wrap_around="true"/>
-        </div>
-
-        <spacer proportion="1" width="25"/>
-
         <ribbon id="difficulty" height="135" width="65%" align="center">
             <icon-button id="novice" width="128" height="128" icon="gui/difficulty_easy.png"
                     I18N="Difficulty" text="Novice"/>
diff --git a/sources.cmake b/sources.cmake
index d4f28ae4d..ba4868d71 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,5 +1,5 @@
 # Modify this file to change the last-modified date when you add/remove a file.
-# This will then trigger a new cmake run automatically.
+# This will then trigger a new cmake run automatically. 
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")
diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp
index 45a038b11..180eab769 100644
--- a/src/states_screens/main_menu_screen.cpp
+++ b/src/states_screens/main_menu_screen.cpp
@@ -45,6 +45,7 @@
 #include "states_screens/online_screen.hpp"
 #include "states_screens/options_screen_video.hpp"
 #include "states_screens/state_manager.hpp"
+#include "states_screens/track_info_screen.hpp"
 #include "states_screens/user_screen.hpp"
 #if DEBUG_MENU_ITEM
 #include "states_screens/feature_unlocked.hpp"
@@ -332,10 +333,18 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name,
 #endif
     if (selection == "new")
     {
+#undef XX
+#ifdef XX
+        Track *track = track_manager->getTrack("olivermath");
+        TrackInfoScreen *tis = TrackInfoScreen::getInstance();
+        tis->setTrack(track);
+        StateManager::get()->pushScreen(tis);
+#else
         KartSelectionScreen* s = OfflineKartSelectionScreen::getInstance(); //FIXME : that was for tests
         s->setMultiplayer(false);
         s->setFromOverworld(false);
         StateManager::get()->pushScreen( s );
+#endif
     }
     else if (selection == "multiplayer")
     {
diff --git a/src/states_screens/race_setup_screen.cpp b/src/states_screens/race_setup_screen.cpp
index 9e4a415ae..1553c6d42 100644
--- a/src/states_screens/race_setup_screen.cpp
+++ b/src/states_screens/race_setup_screen.cpp
@@ -142,12 +142,6 @@ void RaceSetupScreen::eventCallback(Widget* widget, const std::string& name, con
             unlock_manager->playLockSound();
         }
     }
-    else if (name == "aikartamount")
-    {
-        SpinnerWidget* w = dynamic_cast<SpinnerWidget*>(widget);
-        race_manager->setNumKarts( race_manager->getNumLocalPlayers() + w->getValue() );
-        UserConfigParams::m_num_karts = race_manager->getNumLocalPlayers() + w->getValue();
-    }
     else if (name == "back")
     {
         StateManager::get()->escapePressed();
@@ -209,16 +203,6 @@ void RaceSetupScreen::onGameModeChanged()
     RaceManager::MinorRaceModeType gamemode =
         RaceManager::getModeIDFromInternalName(gamemode_str);
 
-    // deactivate the AI karts count widget for modes for which we have no AI
-    SpinnerWidget* kartamount = getWidget<SpinnerWidget>("aikartamount");
-    if (!RaceManager::hasAI(gamemode))
-    {
-        kartamount->setDeactivated();
-    }
-    else
-    {
-        kartamount->setActivated();
-    }
 }   // onGameModeChanged
 
 // -----------------------------------------------------------------------------
@@ -240,17 +224,6 @@ void RaceSetupScreen::init()
         w->setSelection( UserConfigParams::m_difficulty, PLAYER_ID_GAME_MASTER );
     }
 
-    SpinnerWidget* kartamount = getWidget<SpinnerWidget>("aikartamount");
-    kartamount->setActivated();
-
-    // Avoid negative numbers (which can happen if e.g. the number of karts
-    // in a previous race was lower than the number of players now.
-    int num_ai = UserConfigParams::m_num_karts-race_manager->getNumLocalPlayers();
-    if(num_ai<0) num_ai = 0;
-    kartamount->setValue(num_ai);
-    kartamount->setMax(stk_config->m_max_karts - race_manager->getNumLocalPlayers() );
-    race_manager->setNumKarts(num_ai +  race_manager->getNumLocalPlayers());
-
     DynamicRibbonWidget* w2 = getWidget<DynamicRibbonWidget>("gamemode");
     assert( w2 != NULL );
     w2->clearItems();
diff --git a/src/states_screens/tracks_screen.cpp b/src/states_screens/tracks_screen.cpp
index 94f715553..8832a6902 100644
--- a/src/states_screens/tracks_screen.cpp
+++ b/src/states_screens/tracks_screen.cpp
@@ -28,9 +28,9 @@
 #include "race/grand_prix_data.hpp"
 #include "race/grand_prix_manager.hpp"
 #include "states_screens/state_manager.hpp"
+#include "states_screens/track_info_screen.hpp"
 #include "states_screens/dialogs/gp_info_dialog.hpp"
 #include "states_screens/dialogs/random_gp_dialog.hpp"
-#include "states_screens/dialogs/track_info_dialog.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_manager.hpp"
 #include "utils/translation.hpp"
@@ -81,14 +81,8 @@ void TracksScreen::eventCallback(Widget* widget, const std::string& name,
 
             if (clicked_track)
             {
-                ITexture* screenshot =
-                    irr_driver->getTexture(clicked_track->getScreenshotFile(),
-                                   "While loading screenshot for track '%s':",
-                                   clicked_track->getFilename()               );
-
-                new TrackInfoDialog(selection, clicked_track->getIdent(),
-                              translations->fribidize(clicked_track->getName()),
-                              screenshot, 0.8f, 0.7f);
+                TrackInfoScreen::getInstance()->setTrack(clicked_track);
+                StateManager::get()->pushScreen(TrackInfoScreen::getInstance());
             }   // if clicked_track
 
         }   // selection=="random_track"
@@ -104,14 +98,8 @@ void TracksScreen::eventCallback(Widget* widget, const std::string& name,
             Track* clicked_track = track_manager->getTrack(selection);
             if (clicked_track)
             {
-                ITexture* screenshot =
-                    irr_driver->getTexture(clicked_track->getScreenshotFile(),
-                                    "While loading screenshot for track '%s'",
-                                    clicked_track->getFilename());
-
-                new TrackInfoDialog(selection, clicked_track->getIdent(),
-                             translations->fribidize(clicked_track->getName()),
-                             screenshot, 0.8f, 0.7f);
+                TrackInfoScreen::getInstance()->setTrack(clicked_track);
+                StateManager::get()->pushScreen(TrackInfoScreen::getInstance());
             }
         }
     }   // name=="tracks"
diff --git a/src/tracks/track.hpp b/src/tracks/track.hpp
index f3249be23..424598de4 100644
--- a/src/tracks/track.hpp
+++ b/src/tracks/track.hpp
@@ -401,6 +401,7 @@ private:
     /** The number of laps the track will be raced in a random GP.
      * m_actual_number_of_laps is initialised with this value.*/
     int m_default_number_of_laps;
+
     /** The number of laps that is predefined in a track info dialog. */
     int m_actual_number_of_laps;
 
@@ -419,7 +420,7 @@ private:
 
 public:
 
-    bool reverseAvailable() { return m_reverse_available; }
+    bool reverseAvailable() const { return m_reverse_available; }
     void handleAnimatedTextures(scene::ISceneNode *node, const XMLNode &xml);
 
     static const float NOHIT;

From 4b507a4eda5cba4f912c92fdc0a7e2f964ebde9d Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 25 Aug 2014 11:12:00 +1000
Subject: [PATCH 111/248] Made more space for credits that span more than one
 line. Siwtch left and right side of the top screen.

---
 data/gui/track_info.stkgui | 70 +++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/data/gui/track_info.stkgui b/data/gui/track_info.stkgui
index d79e550a5..dcb8db333 100644
--- a/data/gui/track_info.stkgui
+++ b/data/gui/track_info.stkgui
@@ -9,46 +9,46 @@
 
             <spacer width="1" height="5%"/>
 
-            <box width="95%" height="40%" padding="10" layout="horizontal-row">
-                    <!-- Left pane -->
-                    <div proportion="1" height="100%" layout="vertical-row">
-                        <label id="highscores" width="100%" text_align="center" text="= Highscores ="/>
-
-                        <spacer width="1" height="2%"/>
-
-                        <div width="95%" height="fit" layout="horizontal-row">
-                            <icon id="iconscore1" icon="gui/random_kart.png" width="font" height="font"/>
-                            <spacer width="2%" height="1"/>
-                            <label id="highscore1" proportion="1" text="(Empty)"/>
-                        </div>
-
-                        <spacer width="1" height="2%"/>
-
-                        <div width="95%" height="fit" layout="horizontal-row">
-                            <icon id="iconscore2" icon="gui/random_kart.png" width="font" height="font"/>
-                            <spacer width="2%" height="1"/>
-                            <label id="highscore2" proportion="1" text="(Empty)"/>
-                        </div>
-
-                        <spacer width="1" height="2%"/>
-
-                        <div width="95%" height="fit" layout="horizontal-row">
-                            <icon id="iconscore3" icon="gui/random_kart.png" width="font" height="font"/>
-                            <spacer width="2%" height="1"/>
-                            <label id="highscore3" proportion="1" text="(Empty)"/>
-                        </div>
-
-                        <spacer width="1" proportion="1"/>
-
-                        <label id="author" width="100%" text_align="center" word_wrap="true"/>
-                    </div>
-
+            <box width="95%" height="45%" padding="10" layout="horizontal-row">
                     <!-- Right pane -->
                     <div proportion="1" height="100%" layout="vertical-row">
                         <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
                         </placeholder>
 
                     </div>
+                <!-- Left pane -->
+                <div proportion="1" height="100%" layout="vertical-row">
+                    <label id="highscores" width="100%" text_align="center" text="= Highscores ="/>
+
+                    <spacer width="1" height="2%"/>
+
+                    <div width="95%" height="fit" layout="horizontal-row">
+                        <icon id="iconscore1" icon="gui/random_kart.png" width="font" height="font"/>
+                        <spacer width="2%" height="1"/>
+                        <label id="highscore1" proportion="1" text="(Empty)"/>
+                    </div>
+
+                    <spacer width="1" height="2%"/>
+
+                    <div width="95%" height="fit" layout="horizontal-row">
+                        <icon id="iconscore2" icon="gui/random_kart.png" width="font" height="font"/>
+                        <spacer width="2%" height="1"/>
+                        <label id="highscore2" proportion="1" text="(Empty)"/>
+                    </div>
+
+                    <spacer width="1" height="2%"/>
+
+                    <div width="95%" height="fit" layout="horizontal-row">
+                        <icon id="iconscore3" icon="gui/random_kart.png" width="font" height="font"/>
+                        <spacer width="2%" height="1"/>
+                        <label id="highscore3" proportion="1" text="(Empty)"/>
+                    </div>
+
+                    <spacer width="1" height="10%"/>
+
+                    <label id="author" width="100%" text_align="center" word_wrap="true"/>
+                </div>
+
             </box>
             <spacer width="1" height="5%"/>
             <box width="95%" height="25%" padding="10" layout="vertical-row">
@@ -79,7 +79,7 @@
                 </div>
                 <spacer width="1" height="2%"/>
             </box>
-            <spacer width="1" height="5%"/>
+            <spacer width="1" height="2%"/>
             <buttonbar id="buttons" height="15%" width="100%" align="center">
 
                 <icon-button id="start" width="64" height="64" icon="gui/green_check.png"

From 8f3bff10f83598f475323b022f0d0274bd375326 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 25 Aug 2014 21:57:43 +1000
Subject: [PATCH 112/248] If minimum or maximum is set for a spinner widget,
 automatically adjust the value if its too low or high.

---
 src/guiengine/widgets/spinner_widget.hpp | 30 ++++++++++++++++++------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/guiengine/widgets/spinner_widget.hpp b/src/guiengine/widgets/spinner_widget.hpp
index 8b3e6c326..13496afc3 100644
--- a/src/guiengine/widgets/spinner_widget.hpp
+++ b/src/guiengine/widgets/spinner_widget.hpp
@@ -156,18 +156,34 @@ namespace GUIEngine
         /**
           * \return the maximum value the spinner can take
           */
-        int  getMax()   const { return m_max;   }
-        /**
-          * \brief Sets the maximum value for a spinner.
-          */
-        void setMax(int n) {m_max = n; }
+        // --------------------------------------------------------------------
+        /** Returns the maximum value. */
+        int  getMax()  const { return m_max;   }
+        // --------------------------------------------------------------------
+        /** \brief Sets the maximum value for a spinner.
+         *  If the current value is larger than the new maximum, the current
+         *  value is set to the new maximum. */
+        void setMax(int n)
+        {
+            m_max = n; 
+            if(getValue()>m_max) setValue(m_max);
+        }   // setMax
+        // --------------------------------------------------------------------
         /**
           * \return the minimum value the spinner can take
           */
         int  getMin()   const { return m_min;   }
+        // --------------------------------------------------------------------
+        /** \brief Sets the minimum value for a spinner.
+         *  If the current value is smaller than the new minimum, the current
+         *  value is set to the new minimum. */
+        void setMin(int n)
+        {
+            m_min = n; 
+            if(getValue()<m_min) setValue(m_min);
+        }   // setMin
         
-        void setMin(int n) { m_min = n; }
-        
+        // --------------------------------------------------------------------
         /** Override method from base class Widget */
         virtual void setActivated();
         

From 76767141f77f457e46c001c78a5054fb6d67045b Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 25 Aug 2014 22:20:42 +1000
Subject: [PATCH 113/248] Removed old track info dialog, fixed crashes in track
 info screen (caused when making some spinners etc. visible).

---
 data/gui/track_info.stkgui                    |  18 +-
 data/gui/track_info_dialog.stkgui             |  73 -----
 sources.cmake                                 |   2 +-
 src/race/race_manager.hpp                     |   9 +-
 src/states_screens/arenas_screen.cpp          |  22 +-
 .../dialogs/track_info_dialog.cpp             | 285 ------------------
 .../dialogs/track_info_dialog.hpp             |  70 -----
 src/states_screens/easter_egg_screen.cpp      |  35 +--
 .../grand_prix_editor_screen.cpp              |   1 -
 src/states_screens/main_menu_screen.cpp       |   8 -
 src/states_screens/track_info_screen.cpp      |  88 +++---
 src/states_screens/track_info_screen.hpp      |  10 +-
 12 files changed, 82 insertions(+), 539 deletions(-)
 delete mode 100644 data/gui/track_info_dialog.stkgui
 delete mode 100644 src/states_screens/dialogs/track_info_dialog.cpp
 delete mode 100644 src/states_screens/dialogs/track_info_dialog.hpp

diff --git a/data/gui/track_info.stkgui b/data/gui/track_info.stkgui
index dcb8db333..7037750ff 100644
--- a/data/gui/track_info.stkgui
+++ b/data/gui/track_info.stkgui
@@ -10,13 +10,13 @@
             <spacer width="1" height="5%"/>
 
             <box width="95%" height="45%" padding="10" layout="horizontal-row">
-                    <!-- Right pane -->
-                    <div proportion="1" height="100%" layout="vertical-row">
-                        <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
-                        </placeholder>
-
-                    </div>
                 <!-- Left pane -->
+                <div proportion="1" height="100%" layout="vertical-row">
+                    <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
+                    </placeholder>
+
+                </div>
+                <!-- Right pane -->
                 <div proportion="1" height="100%" layout="vertical-row">
                     <label id="highscores" width="100%" text_align="center" text="= Highscores ="/>
 
@@ -58,15 +58,15 @@
                     <spacer width="40" height="2" />
                     <label id="lap-text" height="100%" width="40%" I18N="Number of laps" text="Number of laps"/>
                     <spacer witdh="40" height="2" />
-                    <spinner id="lapcountspinner" width="20%" min_value="1" max_value="20" align="center"
+                    <spinner id="lap-spinner" width="20%" min_value="1" max_value="20" align="center"
                              wrap_around="true" />
                     <spacer proportion="1" height="2" />
                 </div>
                 <div width="75%" height="fit" layout="horizontal-row" >
                     <spacer width="40" height="2" />
-                    <label id="karts-text" height="100%" width="40%" I18N="Number of AI karts" text="Number of AI karts"/>
+                    <label id="ai-text" height="100%" width="40%" I18N="Number of AI karts" text="Number of AI karts"/>
                     <spacer with="40" height="2" />
-                    <spinner id="kartcountspinner" width="20%" min_value="1" max_value="20" align="center"
+                    <spinner id="ai-spinner" width="20%" min_value="1" max_value="20" align="center"
                              wrap_around="true" />
                     <spacer proportion="1" height="2" />
                 </div>
diff --git a/data/gui/track_info_dialog.stkgui b/data/gui/track_info_dialog.stkgui
deleted file mode 100644
index 1cd67f681..000000000
--- a/data/gui/track_info_dialog.stkgui
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <div x="1%" y="1%" width="99%" height="99%">
-        <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-            <label id="name" width="100%" text_align="center"/>
-
-            <spacer width="1" height="5%"/>
-
-            <div width="95%" proportion="5" layout="horizontal-row">
-
-            <!-- Left pane -->
-            <div proportion="1" height="100%" layout="vertical-row">
-                <label id="highscores" width="100%" text_align="center" text="= Highscores ="/>
-
-                <spacer width="1" height="2%"/>
-
-                <div width="95%" height="fit" layout="horizontal-row">
-                <icon id="iconscore1" icon="gui/random_kart.png" width="font" height="font"/>
-                <spacer width="2%" height="1"/>
-                <label id="highscore1" proportion="1" text="(Empty)"/>
-                </div>
-
-                <spacer width="1" height="2%"/>
-
-                <div width="95%" height="fit" layout="horizontal-row">
-                <icon id="iconscore2" icon="gui/random_kart.png" width="font" height="font"/>
-                <spacer width="2%" height="1"/>
-                <label id="highscore2" proportion="1" text="(Empty)"/>
-                </div>
-
-                <spacer width="1" height="2%"/>
-
-                <div width="95%" height="fit" layout="horizontal-row">
-                <icon id="iconscore3" icon="gui/random_kart.png" width="font" height="font"/>
-                <spacer width="2%" height="1"/>
-                <label id="highscore3" proportion="1" text="(Empty)"/>
-                </div>
-
-                <spacer width="1" proportion="1"/>
-
-                <label id="author" width="100%" text_align="center" word_wrap="true"/>
-            </div>
-
-            <!-- Right pane -->
-            <div proportion="1" height="100%" layout="vertical-row">
-                <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
-                </placeholder>
-                <div width="75%" height="fit" layout="horizontal-row" >
-                    <spacer proportion="1" height="2" />
-                    <checkbox id="reverse"/>
-                    <spacer width="20" height="2" />
-                    <label id="reverse-text" height="100%" I18N="Drive the track reverse" text="Reverse"/>
-                    <spacer proportion="1" height="2" />
-                </div>
-
-            </div>
-            </div>
-
-            <spacer width="1" height="5%"/>
-
-            <spinner id="lapcountspinner" width="50%" min_value="1" max_value="20" align="center" wrap_around="true"
-                I18N="In the track setup screen (number of laps choice, where %i is the number)" text="%i laps"/>
-
-            <spacer width="1" height="5%"/>
-
-            <button id="start" text="Start Race" align="center"/>
-
-            <spacer width="1" height="2%"/>
-        </div>
-
-        <icon-button id="closePopup" x="0" y="0" width="8%" height="8%" icon="gui/back.png"/>
-    </div>
-</stkgui>
diff --git a/sources.cmake b/sources.cmake
index ba4868d71..f484b15d5 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,4 +1,4 @@
-# Modify this file to change the last-modified date when you add/remove a file.
+# Modify this file to change the last-modified date when you add/remove a file. 
 # This will then trigger a new cmake run automatically. 
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
diff --git a/src/race/race_manager.hpp b/src/race/race_manager.hpp
index 379fd3ed0..2a0f4b3cf 100644
--- a/src/race/race_manager.hpp
+++ b/src/race/race_manager.hpp
@@ -185,12 +185,13 @@ public:
             case MINOR_MODE_SOCCER:         return _("Soccer");
             default: assert(false); return NULL;
         }
-    }
+    }   // getNameOf
 
     // ------------------------------------------------------------------------
-    static bool hasAI(const MinorRaceModeType mode)
+    /** Returns if the currently set minor game mode can be used by the AI. */
+    bool hasAI()
     {
-        switch (mode)
+        switch (m_minor_mode)
         {
             case MINOR_MODE_NORMAL_RACE:    return true;
             case MINOR_MODE_TIME_TRIAL:     return true;
@@ -200,7 +201,7 @@ public:
             case MINOR_MODE_SOCCER:         return false;
             default: assert(false);         return false;
         }
-    }
+    }   // hasAI
 
 
     // ------------------------------------------------------------------------
diff --git a/src/states_screens/arenas_screen.cpp b/src/states_screens/arenas_screen.cpp
index f556629ac..fd4ead99e 100644
--- a/src/states_screens/arenas_screen.cpp
+++ b/src/states_screens/arenas_screen.cpp
@@ -25,7 +25,7 @@
 #include "io/file_manager.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/arenas_screen.hpp"
-#include "states_screens/dialogs/track_info_dialog.hpp"
+#include "states_screens/track_info_screen.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_manager.hpp"
 #include "utils/random_generator.hpp"
@@ -163,13 +163,11 @@ void ArenasScreen::eventCallback(Widget* widget, const std::string& name, const
             RandomGenerator random;
             const int randomID = random.get(curr_group.size());
 
-            Track* clickedTrack = track_manager->getTrack( curr_group[randomID] );
-            if (clickedTrack != NULL)
+            Track* clicked_track = track_manager->getTrack( curr_group[randomID] );
+            if (clicked_track != NULL)
             {
-                ITexture* screenshot = irr_driver->getTexture( clickedTrack->getScreenshotFile().c_str() );
-
-                new TrackInfoDialog(selection, clickedTrack->getIdent(), clickedTrack->getName(),
-                                    screenshot, 0.8f, 0.7f);
+                TrackInfoScreen::getInstance()->setTrack(clicked_track);
+                StateManager::get()->pushScreen(TrackInfoScreen::getInstance());
             }
 
         }
@@ -182,13 +180,11 @@ void ArenasScreen::eventCallback(Widget* widget, const std::string& name, const
         }
         else
         {
-            Track* clickedTrack = track_manager->getTrack(selection);
-            if (clickedTrack != NULL)
+            Track* clicked_track = track_manager->getTrack(selection);
+            if (clicked_track != NULL)
             {
-                ITexture* screenshot = irr_driver->getTexture( clickedTrack->getScreenshotFile().c_str() );
-
-                new TrackInfoDialog(selection, clickedTrack->getIdent(), clickedTrack->getName(),
-                                    screenshot, 0.8f, 0.7f);
+                TrackInfoScreen::getInstance()->setTrack(clicked_track);
+                StateManager::get()->pushScreen(TrackInfoScreen::getInstance());
             }   // clickedTrack !=  NULL
         }   // if random_track
 
diff --git a/src/states_screens/dialogs/track_info_dialog.cpp b/src/states_screens/dialogs/track_info_dialog.cpp
deleted file mode 100644
index e7d7025f2..000000000
--- a/src/states_screens/dialogs/track_info_dialog.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 3
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "states_screens/dialogs/track_info_dialog.hpp"
-
-#include "challenges/unlock_manager.hpp"
-#include "config/player_manager.hpp"
-#include "config/user_config.hpp"
-#include "graphics/irr_driver.hpp"
-#include "guiengine/engine.hpp"
-#include "guiengine/screen.hpp"
-#include "guiengine/widgets/button_widget.hpp"
-#include "guiengine/widgets/icon_button_widget.hpp"
-#include "guiengine/widgets/label_widget.hpp"
-#include "guiengine/widgets/spinner_widget.hpp"
-#include "io/file_manager.hpp"
-#include "karts/kart_properties.hpp"
-#include "karts/kart_properties_manager.hpp"
-#include "race/highscores.hpp"
-#include "race/highscore_manager.hpp"
-#include "race/race_manager.hpp"
-#include "states_screens/state_manager.hpp"
-#include "states_screens/tracks_screen.hpp"
-#include "tracks/track.hpp"
-#include "tracks/track_manager.hpp"
-#include "utils/string_utils.hpp"
-#include "utils/translation.hpp"
-
-#include <IGUIEnvironment.h>
-#include <IGUIImage.h>
-#include <IGUIStaticText.h>
-
-using namespace irr::gui;
-using namespace irr::video;
-using namespace irr::core;
-using namespace GUIEngine;
-
-// ------------------------------------------------------------------------------------------------------
-
-TrackInfoDialog::TrackInfoDialog(const std::string& ribbonItem, const std::string& trackIdent,
-                                 const irr::core::stringw& trackName, ITexture* screenshot,
-                                 const float w, const float h) : ModalDialog(w, h)
-{
-    loadFromFile("track_info_dialog.stkgui");
-
-    const bool has_laps       = race_manager->modeHasLaps();
-    const bool has_highscores = race_manager->modeHasHighscores();
-
-    m_track_ident = trackIdent;
-    m_ribbon_item = ribbonItem;
-
-    getWidget<LabelWidget>("name")->setText(trackName.c_str(), false);
-
-    Track* track = track_manager->getTrack(trackIdent);
-    //I18N: when showing who is the author of track '%s' (place %s where the name of the author should appear)
-    getWidget<LabelWidget>("author")->setText( _("Track by %s", track->getDesigner().c_str()), false );
-
-
-    // ---- Track screenshot
-    Widget* screenshot_div = getWidget("screenshot_div");
-    IconButtonWidget* screenshotWidget = new IconButtonWidget(IconButtonWidget::SCALE_MODE_KEEP_CUSTOM_ASPECT_RATIO,
-                                                              false /* tab stop */, false /* focusable */);
-    // images are saved squared, but must be stretched to 4:
-    screenshotWidget->setCustomAspectRatio(4.0f / 3.0f);
-
-    screenshotWidget->m_x = screenshot_div->m_x;
-    screenshotWidget->m_y = screenshot_div->m_y;
-    screenshotWidget->m_w = screenshot_div->m_w;
-    screenshotWidget->m_h = screenshot_div->m_h;
-
-    // temporary icon, will replace it just after (but it will be shown if the given icon is not found)
-    screenshotWidget->m_properties[PROP_ICON] = "gui/main_help.png";
-    screenshotWidget->setParent(m_irrlicht_window);
-    screenshotWidget->add();
-
-    if (screenshot != NULL)
-        screenshotWidget->setImage(screenshot);
-    m_widgets.push_back(screenshotWidget);
-
-
-    // ---- Lap count m_spinner
-    if (has_laps)
-    {
-        m_spinner = getWidget<SpinnerWidget>("lapcountspinner");
-        if (UserConfigParams::m_artist_debug_mode)
-            m_spinner->setMin(0);
-
-        m_spinner->setValue(track->getActualNumberOfLap());
-        race_manager->setNumLaps(m_spinner->getValue());
-    }
-    else
-    {
-        getWidget<SpinnerWidget>("lapcountspinner")->setVisible(false);
-        m_spinner = NULL;
-    }
-
-
-    // Reverse track
-    const bool reverse_available = track->reverseAvailable() &&
-               race_manager->getMinorMode() != RaceManager::MINOR_MODE_EASTER_EGG;
-    if (reverse_available)
-    {
-        m_checkbox = getWidget<CheckBoxWidget>("reverse");
-        m_checkbox->setState(race_manager->getReverseTrack());
-    }
-    else
-    {
-        getWidget<CheckBoxWidget>("reverse")->setVisible(false);
-        getWidget<LabelWidget>("reverse-text")->setVisible(false);
-        m_checkbox = NULL;
-        race_manager->setReverseTrack(false);
-    }
-
-    // ---- High Scores
-    if (has_highscores)
-    {
-        m_kart_icons[0] = getWidget<IconButtonWidget>("iconscore1");
-        m_kart_icons[1] = getWidget<IconButtonWidget>("iconscore2");
-        m_kart_icons[2] = getWidget<IconButtonWidget>("iconscore3");
-
-        m_highscore_entries[0] = getWidget<LabelWidget>("highscore1");
-        m_highscore_entries[1] = getWidget<LabelWidget>("highscore2");
-        m_highscore_entries[2] = getWidget<LabelWidget>("highscore3");
-
-        updateHighScores();
-    }
-    else
-    {
-        getWidget<IconButtonWidget>("iconscore1")->setVisible(false);
-        getWidget<IconButtonWidget>("iconscore2")->setVisible(false);
-        getWidget<IconButtonWidget>("iconscore3")->setVisible(false);
-
-        getWidget<LabelWidget>("highscores")->setVisible(false);
-        getWidget<LabelWidget>("highscore1")->setVisible(false);
-        getWidget<LabelWidget>("highscore2")->setVisible(false);
-        getWidget<LabelWidget>("highscore3")->setVisible(false);
-    }
-
-    getWidget<ButtonWidget>("start")->setFocusForPlayer( PLAYER_ID_GAME_MASTER );
-
-}   // TrackInfoDialog
-
-// ------------------------------------------------------------------------------------------------------
-
-TrackInfoDialog::~TrackInfoDialog()
-{
-    // Place focus back on selected track, in case the dialog was cancelled and we're back to
-    // the track selection screen after
-    GUIEngine::Screen* curr_screen = GUIEngine::getCurrentScreen();
-    if (curr_screen->getName() == "tracks.stkgui")
-    {
-        ((TracksScreen*)curr_screen)->setFocusOnTrack(m_ribbon_item);
-    }
-
-}   // ~TrackInfoDialog
-
-// ------------------------------------------------------------------------------------------------------
-
-void TrackInfoDialog::updateHighScores()
-{
-    std::string game_mode_ident = RaceManager::getIdentOf( race_manager->getMinorMode() );
-    const Highscores::HighscoreType type = "HST_" + game_mode_ident;
-
-    Highscores* highscores =
-        highscore_manager->getHighscores(type,
-                                         race_manager->getNumberOfKarts(),
-                                         race_manager->getDifficulty(),
-                                         m_track_ident,
-                                         race_manager->getNumLaps(),
-                                         race_manager->getReverseTrack()  );
-    const int amount = highscores->getNumberEntries();
-
-    std::string kart_name;
-    core::stringw name;
-    float time;
-
-    // fill highscore entries
-    for (int n=0; n<HIGHSCORE_COUNT; n++)
-    {
-        irr::core::stringw line;
-
-        // Check if this entry is filled or still empty
-        if (n < amount)
-        {
-            highscores->getEntry(n, kart_name, name, &time);
-
-            std::string time_string = StringUtils::timeToString(time);
-
-            const KartProperties* prop = kart_properties_manager->getKart(kart_name);
-            if (prop != NULL)
-            {
-                const std::string &icon_path = prop->getAbsoluteIconFile();
-                ITexture* kart_icon_texture = irr_driver->getTexture( icon_path );
-                m_kart_icons[n]->setImage(kart_icon_texture);
-            }
-            line = name + "\t" + core::stringw(time_string.c_str());
-        }
-        else
-        {
-            //I18N: for empty highscores entries
-            line = _("(Empty)");
-
-            ITexture* no_kart_texture = irr_driver->getTexture(
-                                 file_manager->getAsset(FileManager::GUI,
-                                                        "random_kart.png") );
-            m_kart_icons[n]->setImage(no_kart_texture);
-
-        }
-
-        m_highscore_entries[n]->setText( line.c_str(), false );
-
-    }
-}   // updateHighScores
-
-// ------------------------------------------------------------------------------------------------------
-
-void TrackInfoDialog::onEnterPressedInternal()
-{
-
-    // Create a copy of member variables we still need, since they will
-    // not be accessible after dismiss:
-    const int num_laps = (m_spinner == NULL ? -1 : m_spinner->getValue());
-    const bool reverse_track = m_checkbox == NULL ? false
-                                                  : m_checkbox->getState();
-    track_manager->getTrack(m_track_ident)->setActualNumberOfLaps(num_laps);
-    race_manager->setReverseTrack(reverse_track);
-    std::string track_ident = m_track_ident;
-    // Disable accidentally unlocking of a challenge
-    PlayerManager::getCurrentPlayer()->setCurrentChallenge("");
-
-    ModalDialog::dismiss();
-    race_manager->startSingleRace(track_ident, num_laps, false);
-}   // onEnterPressedInternal
-
-// ------------------------------------------------------------------------------------------------------
-
-GUIEngine::EventPropagation TrackInfoDialog::processEvent(const std::string& eventSource)
-{
-    if (eventSource == "start" )
-    {
-        onEnterPressedInternal();
-        return GUIEngine::EVENT_BLOCK;
-    }
-    else if (eventSource == "closePopup")
-    {
-        ModalDialog::dismiss();
-        return GUIEngine::EVENT_BLOCK;
-    }
-    else if (eventSource == "reverse")
-    {
-        race_manager->setReverseTrack(m_checkbox->getState());
-        // Makes sure the highscores get swapped when clicking the 'reverse'
-        // checkbox.
-        if (race_manager->modeHasHighscores())
-        {
-            updateHighScores();
-        }
-    }
-    else if (eventSource == "lapcountspinner")
-    {
-        assert(m_spinner != NULL);
-        const int num_laps = m_spinner->getValue();
-        race_manager->setNumLaps(num_laps);
-        UserConfigParams::m_num_laps = num_laps;
-        updateHighScores();
-    }
-
-    return GUIEngine::EVENT_LET;
-}   // processEvent
-
-// ------------------------------------------------------------------------------------------------------
diff --git a/src/states_screens/dialogs/track_info_dialog.hpp b/src/states_screens/dialogs/track_info_dialog.hpp
deleted file mode 100644
index 3367ac5c2..000000000
--- a/src/states_screens/dialogs/track_info_dialog.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 3
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-
-#ifndef HEADER_TRACKINFO_DIALOG_HPP
-#define HEADER_TRACKINFO_DIALOG_HPP
-
-#include "guiengine/modaldialog.hpp"
-#include "guiengine/widgets/check_box_widget.hpp"
-
-static const int HIGHSCORE_COUNT = 3;
-
-namespace GUIEngine
-{
-    class SpinnerWidget;
-    class IconButtonWidget;
-    class LabelWidget;
-}
-
-/**
- * \brief Dialog that shows the information about a given track
- * \ingroup states_screens
- */
-class TrackInfoDialog : public GUIEngine::ModalDialog
-{
-    std::string m_track_ident;
-    std::string m_ribbon_item;
-    
-    // When there is no need to tab through / click on images/labels, we can add directly
-    // irrlicht labels (more complicated uses require the use of our widget set)
-    GUIEngine::SpinnerWidget* m_spinner;
-    GUIEngine::CheckBoxWidget* m_checkbox;
-    GUIEngine::IconButtonWidget* m_kart_icons[HIGHSCORE_COUNT];
-    GUIEngine::LabelWidget* m_highscore_entries[HIGHSCORE_COUNT];
-    
-    void updateHighScores();
-    
-public:
-    /**
-     * \brief Creates a track info modal dialog with given percentage of screen width and height
-     * \param ribbonItem identifier name of the ribbon item that was clicked in the track selection
-     *        screen to get there (often will be 'trackIdent' but may also be the random item)
-     * \param trackIdent identifier name of the track to show information about
-     * \param trackName  human-readable, possibly translated, name of the track to show information about
-     * \param screenshot screenshot of the track to show information about
-     */
-    TrackInfoDialog(const std::string& ribbonItem, const std::string& trackIdent,
-                    const irr::core::stringw& trackName, irr::video::ITexture* screenshot,
-                    const float percentWidth, const float percentHeight);
-    virtual ~TrackInfoDialog();
-    
-    void onEnterPressedInternal();
-    GUIEngine::EventPropagation processEvent(const std::string& eventSource);
-};
-
-#endif
diff --git a/src/states_screens/easter_egg_screen.cpp b/src/states_screens/easter_egg_screen.cpp
index 474615e32..bf0790cde 100644
--- a/src/states_screens/easter_egg_screen.cpp
+++ b/src/states_screens/easter_egg_screen.cpp
@@ -26,7 +26,7 @@
 #include "guiengine/widgets/icon_button_widget.hpp"
 #include "io/file_manager.hpp"
 #include "states_screens/state_manager.hpp"
-#include "states_screens/dialogs/track_info_dialog.hpp"
+#include "states_screens/track_info_screen.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_manager.hpp"
 #include "utils/translation.hpp"
@@ -80,19 +80,13 @@ void EasterEggScreen::eventCallback(Widget* widget, const std::string& name, con
                 std::string track = m_random_track_list.front();
                 m_random_track_list.pop_front();
                 m_random_track_list.push_back(track);
-                Track* clickedTrack = track_manager->getTrack( track );
+                Track* clicked_track = track_manager->getTrack( track );
 
 
-                if (clickedTrack != NULL)
+                if (clicked_track != NULL)
                 {
-                    ITexture* screenshot =
-                        irr_driver->getTexture( clickedTrack->getScreenshotFile(),
-                                                "While loading screenshot for track '%s':",
-                                                clickedTrack->getFilename()   );
-
-                    new TrackInfoDialog(selection, clickedTrack->getIdent(),
-                                        translations->fribidize(clickedTrack->getName()),
-                                        screenshot, 0.8f, 0.7f);
+                    TrackInfoScreen::getInstance()->setTrack(clicked_track);
+                    StateManager::get()->pushScreen(TrackInfoScreen::getInstance());
                 }
 
             }
@@ -100,22 +94,13 @@ void EasterEggScreen::eventCallback(Widget* widget, const std::string& name, con
             {
                 unlock_manager->playLockSound();
             }
-            else if (selection == RibbonWidget::NO_ITEM_ID)
+            else if (selection != RibbonWidget::NO_ITEM_ID)
             {
-            }
-            else
-            {
-                Track* clickedTrack = track_manager->getTrack(selection);
-                if (clickedTrack != NULL)
+                Track* clicked_track = track_manager->getTrack(selection);
+                if (clicked_track != NULL)
                 {
-                    ITexture* screenshot =
-                        irr_driver->getTexture( clickedTrack->getScreenshotFile(),
-                                                "While loading screenshot for track '%s'",
-                                                clickedTrack->getFilename());
-
-                    new TrackInfoDialog(selection, clickedTrack->getIdent(),
-                                        translations->fribidize(clickedTrack->getName()),
-                                        screenshot, 0.8f, 0.7f);
+                    TrackInfoScreen::getInstance()->setTrack(clicked_track);
+                    StateManager::get()->pushScreen(TrackInfoScreen::getInstance());
                 }
             }
         }
diff --git a/src/states_screens/grand_prix_editor_screen.cpp b/src/states_screens/grand_prix_editor_screen.cpp
index 64bb9449f..1552835c1 100644
--- a/src/states_screens/grand_prix_editor_screen.cpp
+++ b/src/states_screens/grand_prix_editor_screen.cpp
@@ -29,7 +29,6 @@
 #include "states_screens/edit_gp_screen.hpp"
 #include "states_screens/dialogs/enter_gp_name_dialog.hpp"
 #include "states_screens/dialogs/gp_info_dialog.hpp"
-#include "states_screens/dialogs/track_info_dialog.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_manager.hpp"
 #include "utils/translation.hpp"
diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp
index 180eab769..4390fa7d8 100644
--- a/src/states_screens/main_menu_screen.cpp
+++ b/src/states_screens/main_menu_screen.cpp
@@ -333,18 +333,10 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name,
 #endif
     if (selection == "new")
     {
-#undef XX
-#ifdef XX
-        Track *track = track_manager->getTrack("olivermath");
-        TrackInfoScreen *tis = TrackInfoScreen::getInstance();
-        tis->setTrack(track);
-        StateManager::get()->pushScreen(tis);
-#else
         KartSelectionScreen* s = OfflineKartSelectionScreen::getInstance(); //FIXME : that was for tests
         s->setMultiplayer(false);
         s->setFromOverworld(false);
         StateManager::get()->pushScreen( s );
-#endif
     }
     else if (selection == "multiplayer")
     {
diff --git a/src/states_screens/track_info_screen.cpp b/src/states_screens/track_info_screen.cpp
index 569477ca2..ba3d916bc 100644
--- a/src/states_screens/track_info_screen.cpp
+++ b/src/states_screens/track_info_screen.cpp
@@ -54,15 +54,22 @@ using namespace GUIEngine;
 
 DEFINE_SCREEN_SINGLETON( TrackInfoScreen );
 
-// ------------------------------------------------------------------------------------------------------
-
-//TrackInfoScreen::TrackInfoScreen(const std::string& ribbonItem, const std::string& trackIdent,
-//                     const irr::core::stringw& trackName, ITexture* screenshot)
+// ----------------------------------------------------------------------------
+/** Constructor, which loads the corresponding track_info.stkgui file. */
 TrackInfoScreen::TrackInfoScreen()
           : Screen("track_info.stkgui")
 {
 }   // TrackInfoScreen
 
+// ----------------------------------------------------------------------------
+/* Saves some often used pointers. */
+void TrackInfoScreen::loadedFromFile()
+{
+    m_lap_spinner     = getWidget<SpinnerWidget>("lap-spinner");
+    m_ai_kart_spinner = getWidget<SpinnerWidget>("ai-spinner");
+    m_reverse         = getWidget<CheckBoxWidget>("reverse");
+}   // loadedFromFile
+
 // ----------------------------------------------------------------------------
 void TrackInfoScreen::setTrack(const Track *track)
 {
@@ -75,9 +82,6 @@ void TrackInfoScreen::setTrack(const Track *track)
  */
 void TrackInfoScreen::init()
 {
-    RaceManager::MinorRaceModeType minor = race_manager->getMinorMode();
-
-    const bool has_AI         = race_manager->hasAI(minor);
     const bool has_laps       = race_manager->modeHasLaps();
     const bool has_highscores = race_manager->modeHasHighscores();
 
@@ -115,29 +119,23 @@ void TrackInfoScreen::init()
 
     // Lap count m_lap_spinner
     // -----------------------
+    m_lap_spinner->setVisible(has_laps);
+    getWidget<LabelWidget>("lap-text")->setVisible(has_laps);
     if (has_laps)
     {
-        m_lap_spinner = getWidget<SpinnerWidget>("lapcountspinner");
-        m_lap_spinner->setVisible(true);
-        getWidget<LabelWidget>("lap-text")->setVisible(true);
         if (UserConfigParams::m_artist_debug_mode)
             m_lap_spinner->setMin(0);
-
         m_lap_spinner->setValue(m_track->getActualNumberOfLap());
         race_manager->setNumLaps(m_lap_spinner->getValue());
     }
-    else
-    {
-        getWidget<SpinnerWidget>("lapcountspinner")->setVisible(false);
-        getWidget<LabelWidget>("lap-text")->setVisible(false);
-        m_lap_spinner = NULL;
-    }
 
     // Number of AIs
     // -------------
+    const bool has_AI = race_manager->hasAI();
+    m_ai_kart_spinner->setVisible(has_AI);
+    getWidget<LabelWidget>("ai-text")->setVisible(has_AI);
     if (has_AI)
     {
-        m_ai_kart_spinner = getWidget<SpinnerWidget>("kartcountspinner");
         m_ai_kart_spinner->setActivated();
 
         // Avoid negative numbers (which can happen if e.g. the number of karts
@@ -145,30 +143,27 @@ void TrackInfoScreen::init()
         int num_ai = UserConfigParams::m_num_karts - race_manager->getNumLocalPlayers();
         if (num_ai < 0) num_ai = 0;
         m_ai_kart_spinner->setValue(num_ai);
-        m_ai_kart_spinner->setMax(stk_config->m_max_karts - race_manager->getNumLocalPlayers());
         race_manager->setNumKarts(num_ai + race_manager->getNumLocalPlayers());
-    }
-    else
-    {
-        getWidget<SpinnerWidget>("kartcountspinner")->setVisible(false);
-        m_ai_kart_spinner = NULL;
-    }
+        m_ai_kart_spinner->setMax(stk_config->m_max_karts - race_manager->getNumLocalPlayers());
+        // A ftl reace needs at least three karts to make any sense
+        if(race_manager->getMinorMode()==RaceManager::MINOR_MODE_FOLLOW_LEADER)
+        {
+            m_ai_kart_spinner->setMin(3-race_manager->getNumLocalPlayers());
+        }
+        else
+            m_ai_kart_spinner->setMin(0);
+
+    }   // has_AI
 
     // Reverse track
     // -------------
     const bool reverse_available = m_track->reverseAvailable() &&
                race_manager->getMinorMode() != RaceManager::MINOR_MODE_EASTER_EGG;
+    m_reverse->setVisible(reverse_available);
+    getWidget<LabelWidget>("reverse-text")->setVisible(reverse_available);
     if (reverse_available)
     {
-        m_checkbox = getWidget<CheckBoxWidget>("reverse");
-        m_checkbox->setState(race_manager->getReverseTrack());
-    }
-    else
-    {
-        getWidget<CheckBoxWidget>("reverse")->setVisible(false);
-        getWidget<LabelWidget>("reverse-text")->setVisible(false);
-        m_checkbox = NULL;
-        race_manager->setReverseTrack(false);
+        m_reverse->setState(race_manager->getReverseTrack());
     }
 
     // ---- High Scores
@@ -196,9 +191,7 @@ void TrackInfoScreen::init()
         getWidget<LabelWidget>("highscore3")->setVisible(false);
     }
 
-    //FIXME getWidget<ButtonWidget>("start")->setFocusForPlayer( PLAYER_ID_GAME_MASTER );
-
-}   // TrackInfoScreen
+}   // init
 
 // ----------------------------------------------------------------------------
 
@@ -271,9 +264,10 @@ void TrackInfoScreen::onEnterPressedInternal()
 
     // Create a copy of member variables we still need, since they will
     // not be accessible after dismiss:
-    const int num_laps = (m_lap_spinner == NULL ? -1 : m_lap_spinner->getValue());
-    const bool reverse_track = m_checkbox == NULL ? false
-                                                  : m_checkbox->getState();
+    const int num_laps = race_manager->modeHasLaps() ? m_lap_spinner->getValue() 
+                                                     : -1;
+    const bool reverse_track = m_reverse == NULL ? false
+                                                  : m_reverse->getState();
    //FIXME m_track->setActualNumberOfLaps(num_laps);
     race_manager->setReverseTrack(reverse_track);
 
@@ -302,7 +296,7 @@ void TrackInfoScreen::eventCallback(Widget* widget, const std::string& name,
     }
     else if (name == "reverse")
     {
-        race_manager->setReverseTrack(m_checkbox->getState());
+        race_manager->setReverseTrack(m_reverse->getState());
         // Makes sure the highscores get swapped when clicking the 'reverse'
         // checkbox.
         if (race_manager->modeHasHighscores())
@@ -310,20 +304,20 @@ void TrackInfoScreen::eventCallback(Widget* widget, const std::string& name,
             updateHighScores();
         }
     }
-    else if (name == "lapcountspinner")
+    else if (name == "lap-spinner")
     {
-        assert(m_lap_spinner != NULL);
+        assert(race_manager->modeHasLaps());
         const int num_laps = m_lap_spinner->getValue();
         race_manager->setNumLaps(num_laps);
         UserConfigParams::m_num_laps = num_laps;
         updateHighScores();
     }
-    else if (name=="kartcountspinner")
+    else if (name=="ai-spinner")
     {
         SpinnerWidget* w = dynamic_cast<SpinnerWidget*>(widget);
-        race_manager->setNumKarts( race_manager->getNumLocalPlayers() + w->getValue() );
-        UserConfigParams::m_num_karts = race_manager->getNumLocalPlayers() + w->getValue();
-
+        const int num_ai = m_ai_kart_spinner->getValue();
+        race_manager->setNumKarts( race_manager->getNumLocalPlayers() + num_ai );
+        UserConfigParams::m_num_karts = race_manager->getNumLocalPlayers() + num_ai;
     }
 }   // eventCallback
 
diff --git a/src/states_screens/track_info_screen.hpp b/src/states_screens/track_info_screen.hpp
index 64335d583..5594f3cbf 100644
--- a/src/states_screens/track_info_screen.hpp
+++ b/src/states_screens/track_info_screen.hpp
@@ -55,9 +55,13 @@ class TrackInfoScreen : public GUIEngine::Screen,
     /** Spinner for number of AI karts. */
     GUIEngine::SpinnerWidget* m_ai_kart_spinner;
 
-    /** */
-    GUIEngine::CheckBoxWidget* m_checkbox;
+    /** Check box for reverse mode. */
+    GUIEngine::CheckBoxWidget* m_reverse;
+
+    /** The icons for the highscore list. */
     GUIEngine::IconButtonWidget* m_kart_icons[HIGHSCORE_COUNT];
+
+    /** The actual highscore text values shown. */
     GUIEngine::LabelWidget* m_highscore_entries[HIGHSCORE_COUNT];
     
     void updateHighScores();
@@ -75,7 +79,7 @@ public:
     virtual ~TrackInfoScreen();
     
     virtual void init();
-    virtual void loadedFromFile() {}
+    virtual void loadedFromFile();
     virtual void eventCallback(GUIEngine::Widget *,const std::string &name ,
                                const int player_id);
     void onEnterPressedInternal();

From e309008736b37e9d6b2d576476ff4d9914db5bbc Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 25 Aug 2014 23:16:59 +1000
Subject: [PATCH 114/248] Use header font for title, removed second 'back'
 button.

---
 data/gui/track_info.stkgui | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/data/gui/track_info.stkgui b/data/gui/track_info.stkgui
index 7037750ff..7dea302dd 100644
--- a/data/gui/track_info.stkgui
+++ b/data/gui/track_info.stkgui
@@ -5,7 +5,7 @@
     <div x="1%" y="1%" width="98%" height="98%">
         <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
 
-            <label id="name" width="100%" text_align="center"/>
+            <header id="name" width="100%" text_align="center"/>
 
             <spacer width="1" height="5%"/>
 
@@ -85,8 +85,6 @@
                 <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
                         I18N="Start race" text="Start Race"/>
 
-                <icon-button id="back" width="64" height="64" icon="gui/back.png"
-                        I18N="Back to previous screen" text="Back"/>
             </buttonbar>>
         </div>
 

From 0b4532b6dab95e5c6a0a0d6dec26bb07063620aa Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 22 Aug 2014 17:18:39 +0200
Subject: [PATCH 115/248] Implement AZDO

---
 src/config/user_config.hpp             |   6 +-
 src/graphics/gl_headers.hpp            |  11 +
 src/graphics/glwrap.cpp                |   2 +-
 src/graphics/render_geometry.cpp       | 381 +++++++++++++++++++------
 src/graphics/stkinstancedscenenode.cpp |   2 +-
 src/graphics/stkmeshscenenode.cpp      |   4 +-
 6 files changed, 310 insertions(+), 96 deletions(-)

diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index 88647b820..c2f787b42 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -464,9 +464,9 @@ namespace UserConfigParams
     PARAM_PREFIX BoolUserConfigParam        m_gi
         PARAM_DEFAULT(BoolUserConfigParam(false, "enable_gi",
         &m_video_group, "Enable Global Illumination"));
-    PARAM_PREFIX BoolUserConfigParam        m_bindless_textures
-        PARAM_DEFAULT(BoolUserConfigParam(false, "enable_bindless_textures",
-        &m_video_group, "Enable Bindless Texture (Experimental !)"));
+    PARAM_PREFIX BoolUserConfigParam        m_azdo
+        PARAM_DEFAULT(BoolUserConfigParam(false, "enable_azdo",
+        &m_video_group, "Enable 'Approaching Zero Driver Overhead' mode (very experimental !)"));
 
     // ---- Debug - not saved to config file
     /** If gamepad debugging is enabled. */
diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp
index 91c314ef2..3a2dfd5e5 100644
--- a/src/graphics/gl_headers.hpp
+++ b/src/graphics/gl_headers.hpp
@@ -129,6 +129,17 @@ extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
 #ifdef WIN32
 #define Bindless_Texture_Support
 #define Base_Instance_Support
+#define Buffer_Storage
+#define Multi_Draw_Indirect
 #endif
 
+
+struct DrawElementsIndirectCommand{
+    GLuint count;
+    GLuint instanceCount;
+    GLuint firstIndex;
+    GLuint baseVertex;
+    GLuint baseInstance;
+};
+
 #endif
\ No newline at end of file
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 031b08ef4..07cb76e2b 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -320,7 +320,7 @@ GLuint LoadShader(const char * file, unsigned type)
     char versionString[20];
     sprintf(versionString, "#version %d\n", irr_driver->getGLSLVersion());
     std::string Code = versionString;
-    if (UserConfigParams::m_bindless_textures)
+    if (UserConfigParams::m_azdo)
         Code += "#extension GL_ARB_bindless_texture : enable\n";
     else
     {
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 20e6e4620..fa9271ddb 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -130,7 +130,7 @@ void renderMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
             if (!mesh.textures[TexUnits[j].m_id])
                 mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
             compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
-            if (UserConfigParams::m_bindless_textures)
+            if (UserConfigParams::m_azdo)
             {
 #ifdef Bindless_Texture_Support
                 if (!mesh.TextureHandles[TexUnits[j].m_id])
@@ -151,7 +151,7 @@ void renderMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
             continue;
         }
 
-        if (UserConfigParams::m_bindless_textures)
+        if (UserConfigParams::m_azdo)
             Shader::getInstance()->SetTextureHandles(Handles);
         else
             Shader::getInstance()->SetTextureUnits(Textures);
@@ -209,22 +209,21 @@ void renderInstancedMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vec
 #endif
         if (!irr_driver->hasARB_base_instance())
             glBindVertexArray(mesh.vao);
-        if (!UserConfigParams::m_bindless_textures)
+        for (unsigned j = 0; j < TexUnits.size(); j++)
         {
-            for (unsigned j = 0; j < TexUnits.size(); j++)
-            {
-                if (!mesh.textures[TexUnits[j].m_id])
-                    mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-                compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
-                Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
-            }
-            Shader::getInstance()->SetTextureUnits(Textures);
+            if (!mesh.textures[TexUnits[j].m_id])
+                mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
+            compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
+            Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
         }
+        Shader::getInstance()->SetTextureUnits(Textures);
         instanced_custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
 }
 
 static GLsync m_sync;
+static GLuint drawindirectcmd;
+static DrawElementsIndirectCommand *CommandBufferPtr = 0;
 
 void IrrDriver::renderSolidFirstPass()
 {
@@ -295,31 +294,122 @@ void IrrDriver::renderSolidFirstPass()
             TexUnit(0, true)
         ), ListMatNormalMap::getInstance());
 
+
         renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_STANDARD, 2, 1>(TexUnits(TexUnit(0, true)), AnimatedListMatDefault::getInstance());
         renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(0, true)), AnimatedListMatAlphaRef::getInstance());
         renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_2TCOORDS, 2, 1>(TexUnits(TexUnit(0, true)), AnimatedListMatDetails::getInstance());
         renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(0, true)), AnimatedListMatUnlit::getInstance());
 
-        if (irr_driver->hasARB_base_instance())
+        if (UserConfigParams::m_azdo)
+        {
+#ifdef Buffer_Storage
+            if (!CommandBufferPtr)
+            {
+                glGenBuffers(1, &drawindirectcmd);
+                glBindBuffer(GL_DRAW_INDIRECT_BUFFER, drawindirectcmd);
+                glBufferStorage(GL_DRAW_INDIRECT_BUFFER, 100 * sizeof(DrawElementsIndirectCommand), 0, GL_MAP_PERSISTENT_BIT | GL_MAP_WRITE_BIT | GL_MAP_COHERENT_BIT);
+                CommandBufferPtr = (DrawElementsIndirectCommand *)glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0, 100 * sizeof(DrawElementsIndirectCommand), GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT | GL_MAP_WRITE_BIT);
+            }
+
+            glBindBuffer(GL_DRAW_INDIRECT_BUFFER, drawindirectcmd);
+
+            size_t offset = 0;
+            for (unsigned i = 0; i < ListInstancedMatDefault::getInstance()->size(); i++)
+            {
+                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatDefault::getInstance()->at(i)));
+                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatDefault::getInstance()->at(i));
+                DrawElementsIndirectCommand &CurrentCommand = CommandBufferPtr[offset++];
+                CurrentCommand.instanceCount = instanceCount;
+                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
+                CurrentCommand.count = mesh.IndexCount;
+                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
+                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
+            }
+            for (unsigned i = 0; i < ListInstancedMatNormalMap::getInstance()->size(); i++)
+            {
+                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatNormalMap::getInstance()->at(i)));
+                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatNormalMap::getInstance()->at(i));
+                DrawElementsIndirectCommand &CurrentCommand = CommandBufferPtr[offset++];
+                CurrentCommand.instanceCount = instanceCount;
+                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
+                CurrentCommand.count = mesh.IndexCount;
+                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
+                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
+            }
+            for (unsigned i = 0; i < ListInstancedMatAlphaRef::getInstance()->size(); i++)
+            {
+                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatAlphaRef::getInstance()->at(i)));
+                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatAlphaRef::getInstance()->at(i));
+                DrawElementsIndirectCommand &CurrentCommand = CommandBufferPtr[offset++];
+                CurrentCommand.instanceCount = instanceCount;
+                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
+                CurrentCommand.count = mesh.IndexCount;
+                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
+                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
+            }
+            for (unsigned i = 0; i < ListInstancedMatGrass::getInstance()->size(); i++)
+            {
+                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatGrass::getInstance()->at(i)));
+                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatGrass::getInstance()->at(i));
+                DrawElementsIndirectCommand &CurrentCommand = CommandBufferPtr[offset++];
+                CurrentCommand.instanceCount = instanceCount;
+                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
+                CurrentCommand.count = mesh.IndexCount;
+                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
+                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
+            }
+#endif
+#ifdef Multi_Draw_Indirect
+            unsigned ptr = 0;
+            glUseProgram(MeshShader::InstancedObjectPass1Shader::getInstance()->Program);
             glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-        renderInstancedMeshes1stPass<MeshShader::InstancedObjectPass1Shader, video::EVT_STANDARD>(
-                    TexUnits(TexUnit(0, true)),
-                    ListInstancedMatDefault::getInstance());
-        if (irr_driver->hasARB_base_instance())
-            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-        renderInstancedMeshes1stPass<MeshShader::InstancedObjectRefPass1Shader, video::EVT_STANDARD>(
-                    TexUnits(TexUnit(0, true)),
-                    ListInstancedMatAlphaRef::getInstance());
-        if (irr_driver->hasARB_base_instance())
-            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-        renderInstancedMeshes1stPass<MeshShader::InstancedGrassPass1Shader, video::EVT_STANDARD, 2>(
-                    TexUnits(TexUnit(0, true)),
-                    ListInstancedMatGrass::getInstance());
-        if (irr_driver->hasARB_base_instance())
+            if (!ListInstancedMatDefault::getInstance()->empty())
+                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatDefault::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatDefault::getInstance()->size();
+
+            glUseProgram(MeshShader::InstancedNormalMapShader::getInstance()->Program);
             glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
-        renderInstancedMeshes1stPass<MeshShader::InstancedNormalMapShader, video::EVT_TANGENTS>(
-            TexUnits(TexUnit(1, false), TexUnit(0, true)),
-            ListInstancedMatNormalMap::getInstance());
+            if (!ListInstancedMatNormalMap::getInstance()->empty())
+                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatNormalMap::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatNormalMap::getInstance()->size();
+
+            glUseProgram(MeshShader::InstancedObjectRefPass1Shader::getInstance()->Program);
+            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+            if (!ListInstancedMatAlphaRef::getInstance()->empty())
+                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatAlphaRef::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatAlphaRef::getInstance()->size();
+
+            glUseProgram(MeshShader::InstancedGrassPass1Shader::getInstance()->Program);
+            if (!ListInstancedMatGrass::getInstance()->empty())
+            {
+                MeshShader::InstancedGrassPass1Shader::getInstance()->setUniforms(STK::tuple_get<2>(ListInstancedMatGrass::getInstance()->at(0)));
+                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatGrass::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+            }
+#endif
+        }
+        else
+        {
+            if (irr_driver->hasARB_base_instance())
+                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+            renderInstancedMeshes1stPass<MeshShader::InstancedObjectPass1Shader, video::EVT_STANDARD>(
+                TexUnits(TexUnit(0, true)),
+                ListInstancedMatDefault::getInstance());
+            if (irr_driver->hasARB_base_instance())
+                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+            renderInstancedMeshes1stPass<MeshShader::InstancedObjectRefPass1Shader, video::EVT_STANDARD>(
+                TexUnits(TexUnit(0, true)),
+                ListInstancedMatAlphaRef::getInstance());
+            if (irr_driver->hasARB_base_instance())
+                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+            renderInstancedMeshes1stPass<MeshShader::InstancedGrassPass1Shader, video::EVT_STANDARD, 2>(
+                TexUnits(TexUnit(0, true)),
+                ListInstancedMatGrass::getInstance());
+            if (irr_driver->hasARB_base_instance())
+                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
+            renderInstancedMeshes1stPass<MeshShader::InstancedNormalMapShader, video::EVT_TANGENTS>(
+                TexUnits(TexUnit(1, false), TexUnit(0, true)),
+                ListInstancedMatNormalMap::getInstance());
+        }
     }
 }
 
@@ -339,7 +429,7 @@ void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
             if (!mesh.textures[TexUnits[j].m_id])
                 mesh.textures[TexUnits[j].m_id] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
             compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
-            if (UserConfigParams::m_bindless_textures)
+            if (UserConfigParams::m_azdo)
             {
 #ifdef Bindless_Texture_Support
                 if (!mesh.TextureHandles[TexUnits[j].m_id])
@@ -361,7 +451,7 @@ void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
             continue;
         }
 
-        if (UserConfigParams::m_bindless_textures)
+        if (UserConfigParams::m_azdo)
             Shader::getInstance()->SetTextureHandles(Handles);
         else
             Shader::getInstance()->SetTextureUnits(Textures);
@@ -370,8 +460,7 @@ void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
 }
 
 template<typename Shader, int...List, typename... TupleType>
-void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes, const std::vector<uint64_t> &Prefilled_Handles,
-    const std::vector<GLuint> &Prefilled_tex)
+void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes, const std::vector<GLuint> &Prefilled_tex)
 {
     glUseProgram(Shader::getInstance()->Program);
     for (unsigned i = 0; i < meshes->size(); i++)
@@ -380,26 +469,16 @@ void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vec
         if (!irr_driver->hasARB_base_instance())
             glBindVertexArray(mesh.vao);
 
-        if (UserConfigParams::m_bindless_textures)
+        std::vector<GLuint> Textures(Prefilled_tex);
+        for (unsigned j = 0; j < TexUnits.size(); j++)
         {
-            std::vector<uint64_t> Handles(Prefilled_Handles);
-            for (unsigned i = 0; i < TexUnits.size(); i++)
-                Handles.push_back(0);
-            Shader::getInstance()->SetTextureHandles(Handles);
-        }
-        else
-        {
-            std::vector<GLuint> Textures(Prefilled_tex);
-            for (unsigned j = 0; j < TexUnits.size(); j++)
-            {
-                if (!mesh.textures[TexUnits[j].m_id])
-                    mesh.textures[TexUnits[j].m_id] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-                compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
-                Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
-                Shader::getInstance()->SetTextureUnits(Textures);
-            }
-        }
+            if (!mesh.textures[TexUnits[j].m_id])
+                mesh.textures[TexUnits[j].m_id] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
+            compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
+            Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
 
+        }
+        Shader::getInstance()->SetTextureUnits(Textures);
         instanced_custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
 }
@@ -429,7 +508,7 @@ void IrrDriver::renderSolidSecondPass()
 
     uint64_t DiffuseHandle = 0, SpecularHandle = 0, SSAOHandle = 0, DepthHandle = 0;
 
-    if (UserConfigParams::m_bindless_textures)
+    if (UserConfigParams::m_azdo)
     {
 #ifdef Bindless_Texture_Support
         DiffuseHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_DIFFUSE), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[0]);
@@ -507,27 +586,64 @@ void IrrDriver::renderSolidSecondPass()
             TexUnit(0, true)
             ), ListMatNormalMap::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
 
-        if (irr_driver->hasARB_base_instance())
+        if (UserConfigParams::m_azdo)
+        {
+#ifdef Multi_Draw_Indirect
+            unsigned ptr = 0;
+            glUseProgram(MeshShader::InstancedObjectPass2Shader::getInstance()->Program);
+            MeshShader::InstancedObjectPass2Shader::getInstance()->SetTextureHandles(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0));
             glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-        renderInstancedMeshes2ndPass<MeshShader::InstancedObjectPass2Shader>(
-            TexUnits(TexUnit(0, true)),
-            ListInstancedMatDefault::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-        if (irr_driver->hasARB_base_instance())
+            if (!ListInstancedMatDefault::getInstance()->empty())
+                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatDefault::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatDefault::getInstance()->size();
+
             glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
-        renderInstancedMeshes2ndPass<MeshShader::InstancedObjectPass2Shader>(
-            TexUnits(TexUnit(0, true)),
-            ListInstancedMatNormalMap::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-        if (irr_driver->hasARB_base_instance())
+            MeshShader::InstancedObjectPass2Shader::getInstance()->SetTextureHandles(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0));
+            if (!ListInstancedMatNormalMap::getInstance()->empty())
+                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatNormalMap::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatNormalMap::getInstance()->size();
+
+            glUseProgram(MeshShader::InstancedObjectRefPass2Shader::getInstance()->Program);
             glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-        renderInstancedMeshes2ndPass<MeshShader::InstancedObjectRefPass2Shader>(
-            TexUnits(TexUnit(0, true)),
-            ListInstancedMatAlphaRef::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-        if (irr_driver->hasARB_base_instance())
-            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-        DiffSpecSSAOTex.push_back(irr_driver->getDepthStencilTexture());
-        renderInstancedMeshes2ndPass<MeshShader::InstancedGrassPass2Shader, 3, 2>(
-            TexUnits(TexUnit(0, true)),
-            ListInstancedMatGrass::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, DepthHandle), DiffSpecSSAOTex);
+            MeshShader::InstancedObjectRefPass2Shader::getInstance()->SetTextureHandles(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0));
+            if (!ListInstancedMatAlphaRef::getInstance()->empty())
+                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatAlphaRef::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatAlphaRef::getInstance()->size();
+
+            glUseProgram(MeshShader::InstancedGrassPass2Shader::getInstance()->Program);
+            MeshShader::InstancedGrassPass2Shader::getInstance()->SetTextureHandles(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, DepthHandle, 0));
+            if (!ListInstancedMatGrass::getInstance()->empty())
+            {
+                MeshShader::InstancedGrassPass2Shader::getInstance()->setUniforms(STK::tuple_get<2>(ListInstancedMatGrass::getInstance()->at(0)), STK::tuple_get<3>(ListInstancedMatGrass::getInstance()->at(0)));
+                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatGrass::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+            }
+#endif
+        }
+        else
+        {
+            if (irr_driver->hasARB_base_instance())
+                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+            renderInstancedMeshes2ndPass<MeshShader::InstancedObjectPass2Shader>(
+                TexUnits(TexUnit(0, true)),
+                ListInstancedMatDefault::getInstance(), DiffSpecSSAOTex);
+            if (irr_driver->hasARB_base_instance())
+                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
+            renderInstancedMeshes2ndPass<MeshShader::InstancedObjectPass2Shader>(
+                TexUnits(TexUnit(0, true)),
+                ListInstancedMatNormalMap::getInstance(), DiffSpecSSAOTex);
+            if (irr_driver->hasARB_base_instance())
+                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+            renderInstancedMeshes2ndPass<MeshShader::InstancedObjectRefPass2Shader>(
+                TexUnits(TexUnit(0, true)),
+                ListInstancedMatAlphaRef::getInstance(), DiffSpecSSAOTex);
+            if (irr_driver->hasARB_base_instance())
+                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+            DiffSpecSSAOTex.push_back(irr_driver->getDepthStencilTexture());
+            renderInstancedMeshes2ndPass<MeshShader::InstancedGrassPass2Shader, 3, 2>(
+                TexUnits(TexUnit(0, true)),
+                ListInstancedMatGrass::getInstance(), DiffSpecSSAOTex);
+        }
+
     }
     m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
 }
@@ -736,7 +852,7 @@ void renderShadow(const std::vector<GLuint> TextureUnits, const std::vector<STK:
         for (unsigned j = 0; j < TextureUnits.size(); j++)
         {
             compressTexture(mesh->textures[TextureUnits[j]], true);
-            if (UserConfigParams::m_bindless_textures)
+            if (UserConfigParams::m_azdo)
             {
 #ifdef Bindless_Texture_Support
                 if (!mesh->TextureHandles[TextureUnits[j]])
@@ -749,7 +865,7 @@ void renderShadow(const std::vector<GLuint> TextureUnits, const std::vector<STK:
             else
                 Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
         }
-        if (UserConfigParams::m_bindless_textures)
+        if (UserConfigParams::m_azdo)
             T::getInstance()->SetTextureHandles(Handles);
         else
             T::getInstance()->SetTextureUnits(Textures);
@@ -804,19 +920,21 @@ void renderInstancedShadow(const std::vector<GLuint> TextureUnits, const std::ve
         GLMesh *mesh = STK::tuple_get<0>(t->at(i));
         if (!irr_driver->hasARB_base_instance())
             glBindVertexArray(mesh->vao_shadow_pass);
-        if (!UserConfigParams::m_bindless_textures)
+
+        for (unsigned j = 0; j < TextureUnits.size(); j++)
         {
-            for (unsigned j = 0; j < TextureUnits.size(); j++)
-            {
-                compressTexture(mesh->textures[TextureUnits[j]], true);
-                Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
-                T::getInstance()->SetTextureUnits(Textures);
-            }
+            compressTexture(mesh->textures[TextureUnits[j]], true);
+            Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
+
         }
+        T::getInstance()->SetTextureUnits(Textures);
         instanced_shadow_custom_unroll_args<List...>::template exec<T>(T::getInstance(), t->at(i));
     }
 }
 
+static GLuint shadowdrawindirectcmd;
+static DrawElementsIndirectCommand *ShadowCommandBufferPtr = 0;
+
 void IrrDriver::renderShadows()
 {
     glDepthFunc(GL_LEQUAL);
@@ -864,18 +982,103 @@ void IrrDriver::renderShadows()
     renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, AnimatedListMatUnlit::getInstance());
     renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, AnimatedListMatDetails::getInstance());
 
-    if (irr_driver->hasARB_base_instance())
+    if (UserConfigParams::m_azdo)
+    {
+#ifdef Buffer_Storage
+        if (!ShadowCommandBufferPtr)
+        {
+            glGenBuffers(1, &shadowdrawindirectcmd);
+            glBindBuffer(GL_DRAW_INDIRECT_BUFFER, shadowdrawindirectcmd);
+            glBufferStorage(GL_DRAW_INDIRECT_BUFFER, 100 * sizeof(DrawElementsIndirectCommand), 0, GL_MAP_PERSISTENT_BIT | GL_MAP_WRITE_BIT | GL_MAP_COHERENT_BIT);
+            ShadowCommandBufferPtr = (DrawElementsIndirectCommand *)glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0, 100 * sizeof(DrawElementsIndirectCommand), GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT | GL_MAP_WRITE_BIT);
+        }
+
+        glBindBuffer(GL_DRAW_INDIRECT_BUFFER, shadowdrawindirectcmd);
+
+        size_t offset = 0;
+        for (unsigned i = 0; i < ListInstancedMatDefault::getInstance()->size(); i++)
+        {
+            const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatDefault::getInstance()->at(i)));
+            size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatDefault::getInstance()->at(i));
+            DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
+            CurrentCommand.instanceCount = 4 * instanceCount;
+            CurrentCommand.baseVertex = mesh.vaoBaseVertex;
+            CurrentCommand.count = mesh.IndexCount;
+            CurrentCommand.firstIndex = mesh.vaoOffset / 2;
+            CurrentCommand.baseInstance = mesh.vaoBaseInstance;
+        }
+        for (unsigned i = 0; i < ListInstancedMatNormalMap::getInstance()->size(); i++)
+        {
+            const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatNormalMap::getInstance()->at(i)));
+            size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatNormalMap::getInstance()->at(i));
+            DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
+            CurrentCommand.instanceCount = 4 * instanceCount;
+            CurrentCommand.baseVertex = mesh.vaoBaseVertex;
+            CurrentCommand.count = mesh.IndexCount;
+            CurrentCommand.firstIndex = mesh.vaoOffset / 2;
+            CurrentCommand.baseInstance = mesh.vaoBaseInstance;
+        }
+        for (unsigned i = 0; i < ListInstancedMatAlphaRef::getInstance()->size(); i++)
+        {
+            const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatAlphaRef::getInstance()->at(i)));
+            size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatAlphaRef::getInstance()->at(i));
+            DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
+            CurrentCommand.instanceCount = 4 * instanceCount;
+            CurrentCommand.baseVertex = mesh.vaoBaseVertex;
+            CurrentCommand.count = mesh.IndexCount;
+            CurrentCommand.firstIndex = mesh.vaoOffset / 2;
+            CurrentCommand.baseInstance = mesh.vaoBaseInstance;
+        }
+        for (unsigned i = 0; i < ListInstancedMatGrass::getInstance()->size(); i++)
+        {
+            const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatGrass::getInstance()->at(i)));
+            size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatGrass::getInstance()->at(i));
+            DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
+            CurrentCommand.instanceCount = 4 * instanceCount;
+            CurrentCommand.baseVertex = mesh.vaoBaseVertex;
+            CurrentCommand.count = mesh.IndexCount;
+            CurrentCommand.firstIndex = mesh.vaoOffset / 2;
+            CurrentCommand.baseInstance = mesh.vaoBaseInstance;
+        }
+#endif
+#ifdef Multi_Draw_Indirect
+        unsigned ptr = 0;
+        glUseProgram(MeshShader::InstancedShadowShader::getInstance()->Program);
         glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-    renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, ListInstancedMatDefault::getInstance());
-    if (irr_driver->hasARB_base_instance())
-        glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-    renderInstancedShadow<MeshShader::InstancedRefShadowShader>(std::vector<GLuint>{ 0 }, ListInstancedMatAlphaRef::getInstance());
-    if (irr_driver->hasARB_base_instance())
-        glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-    renderInstancedShadow<MeshShader::InstancedGrassShadowShader, 2>(std::vector<GLuint>{ 0 }, ListInstancedMatGrass::getInstance());
-    if (irr_driver->hasARB_base_instance())
+        glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatDefault::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+        ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatDefault::getInstance()->size();
+
+        glUseProgram(MeshShader::InstancedShadowShader::getInstance()->Program);
         glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
-    renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, ListInstancedMatNormalMap::getInstance());
+        glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatNormalMap::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+        ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatNormalMap::getInstance()->size();
+
+        glUseProgram(MeshShader::InstancedRefShadowShader::getInstance()->Program);
+        glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+        glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatAlphaRef::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+        ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatAlphaRef::getInstance()->size();
+
+        glUseProgram(MeshShader::InstancedGrassShadowShader::getInstance()->Program);
+        MeshShader::InstancedGrassShadowShader::getInstance()->setUniforms(STK::tuple_get<2>(ListInstancedMatGrass::getInstance()->at(0)));
+        glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+        glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatGrass::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+#endif
+    }
+    else
+    {
+        if (irr_driver->hasARB_base_instance())
+            glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+        renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, ListInstancedMatDefault::getInstance());
+        if (irr_driver->hasARB_base_instance())
+            glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+        renderInstancedShadow<MeshShader::InstancedRefShadowShader>(std::vector<GLuint>{ 0 }, ListInstancedMatAlphaRef::getInstance());
+        if (irr_driver->hasARB_base_instance())
+            glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+        renderInstancedShadow<MeshShader::InstancedGrassShadowShader, 2>(std::vector<GLuint>{ 0 }, ListInstancedMatGrass::getInstance());
+        if (irr_driver->hasARB_base_instance())
+            glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
+        renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, ListInstancedMatNormalMap::getInstance());
+    }
 
     glDisable(GL_POLYGON_OFFSET_FILL);
 }
diff --git a/src/graphics/stkinstancedscenenode.cpp b/src/graphics/stkinstancedscenenode.cpp
index 3b7b8e225..03de07b9b 100644
--- a/src/graphics/stkinstancedscenenode.cpp
+++ b/src/graphics/stkinstancedscenenode.cpp
@@ -127,7 +127,7 @@ void STKInstancedSceneNode::addInstance(const core::vector3df &origin, const cor
     {
         GLMesh &mesh = GLmeshes[i];
 #ifdef Bindless_Texture_Support
-        if (UserConfigParams::m_bindless_textures)
+        if (UserConfigParams::m_azdo)
         {
             for (unsigned j = 0; j < 2; j++)
             {
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 1b4f7c737..47606345b 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -341,7 +341,7 @@ void STKMeshSceneNode::render()
                         tmpcol.getBlue() / 255.0f);
 
                     compressTexture(mesh.textures[0], true);
-                    if (UserConfigParams::m_bindless_textures)
+                    if (UserConfigParams::m_azdo)
                     {
 #ifdef Bindless_Texture_Support
                         if (!mesh.TextureHandles[0])
@@ -373,7 +373,7 @@ void STKMeshSceneNode::render()
                     size_t count = mesh.IndexCount;
 
                     compressTexture(mesh.textures[0], true);
-                    if (UserConfigParams::m_bindless_textures)
+                    if (UserConfigParams::m_azdo)
                     {
 #ifdef Bindless_Texture_Support
                         if (!mesh.TextureHandles[0])

From 4b597b97b734fa7a99241a93ae5852be7341c667 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 25 Aug 2014 21:52:42 +0200
Subject: [PATCH 116/248] Fixed path to data directory on linux.

Ideally we should use relative paths, which could make possible to run the game after using:
make install DESTDIR=./any/local/path

I also added path to "supertuxkart-assets" directory, which cmake already search.
---
 src/io/file_manager.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/io/file_manager.cpp b/src/io/file_manager.cpp
index ec7d64e32..29f36d7c2 100644
--- a/src/io/file_manager.cpp
+++ b/src/io/file_manager.cpp
@@ -150,7 +150,7 @@ FileManager::FileManager()
     if(exe_path.size()==0 || exe_path[exe_path.size()-1]!='/')
         exe_path += "/";
     if ( getenv ( "SUPERTUXKART_DATADIR" ) != NULL )
-        root_dir = std::string(getenv("SUPERTUXKART_DATADIR"))+"/" ;
+        root_dir = std::string(getenv("SUPERTUXKART_DATADIR"))+"/data/" ;
 #ifdef __APPLE__
     else if( macSetBundlePathIfRelevant( root_dir ) ) { root_dir = root_dir + "data/"; }
 #endif
@@ -174,7 +174,7 @@ FileManager::FileManager()
     else
     {
 #ifdef SUPERTUXKART_DATADIR
-        root_dir = SUPERTUXKART_DATADIR;
+        root_dir = SUPERTUXKART_DATADIR"/data/";
         if(root_dir.size()==0 || root_dir[root_dir.size()-1]!='/')
             root_dir+='/';
 
@@ -186,6 +186,8 @@ FileManager::FileManager()
     addRootDirs(root_dir);
     if( fileExists(root_dir+"../../stk-assets"))
         addRootDirs(root_dir+"../../stk-assets");
+    if( fileExists(root_dir+"../../supertuxkart-assets"))
+        addRootDirs(root_dir+"../../supertuxkart-assets");
     if ( getenv ( "SUPERTUXKART_ROOT_PATH" ) != NULL )
         addRootDirs(getenv("SUPERTUXKART_ROOT_PATH"));
 

From c9fb0c5b1617cf37a806a417612149f05c16c6f3 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 26 Aug 2014 16:36:05 +1000
Subject: [PATCH 117/248] Removed unnecessary include.

---
 src/states_screens/main_menu_screen.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp
index 4390fa7d8..45a038b11 100644
--- a/src/states_screens/main_menu_screen.cpp
+++ b/src/states_screens/main_menu_screen.cpp
@@ -45,7 +45,6 @@
 #include "states_screens/online_screen.hpp"
 #include "states_screens/options_screen_video.hpp"
 #include "states_screens/state_manager.hpp"
-#include "states_screens/track_info_screen.hpp"
 #include "states_screens/user_screen.hpp"
 #if DEBUG_MENU_ITEM
 #include "states_screens/feature_unlocked.hpp"

From b029c3e990436b7a2c5d5fd2a240e8958de8efa6 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 26 Aug 2014 16:37:06 +1000
Subject: [PATCH 118/248] Fixed setting of actual number of laps of a track;
 cleaned up docs.

---
 src/states_screens/track_info_screen.cpp |  5 ++---
 src/states_screens/track_info_screen.hpp | 17 +++--------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/states_screens/track_info_screen.cpp b/src/states_screens/track_info_screen.cpp
index ba3d916bc..c17c71f7f 100644
--- a/src/states_screens/track_info_screen.cpp
+++ b/src/states_screens/track_info_screen.cpp
@@ -71,7 +71,7 @@ void TrackInfoScreen::loadedFromFile()
 }   // loadedFromFile
 
 // ----------------------------------------------------------------------------
-void TrackInfoScreen::setTrack(const Track *track)
+void TrackInfoScreen::setTrack(Track *track)
 {
     m_track = track;
 }   // setTrack
@@ -107,7 +107,6 @@ void TrackInfoScreen::init()
 
     // temporary icon, will replace it just after (but it will be shown if the given icon is not found)
     screenshot_widget->m_properties[PROP_ICON] = "gui/main_help.png";
-    //FIXME screenshot_widget->setParent(m_irrlicht_window);
     screenshot_widget->add();
 
     ITexture* screenshot = irr_driver->getTexture(m_track->getScreenshotFile(),
@@ -268,7 +267,7 @@ void TrackInfoScreen::onEnterPressedInternal()
                                                      : -1;
     const bool reverse_track = m_reverse == NULL ? false
                                                   : m_reverse->getState();
-   //FIXME m_track->setActualNumberOfLaps(num_laps);
+    m_track->setActualNumberOfLaps(num_laps);
     race_manager->setReverseTrack(reverse_track);
 
     // Disable accidentally unlocking of a challenge
diff --git a/src/states_screens/track_info_screen.hpp b/src/states_screens/track_info_screen.hpp
index 5594f3cbf..e706640e9 100644
--- a/src/states_screens/track_info_screen.hpp
+++ b/src/states_screens/track_info_screen.hpp
@@ -22,9 +22,6 @@
 
 #include "guiengine/screen.hpp"
 
-//#include "guiengine/widgets/check_box_widget.hpp"
-
-
 namespace GUIEngine
 {
     class CheckBoxWidget;
@@ -40,12 +37,12 @@ class Track;
  * \ingroup states_screens
  */
 class TrackInfoScreen : public GUIEngine::Screen,
-                  public GUIEngine::ScreenSingleton<TrackInfoScreen>
+                        public GUIEngine::ScreenSingleton<TrackInfoScreen>
 {
     static const int HIGHSCORE_COUNT = 3;
 
     /** A pointer to the track of which the info is shown. */
-    const Track *m_track;
+    Track *m_track;
 
     // When there is no need to tab through / click on images/labels, we can add directly
     // irrlicht labels (more complicated uses require the use of our widget set)
@@ -67,14 +64,6 @@ class TrackInfoScreen : public GUIEngine::Screen,
     void updateHighScores();
     
 public:
-    /**
-     * \brief Creates a track info modal dialog with given percentage of screen width and height
-     * \param ribbonItem identifier name of the ribbon item that was clicked in the track selection
-     *        screen to get there (often will be 'trackIdent' but may also be the random item)
-     * \param trackIdent identifier name of the track to show information about
-     * \param trackName  human-readable, possibly translated, name of the track to show information about
-     * \param screenshot screenshot of the track to show information about
-     */
     TrackInfoScreen();
     virtual ~TrackInfoScreen();
     
@@ -83,7 +72,7 @@ public:
     virtual void eventCallback(GUIEngine::Widget *,const std::string &name ,
                                const int player_id);
     void onEnterPressedInternal();
-    void setTrack(const Track *track);
+    void setTrack(Track *track);
 };
 
 #endif

From 672ec8e5e83a7229e37a6ebc9da7d9631fe7842e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 26 Aug 2014 16:39:54 +1000
Subject: [PATCH 119/248] Fixed crash: m_tracks is NULL, and can't be used to
 get the default number of laps here.

---
 src/states_screens/edit_track_screen.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/states_screens/edit_track_screen.cpp b/src/states_screens/edit_track_screen.cpp
index ed2667c2d..c3b68fe29 100644
--- a/src/states_screens/edit_track_screen.cpp
+++ b/src/states_screens/edit_track_screen.cpp
@@ -234,7 +234,9 @@ void EditTrackScreen::selectTrack(const std::string& id)
         tracks->setSelection("", PLAYER_ID_GAME_MASTER, true);
         selected_track->setText(_("Select a track"), true);
 
-        laps->setValue(m_track->getDefaultNumberOfLaps());
+        // We can't set a better default for number of laps. On the other
+        // hand, if a track is selected, the number of laps will be updated.
+        laps->setValue(3);
 
         reverse->setVisible(true);
         reverse->setState(false);

From 0960f090dca8dd83ed856bf4beb6ff5f1cafced5 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 26 Aug 2014 17:31:05 +0200
Subject: [PATCH 120/248] Add instanced spheremap shader

---
 .../instanced_objectpass_spheremap.frag       | 33 +++++++++++++++++++
 src/graphics/shaders.cpp                      | 20 +++++++++--
 src/graphics/shaders.hpp                      |  6 ++++
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 data/shaders/instanced_objectpass_spheremap.frag

diff --git a/data/shaders/instanced_objectpass_spheremap.frag b/data/shaders/instanced_objectpass_spheremap.frag
new file mode 100644
index 000000000..888e20320
--- /dev/null
+++ b/data/shaders/instanced_objectpass_spheremap.frag
@@ -0,0 +1,33 @@
+// See http://www.ozone3d.net/tutorials/glsl_texturing_p04.php for ref
+
+#ifndef GL_ARB_bindless_texture
+uniform sampler2D tex;
+#endif
+
+#ifdef GL_ARB_bindless_texture
+flat in sampler2D handle;
+#endif
+in vec3 nor;
+out vec4 FragColor;
+
+
+vec4 getPosFromUVDepth(vec3 uvDepth, mat4 InverseProjectionMatrix);
+vec3 getLightFactor(float specMapValue);
+
+void main() {
+    vec3 texc = gl_FragCoord.xyz / vec3(screen, 1.);
+    vec3 u = getPosFromUVDepth(texc, InverseProjectionMatrix).xyz;
+    vec3 r = reflect(u, nor);
+
+    float m = 2.0 * sqrt(r.x * r.x + r.y * r.y + (r.z + 1.0) * (r.z + 1.0));
+    r.y = - r.y;
+#ifdef GL_ARB_bindless_texture
+    vec4 detail0 = texture(handle, r.xy / m + .5);
+    detail0.xyz = pow(detail0.xyz, vec3(2.2));
+#else
+    vec4 detail0 = texture(tex, r.xy / m + .5);
+#endif
+    vec3 LightFactor = getLightFactor(1.);
+
+    FragColor = vec4(detail0.xyz * LightFactor, 1.);
+}
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 968642db9..e882239d9 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -987,11 +987,27 @@ namespace MeshShader
     SphereMapShader::SphereMapShader()
     {
         Program = LoadProgram(
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_objectpass_spheremap.frag").c_str());
+        AssignUniforms("ModelMatrix", "InverseModelMatrix");
+
+        GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
+        glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
+
+        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
+    }
+
+    InstancedSphereMapShader::InstancedSphereMapShader()
+    {
+        Program = LoadProgram(
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/in.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectpass_spheremap.frag").c_str());
-        AssignUniforms("ModelMatrix", "InverseModelMatrix");
+        AssignUniforms();
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index ce4481cb9..5d58eb0d8 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -554,6 +554,12 @@ public:
     SphereMapShader();
 };
 
+class InstancedSphereMapShader : public ShaderHelperSingleton<InstancedSphereMapShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
+{
+public:
+    InstancedSphereMapShader();
+};
+
 class SplattingShader : public ShaderHelperSingleton<SplattingShader, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:

From cad1efbff1eb7e68525bc9bddb630b4195b5a161 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 26 Aug 2014 18:55:08 +0200
Subject: [PATCH 121/248] Add instanced detail shader

---
 .../instanced_detailledobject_pass2.frag      | 29 +++++++++++++++++++
 src/graphics/shaders.cpp                      | 15 ++++++++++
 src/graphics/shaders.hpp                      |  6 ++++
 3 files changed, 50 insertions(+)
 create mode 100644 data/shaders/instanced_detailledobject_pass2.frag

diff --git a/data/shaders/instanced_detailledobject_pass2.frag b/data/shaders/instanced_detailledobject_pass2.frag
new file mode 100644
index 000000000..4e06686aa
--- /dev/null
+++ b/data/shaders/instanced_detailledobject_pass2.frag
@@ -0,0 +1,29 @@
+#ifndef GL_ARB_bindless_texture
+uniform sampler2D Albedo;
+uniform sampler2D Detail;
+#endif
+
+#ifdef GL_ARB_bindless_texture
+flat in sampler2D handle;
+flat in sampler2D secondhandle;
+#endif
+in vec2 uv;
+in vec2 uv_bis;
+out vec4 FragColor;
+
+vec3 getLightFactor(float specMapValue);
+
+void main(void)
+{
+#ifdef GL_ARB_bindless_texture
+    vec4 color = texture(handle, uv);
+    color.xyz = pow(color.xyz, vec3(2.2));
+    vec4 detail = texture(secondhandle, uv_bis);
+#else
+    vec4 color = texture(Albedo, uv);
+    vec4 detail = texture(Detail, uv_bis);
+#endif
+    color *= detail;
+    vec3 LightFactor = getLightFactor(1. - color.a);
+    FragColor = vec4(color.xyz * LightFactor, 1.);
+}
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index e882239d9..ffe6eeca5 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -931,6 +931,21 @@ namespace MeshShader
         AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "Detail");
     }
 
+    InstancedDetailledObjectPass2Shader::InstancedDetailledObjectPass2Shader()
+    {
+        Program = LoadProgram(
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_detailledobject_pass2.frag").c_str());
+        AssignUniforms();
+
+        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "Detail");
+
+        GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
+        glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
+    }
+
     ObjectUnlitShader::ObjectUnlitShader()
     {
         Program = LoadProgram(
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 5d58eb0d8..c2fefee63 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -524,6 +524,12 @@ public:
     DetailledObjectPass2Shader();
 };
 
+class InstancedDetailledObjectPass2Shader : public ShaderHelperSingleton<InstancedDetailledObjectPass2Shader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+{
+public:
+    InstancedDetailledObjectPass2Shader();
+};
+
 class ObjectUnlitShader : public ShaderHelperSingleton<ObjectUnlitShader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:

From bf5410b7932c78442fb51993a97f8940ce027338 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 26 Aug 2014 19:46:02 +0200
Subject: [PATCH 122/248] Add unlit instanced shader

---
 data/shaders/instanced_object_unlit.frag | 24 ++++++++++++++++++++++++
 src/graphics/shaders.cpp                 | 14 ++++++++++++++
 src/graphics/shaders.hpp                 |  6 ++++++
 3 files changed, 44 insertions(+)
 create mode 100644 data/shaders/instanced_object_unlit.frag

diff --git a/data/shaders/instanced_object_unlit.frag b/data/shaders/instanced_object_unlit.frag
new file mode 100644
index 000000000..8875371fe
--- /dev/null
+++ b/data/shaders/instanced_object_unlit.frag
@@ -0,0 +1,24 @@
+#ifndef GL_ARB_bindless_texture
+uniform sampler2D tex;
+#endif
+
+#ifdef GL_ARB_bindless_texture
+flat in sampler2D handle;
+#endif
+
+in vec2 uv;
+in vec4 color;
+out vec4 FragColor;
+
+void main(void)
+{
+#ifdef GL_ARB_bindless_texture
+    vec4 col = texture(handle, uv);
+    col.xyz = pow(col.xyz, vec3(2.2));
+#else
+    vec4 col = texture(tex, uv);
+#endif
+    col.xyz *= pow(color.xyz, vec3(2.2));
+    if (col.a < 0.5) discard;
+    FragColor = vec4(col.xyz, 1.);
+}
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index ffe6eeca5..60ecd3709 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -959,6 +959,20 @@ namespace MeshShader
         AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
     }
 
+    InstancedObjectUnlitShader::InstancedObjectUnlitShader()
+    {
+        Program = LoadProgram(
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_object_unlit.frag").c_str());
+        AssignUniforms();
+
+        GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
+        glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
+
+        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
+    }
+
     ObjectRefPass2Shader::ObjectRefPass2Shader()
     {
         Program = LoadProgram(
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index c2fefee63..147f9daa2 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -536,6 +536,12 @@ public:
     ObjectUnlitShader();
 };
 
+class InstancedObjectUnlitShader : public ShaderHelperSingleton<InstancedObjectUnlitShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
+{
+public:
+    InstancedObjectUnlitShader();
+};
+
 class ObjectRefPass2Shader : public ShaderHelperSingleton<ObjectRefPass2Shader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:

From 264a9dbe460968aef81efd827c338a7e2da18a87 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 26 Aug 2014 20:45:55 +0200
Subject: [PATCH 123/248] Do not split animated mesh from static list

---
 src/graphics/render_geometry.cpp | 37 --------------------------------
 src/graphics/stkanimatedmesh.cpp |  8 +++----
 src/graphics/stkmesh.hpp         | 12 -----------
 3 files changed, 4 insertions(+), 53 deletions(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index fa9271ddb..d882ef8ab 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -250,10 +250,6 @@ void IrrDriver::renderSolidFirstPass()
     ListInstancedMatAlphaRef::getInstance()->clear();
     ListInstancedMatGrass::getInstance()->clear();
     ListInstancedMatNormalMap::getInstance()->clear();
-    AnimatedListMatDefault::getInstance()->clear();
-    AnimatedListMatAlphaRef::getInstance()->clear();
-    AnimatedListMatDetails::getInstance()->clear();
-    AnimatedListMatUnlit::getInstance()->clear();
     // Add a 30 ms timeout
     if (!m_sync)
         m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
@@ -294,12 +290,6 @@ void IrrDriver::renderSolidFirstPass()
             TexUnit(0, true)
         ), ListMatNormalMap::getInstance());
 
-
-        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_STANDARD, 2, 1>(TexUnits(TexUnit(0, true)), AnimatedListMatDefault::getInstance());
-        renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(0, true)), AnimatedListMatAlphaRef::getInstance());
-        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_2TCOORDS, 2, 1>(TexUnits(TexUnit(0, true)), AnimatedListMatDetails::getInstance());
-        renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(0, true)), AnimatedListMatUnlit::getInstance());
-
         if (UserConfigParams::m_azdo)
         {
 #ifdef Buffer_Storage
@@ -540,39 +530,22 @@ void IrrDriver::renderSolidSecondPass()
             TexUnit(0, true)
         ), ListMatDefault::getInstance(),
         createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-        renderMeshes2ndPass<MeshShader::ObjectPass2Shader, video::EVT_STANDARD, 3, 1>(TexUnits(
-            TexUnit(0, true)
-            ), AnimatedListMatDefault::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-
         renderMeshes2ndPass<MeshShader::ObjectRefPass2Shader, video::EVT_STANDARD, 3, 1 >(TexUnits(
             TexUnit(0, true)
             ), ListMatAlphaRef::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-        renderMeshes2ndPass<MeshShader::ObjectRefPass2Shader, video::EVT_STANDARD, 3, 1 >(TexUnits(
-            TexUnit(0, true)
-            ), AnimatedListMatAlphaRef::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-
         renderMeshes2ndPass<MeshShader::SphereMapShader, video::EVT_STANDARD, 2, 1>(TexUnits(
             TexUnit(0, true)
             ), ListMatSphereMap::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-
         renderMeshes2ndPass<MeshShader::DetailledObjectPass2Shader, video::EVT_2TCOORDS, 1>(TexUnits(
             TexUnit(0, true),
             TexUnit(1, true)
             ), ListMatDetails::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-        renderMeshes2ndPass<MeshShader::DetailledObjectPass2Shader, video::EVT_2TCOORDS, 1>(TexUnits(
-            TexUnit(0, true),
-            TexUnit(1, true)
-            ), AnimatedListMatDetails::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
         renderMeshes2ndPass<MeshShader::GrassPass2Shader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(0, true)
             ), ListMatGrass::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-
         renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(0, true)
             ), ListMatUnlit::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-        renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 3, 1>(TexUnits(
-            TexUnit(0, true)
-            ), AnimatedListMatUnlit::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
 
         renderMeshes2ndPass<MeshShader::SplattingShader, video::EVT_2TCOORDS, 1>(TexUnits(
             TexUnit(1, false),
@@ -581,7 +554,6 @@ void IrrDriver::renderSolidSecondPass()
             TexUnit(4, true),
             TexUnit(5, true)
             ), ListMatSplatting::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-
         renderMeshes2ndPass<MeshShader::ObjectPass2Shader, video::EVT_TANGENTS, 3, 1>(TexUnits(
             TexUnit(0, true)
             ), ListMatNormalMap::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
@@ -961,10 +933,6 @@ void IrrDriver::renderShadows()
     ListInstancedMatAlphaRef::getInstance()->clear();
     ListInstancedMatGrass::getInstance()->clear();
     ListInstancedMatNormalMap::getInstance()->clear();
-    AnimatedListMatDefault::getInstance()->clear();
-    AnimatedListMatAlphaRef::getInstance()->clear();
-    AnimatedListMatDetails::getInstance()->clear();
-    AnimatedListMatUnlit::getInstance()->clear();
     m_scene_manager->drawAll(scene::ESNRP_SOLID);
 
     std::vector<GLuint> noTexUnits;
@@ -977,11 +945,6 @@ void IrrDriver::renderShadows()
     renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, ListMatUnlit::getInstance());
     renderShadow<MeshShader::GrassShadowShader, EVT_STANDARD, 3, 1>(std::vector<GLuint>{ 0 }, ListMatGrass::getInstance());
 
-    renderShadow<MeshShader::ShadowShader, EVT_STANDARD, 1>(noTexUnits, AnimatedListMatDefault::getInstance());
-    renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, AnimatedListMatAlphaRef::getInstance());
-    renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, AnimatedListMatUnlit::getInstance());
-    renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, AnimatedListMatDetails::getInstance());
-
     if (UserConfigParams::m_azdo)
     {
 #ifdef Buffer_Storage
diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stkanimatedmesh.cpp
index 1b07ba301..15c94e2b5 100644
--- a/src/graphics/stkanimatedmesh.cpp
+++ b/src/graphics/stkanimatedmesh.cpp
@@ -146,16 +146,16 @@ void STKAnimatedMesh::render()
 
         GLMesh* mesh;
         for_in(mesh, MeshSolidMaterial[MAT_DEFAULT])
-            pushVector(AnimatedListMatDefault::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
+            pushVector(ListMatDefault::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
 
         for_in(mesh, MeshSolidMaterial[MAT_ALPHA_REF])
-            pushVector(AnimatedListMatAlphaRef::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
+            pushVector(ListMatAlphaRef::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
 
         for_in(mesh, MeshSolidMaterial[MAT_DETAIL])
-            pushVector(AnimatedListMatDetails::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
+            pushVector(ListMatDetails::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
 
         for_in(mesh, MeshSolidMaterial[MAT_UNLIT])
-            pushVector(AnimatedListMatUnlit::getInstance(), mesh, AbsoluteTransformation, core::matrix4::EM4CONST_IDENTITY, mesh->TextureMatrix);
+            pushVector(ListMatUnlit::getInstance(), mesh, AbsoluteTransformation, core::matrix4::EM4CONST_IDENTITY, mesh->TextureMatrix);
 
         return;
     }
diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stkmesh.hpp
index beaee62cb..87fdf9071 100644
--- a/src/graphics/stkmesh.hpp
+++ b/src/graphics/stkmesh.hpp
@@ -67,15 +67,9 @@ class MeshList : public Singleton<T>, public std::vector<STK::Tuple<Args...> >
 class ListMatDefault : public MeshList<ListMatDefault, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
-class AnimatedListMatDefault : public MeshList<AnimatedListMatDefault, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
-{};
-
 class ListMatAlphaRef : public MeshList<ListMatAlphaRef, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
-class AnimatedListMatAlphaRef : public MeshList<AnimatedListMatAlphaRef, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
-{};
-
 class ListMatNormalMap : public MeshList<ListMatNormalMap, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
@@ -91,15 +85,9 @@ class ListMatSplatting : public MeshList<ListMatSplatting, GLMesh *, core::matri
 class ListMatUnlit : public MeshList<ListMatUnlit, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
-class AnimatedListMatUnlit : public MeshList<AnimatedListMatUnlit, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
-{};
-
 class ListMatDetails : public MeshList<ListMatDetails, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
-class AnimatedListMatDetails : public MeshList<AnimatedListMatDetails, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
-{};
-
 class ListBlendTransparent : public MeshList<ListBlendTransparent, GLMesh *, core::matrix4, core::matrix4>
 {};
 

From 4f411ccdb17fde1a2fa0e70794ee893e310ba9bc Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 26 Aug 2014 21:02:27 +0200
Subject: [PATCH 124/248] Fix spheremap shader

---
 src/graphics/shaders.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 60ecd3709..b43ba71bd 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1016,11 +1016,10 @@ namespace MeshShader
     SphereMapShader::SphereMapShader()
     {
         Program = LoadProgram(
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_objectpass_spheremap.frag").c_str());
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectpass_spheremap.frag").c_str());
         AssignUniforms("ModelMatrix", "InverseModelMatrix");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
@@ -1032,10 +1031,11 @@ namespace MeshShader
     InstancedSphereMapShader::InstancedSphereMapShader()
     {
         Program = LoadProgram(
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/in.vert").c_str(),
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectpass_spheremap.frag").c_str());
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_objectpass_spheremap.frag").c_str());
         AssignUniforms();
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");

From 53c52470eecff7ad3ab8d6bb78cb20d7bacac345 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Mon, 25 Aug 2014 18:20:37 +0200
Subject: [PATCH 125/248] Use one call for each shadow cascade instead of a big
 one.

---
 data/shaders/instanciedgrassshadow.vert |   6 +-
 data/shaders/instanciedshadow.vert      |   6 +-
 data/shaders/shadow.vert                |   5 +-
 data/shaders/shadow_grass.vert          |   5 +-
 src/graphics/glwrap.cpp                 |   8 +-
 src/graphics/render_geometry.cpp        | 233 ++++++++++++------------
 src/graphics/shaders.cpp                |  11 +-
 src/graphics/shaders.hpp                |  12 +-
 src/graphics/stkinstancedscenenode.cpp  |   6 +-
 9 files changed, 151 insertions(+), 141 deletions(-)

diff --git a/data/shaders/instanciedgrassshadow.vert b/data/shaders/instanciedgrassshadow.vert
index 1a88fbf6a..005bb7198 100644
--- a/data/shaders/instanciedgrassshadow.vert
+++ b/data/shaders/instanciedgrassshadow.vert
@@ -1,3 +1,5 @@
+uniform int layer;
+
 uniform vec3 windDir;
 #if __VERSION__ >= 330
 layout(location = 0) in vec3 Position;
@@ -41,14 +43,14 @@ void main(void)
 {
     mat4 ModelMatrix = getWorldMatrix(Origin, Orientation, Scale);
 #ifdef VSLayer
-    gl_Layer = gl_InstanceID & 3;
+    gl_Layer = layer;
     gl_Position = ShadowViewProjMatrixes[gl_Layer] * ModelMatrix * vec4(Position + windDir * Color.r, 1.);
     uv = Texcoord;
 #ifdef GL_ARB_bindless_texture
     handle = Handle;
 #endif
 #else
-    layerId = gl_InstanceID & 3;
+    layerId = layer;
     gl_Position = ShadowViewProjMatrixes[layerId] * ModelMatrix * vec4(Position + windDir * Color.r, 1.);
     tc = Texcoord;
 #ifdef GL_ARB_bindless_texture
diff --git a/data/shaders/instanciedshadow.vert b/data/shaders/instanciedshadow.vert
index 0bfc9426b..db027af72 100644
--- a/data/shaders/instanciedshadow.vert
+++ b/data/shaders/instanciedshadow.vert
@@ -1,3 +1,5 @@
+uniform int layer;
+
 #if __VERSION__ >= 330
 layout(location = 0) in vec3 Position;
 layout(location = 3) in vec2 Texcoord;
@@ -38,14 +40,14 @@ void main(void)
 {
     mat4 ModelMatrix = getWorldMatrix(Origin, Orientation, Scale);
 #ifdef VSLayer
-    gl_Layer = gl_InstanceID & 3;
+    gl_Layer = layer;
     gl_Position = ShadowViewProjMatrixes[gl_Layer] * ModelMatrix * vec4(Position, 1.);
     uv = Texcoord;
 #ifdef GL_ARB_bindless_texture
     handle = Handle;
 #endif
 #else
-    layerId = gl_InstanceID & 3;
+    layerId = layer;
     gl_Position = ShadowViewProjMatrixes[layerId] * ModelMatrix * vec4(Position, 1.);
     tc = Texcoord;
 #ifdef GL_ARB_bindless_texture
diff --git a/data/shaders/shadow.vert b/data/shaders/shadow.vert
index 7fe9b6fa8..3bbc6c6a5 100644
--- a/data/shaders/shadow.vert
+++ b/data/shaders/shadow.vert
@@ -1,3 +1,4 @@
+uniform int layer;
 uniform mat4 ModelMatrix;
 
 #if __VERSION__ >= 330
@@ -18,11 +19,11 @@ out int layerId;
 void main(void)
 {
 #ifdef VSLayer
-    gl_Layer = gl_InstanceID & 3;
+    gl_Layer = layer;
     uv = Texcoord;
     gl_Position = ShadowViewProjMatrixes[gl_Layer] * ModelMatrix * vec4(Position, 1.);
 #else
-    layerId = gl_InstanceID & 3;
+    layerId = layer;
     tc = Texcoord;
     gl_Position = ShadowViewProjMatrixes[layerId] * ModelMatrix * vec4(Position, 1.);
 #endif
diff --git a/data/shaders/shadow_grass.vert b/data/shaders/shadow_grass.vert
index 39ae2ea5c..bf6d7435b 100644
--- a/data/shaders/shadow_grass.vert
+++ b/data/shaders/shadow_grass.vert
@@ -1,3 +1,4 @@
+uniform int layer;
 uniform mat4 ModelMatrix;
 uniform vec3 windDir;
 
@@ -21,11 +22,11 @@ out int layerId;
 void main(void)
 {
 #ifdef VSLayer
-    gl_Layer = gl_InstanceID & 3;
+    gl_Layer = layer;
     uv = Texcoord;
     gl_Position = ShadowViewProjMatrixes[gl_Layer] * ModelMatrix * vec4(Position + windDir * Color.r, 1.);
 #else
-    layerId = gl_InstanceID & 3;
+    layerId = layer;
     tc = Texcoord;
     gl_Position = ShadowViewProjMatrixes[layerId] * ModelMatrix * vec4(Position + windDir * Color.r, 1.);
 #endif
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 07cb76e2b..cef2d2b51 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -758,16 +758,16 @@ void VAOManager::regenerateInstancedVAO()
 
             glEnableVertexAttribArray(7);
             glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
-            glVertexAttribDivisor(7, 4);
+            glVertexAttribDivisor(7, 1);
             glEnableVertexAttribArray(8);
             glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(3 * sizeof(float)));
-            glVertexAttribDivisor(8, 4);
+            glVertexAttribDivisor(8, 1);
             glEnableVertexAttribArray(9);
             glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
-            glVertexAttribDivisor(9, 4);
+            glVertexAttribDivisor(9, 1);
             glEnableVertexAttribArray(10);
             glVertexAttribIPointer(10, 2, GL_UNSIGNED_INT, sizeof(InstanceData), (GLvoid*)(9 * sizeof(float)));
-            glVertexAttribDivisor(10, 4);
+            glVertexAttribDivisor(10, 1);
             glEnableVertexAttribArray(11);
             glVertexAttribIPointer(11, 2, GL_UNSIGNED_INT, sizeof(InstanceData), (GLvoid*)(9 * sizeof(float)+2 * sizeof(unsigned)));
             glVertexAttribDivisor(11, 1);
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index d882ef8ab..987218d8c 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -777,15 +777,15 @@ void IrrDriver::renderTransparent()
 }
 
 template<typename T, typename...uniforms>
-void drawShadow(const T *Shader, const GLMesh *mesh, uniforms... Args)
+void drawShadow(const T *Shader, unsigned cascade, const GLMesh *mesh, uniforms... Args)
 {
     irr_driver->IncreaseObjectCount();
     GLenum ptype = mesh->PrimitiveType;
     GLenum itype = mesh->IndexType;
     size_t count = mesh->IndexCount;
 
-    Shader->setUniforms(Args...);
-    glDrawElementsInstancedBaseVertex(ptype, count, itype, (GLvoid *)mesh->vaoOffset, 4, mesh->vaoBaseVertex);
+    Shader->setUniforms(cascade, Args...);
+    glDrawElementsBaseVertex(ptype, count, itype, (GLvoid *)mesh->vaoOffset, mesh->vaoBaseVertex);
 }
 
 template<int...List>
@@ -795,9 +795,9 @@ template<>
 struct shadow_custom_unroll_args<>
 {
     template<typename T, typename ...TupleTypes, typename ...Args>
-    static void exec(const T *Shader, const STK::Tuple<TupleTypes...> &t, Args... args)
+    static void exec(const T *Shader, unsigned cascade, const STK::Tuple<TupleTypes...> &t, Args... args)
     {
-        drawShadow<T>(Shader, STK::tuple_get<0>(t), args...);
+        drawShadow<T>(Shader, cascade, STK::tuple_get<0>(t), args...);
     }
 };
 
@@ -805,14 +805,14 @@ template<int N, int...List>
 struct shadow_custom_unroll_args<N, List...>
 {
     template<typename T, typename ...TupleTypes, typename ...Args>
-    static void exec(const T *Shader, const STK::Tuple<TupleTypes...> &t, Args... args)
+    static void exec(const T *Shader, unsigned cascade, const STK::Tuple<TupleTypes...> &t, Args... args)
     {
-        shadow_custom_unroll_args<List...>::template exec<T>(Shader, t, STK::tuple_get<N>(t), args...);
+        shadow_custom_unroll_args<List...>::template exec<T>(Shader, cascade, t, STK::tuple_get<N>(t), args...);
     }
 };
 
 template<typename T, enum E_VERTEX_TYPE VertexType, int...List, typename... Args>
-void renderShadow(const std::vector<GLuint> TextureUnits, const std::vector<STK::Tuple<Args...> > *t)
+void renderShadow(const std::vector<GLuint> TextureUnits, unsigned cascade, const std::vector<STK::Tuple<Args...> > *t)
 {
     glUseProgram(T::getInstance()->Program);
     glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
@@ -841,7 +841,7 @@ void renderShadow(const std::vector<GLuint> TextureUnits, const std::vector<STK:
             T::getInstance()->SetTextureHandles(Handles);
         else
             T::getInstance()->SetTextureUnits(Textures);
-        shadow_custom_unroll_args<List...>::template exec<T>(T::getInstance(), t->at(i));
+        shadow_custom_unroll_args<List...>::template exec<T>(T::getInstance(), cascade, t->at(i));
     }
 }
 
@@ -852,7 +852,7 @@ template<>
 struct instanced_shadow_custom_unroll_args<>
 {
     template<typename T, typename ...TupleTypes, typename ...Args>
-    static void exec(const T *Shader, const STK::Tuple<TupleTypes...> &t, Args... args)
+    static void exec(const T *Shader, unsigned cascade, const STK::Tuple<TupleTypes...> &t, Args... args)
     {
         const GLMesh *mesh = STK::tuple_get<0>(t);
         size_t instance_count = STK::tuple_get<1>(t);
@@ -861,13 +861,13 @@ struct instanced_shadow_custom_unroll_args<>
         GLenum itype = mesh->IndexType;
         size_t count = mesh->IndexCount;
 
-        Shader->setUniforms(args...);
+        Shader->setUniforms(cascade, args...);
 #ifdef Base_Instance_Support
         if (irr_driver->hasARB_base_instance())
-            glDrawElementsInstancedBaseVertexBaseInstance(ptype, count, itype, (const void*) mesh->vaoOffset, 4 * instance_count, mesh->vaoBaseVertex, mesh->vaoBaseInstance);
+            glDrawElementsInstancedBaseVertexBaseInstance(ptype, count, itype, (const void*) mesh->vaoOffset, instance_count, mesh->vaoBaseVertex, mesh->vaoBaseInstance);
         else
 #endif
-            glDrawElementsInstanced(ptype, count, itype, 0, 4 * instance_count);
+            glDrawElementsInstanced(ptype, count, itype, 0, instance_count);
     }
 };
 
@@ -875,14 +875,14 @@ template<int N, int...List>
 struct instanced_shadow_custom_unroll_args<N, List...>
 {
     template<typename T, typename ...TupleTypes, typename ...Args>
-    static void exec(const T *Shader, const STK::Tuple<TupleTypes...> &t, Args... args)
+    static void exec(const T *Shader, unsigned cascade, const STK::Tuple<TupleTypes...> &t, Args... args)
     {
-        instanced_shadow_custom_unroll_args<List...>::template exec<T>(Shader, t, STK::tuple_get<N>(t), args...);
+        instanced_shadow_custom_unroll_args<List...>::template exec<T>(Shader, cascade, t, STK::tuple_get<N>(t), args...);
     }
 };
 
 template<typename T, int...List, typename... Args>
-void renderInstancedShadow(const std::vector<GLuint> TextureUnits, const std::vector<STK::Tuple<Args...> > *t)
+void renderInstancedShadow(const std::vector<GLuint> TextureUnits, unsigned cascade, const std::vector<STK::Tuple<Args...> > *t)
 {
     glUseProgram(T::getInstance()->Program);
     for (unsigned i = 0; i < t->size(); i++)
@@ -900,7 +900,7 @@ void renderInstancedShadow(const std::vector<GLuint> TextureUnits, const std::ve
 
         }
         T::getInstance()->SetTextureUnits(Textures);
-        instanced_shadow_custom_unroll_args<List...>::template exec<T>(T::getInstance(), t->at(i));
+        instanced_shadow_custom_unroll_args<List...>::template exec<T>(T::getInstance(), cascade, t->at(i));
     }
 }
 
@@ -935,112 +935,115 @@ void IrrDriver::renderShadows()
     ListInstancedMatNormalMap::getInstance()->clear();
     m_scene_manager->drawAll(scene::ESNRP_SOLID);
 
-    std::vector<GLuint> noTexUnits;
-    renderShadow<MeshShader::ShadowShader, EVT_STANDARD, 1>(noTexUnits, ListMatDefault::getInstance());
-    renderShadow<MeshShader::ShadowShader, EVT_STANDARD, 1>(noTexUnits, ListMatSphereMap::getInstance());
-    renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, ListMatDetails::getInstance());
-    renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, ListMatSplatting::getInstance());
-    renderShadow<MeshShader::ShadowShader, EVT_TANGENTS, 1>(noTexUnits, ListMatNormalMap::getInstance());
-    renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, ListMatAlphaRef::getInstance());
-    renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, ListMatUnlit::getInstance());
-    renderShadow<MeshShader::GrassShadowShader, EVT_STANDARD, 3, 1>(std::vector<GLuint>{ 0 }, ListMatGrass::getInstance());
-
-    if (UserConfigParams::m_azdo)
+    for (unsigned cascade = 0; cascade < 4; cascade++)
     {
+        std::vector<GLuint> noTexUnits;
+        renderShadow<MeshShader::ShadowShader, EVT_STANDARD, 1>(noTexUnits, cascade, ListMatDefault::getInstance());
+        renderShadow<MeshShader::ShadowShader, EVT_STANDARD, 1>(noTexUnits, cascade, ListMatSphereMap::getInstance());
+        renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, cascade, ListMatDetails::getInstance());
+        renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, cascade, ListMatSplatting::getInstance());
+        renderShadow<MeshShader::ShadowShader, EVT_TANGENTS, 1>(noTexUnits, cascade, ListMatNormalMap::getInstance());
+        renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, cascade, ListMatAlphaRef::getInstance());
+        renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, cascade, ListMatUnlit::getInstance());
+        renderShadow<MeshShader::GrassShadowShader, EVT_STANDARD, 3, 1>(std::vector<GLuint>{ 0 }, cascade, ListMatGrass::getInstance());
+
+        if (UserConfigParams::m_azdo)
+        {
 #ifdef Buffer_Storage
-        if (!ShadowCommandBufferPtr)
-        {
-            glGenBuffers(1, &shadowdrawindirectcmd);
+            if (!ShadowCommandBufferPtr)
+            {
+                glGenBuffers(1, &shadowdrawindirectcmd);
+                glBindBuffer(GL_DRAW_INDIRECT_BUFFER, shadowdrawindirectcmd);
+                glBufferStorage(GL_DRAW_INDIRECT_BUFFER, 100 * sizeof(DrawElementsIndirectCommand), 0, GL_MAP_PERSISTENT_BIT | GL_MAP_WRITE_BIT | GL_MAP_COHERENT_BIT);
+                ShadowCommandBufferPtr = (DrawElementsIndirectCommand *)glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0, 100 * sizeof(DrawElementsIndirectCommand), GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT | GL_MAP_WRITE_BIT);
+            }
+
             glBindBuffer(GL_DRAW_INDIRECT_BUFFER, shadowdrawindirectcmd);
-            glBufferStorage(GL_DRAW_INDIRECT_BUFFER, 100 * sizeof(DrawElementsIndirectCommand), 0, GL_MAP_PERSISTENT_BIT | GL_MAP_WRITE_BIT | GL_MAP_COHERENT_BIT);
-            ShadowCommandBufferPtr = (DrawElementsIndirectCommand *)glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0, 100 * sizeof(DrawElementsIndirectCommand), GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT | GL_MAP_WRITE_BIT);
-        }
 
-        glBindBuffer(GL_DRAW_INDIRECT_BUFFER, shadowdrawindirectcmd);
-
-        size_t offset = 0;
-        for (unsigned i = 0; i < ListInstancedMatDefault::getInstance()->size(); i++)
-        {
-            const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatDefault::getInstance()->at(i)));
-            size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatDefault::getInstance()->at(i));
-            DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
-            CurrentCommand.instanceCount = 4 * instanceCount;
-            CurrentCommand.baseVertex = mesh.vaoBaseVertex;
-            CurrentCommand.count = mesh.IndexCount;
-            CurrentCommand.firstIndex = mesh.vaoOffset / 2;
-            CurrentCommand.baseInstance = mesh.vaoBaseInstance;
-        }
-        for (unsigned i = 0; i < ListInstancedMatNormalMap::getInstance()->size(); i++)
-        {
-            const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatNormalMap::getInstance()->at(i)));
-            size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatNormalMap::getInstance()->at(i));
-            DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
-            CurrentCommand.instanceCount = 4 * instanceCount;
-            CurrentCommand.baseVertex = mesh.vaoBaseVertex;
-            CurrentCommand.count = mesh.IndexCount;
-            CurrentCommand.firstIndex = mesh.vaoOffset / 2;
-            CurrentCommand.baseInstance = mesh.vaoBaseInstance;
-        }
-        for (unsigned i = 0; i < ListInstancedMatAlphaRef::getInstance()->size(); i++)
-        {
-            const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatAlphaRef::getInstance()->at(i)));
-            size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatAlphaRef::getInstance()->at(i));
-            DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
-            CurrentCommand.instanceCount = 4 * instanceCount;
-            CurrentCommand.baseVertex = mesh.vaoBaseVertex;
-            CurrentCommand.count = mesh.IndexCount;
-            CurrentCommand.firstIndex = mesh.vaoOffset / 2;
-            CurrentCommand.baseInstance = mesh.vaoBaseInstance;
-        }
-        for (unsigned i = 0; i < ListInstancedMatGrass::getInstance()->size(); i++)
-        {
-            const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatGrass::getInstance()->at(i)));
-            size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatGrass::getInstance()->at(i));
-            DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
-            CurrentCommand.instanceCount = 4 * instanceCount;
-            CurrentCommand.baseVertex = mesh.vaoBaseVertex;
-            CurrentCommand.count = mesh.IndexCount;
-            CurrentCommand.firstIndex = mesh.vaoOffset / 2;
-            CurrentCommand.baseInstance = mesh.vaoBaseInstance;
-        }
+            size_t offset = 0;
+            for (unsigned i = 0; i < ListInstancedMatDefault::getInstance()->size(); i++)
+            {
+                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatDefault::getInstance()->at(i)));
+                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatDefault::getInstance()->at(i));
+                DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
+                CurrentCommand.instanceCount = 4 * instanceCount;
+                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
+                CurrentCommand.count = mesh.IndexCount;
+                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
+                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
+            }
+            for (unsigned i = 0; i < ListInstancedMatNormalMap::getInstance()->size(); i++)
+            {
+                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatNormalMap::getInstance()->at(i)));
+                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatNormalMap::getInstance()->at(i));
+                DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
+                CurrentCommand.instanceCount = 4 * instanceCount;
+                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
+                CurrentCommand.count = mesh.IndexCount;
+                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
+                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
+            }
+            for (unsigned i = 0; i < ListInstancedMatAlphaRef::getInstance()->size(); i++)
+            {
+                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatAlphaRef::getInstance()->at(i)));
+                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatAlphaRef::getInstance()->at(i));
+                DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
+                CurrentCommand.instanceCount = 4 * instanceCount;
+                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
+                CurrentCommand.count = mesh.IndexCount;
+                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
+                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
+            }
+            for (unsigned i = 0; i < ListInstancedMatGrass::getInstance()->size(); i++)
+            {
+                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatGrass::getInstance()->at(i)));
+                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatGrass::getInstance()->at(i));
+                DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
+                CurrentCommand.instanceCount = 4 * instanceCount;
+                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
+                CurrentCommand.count = mesh.IndexCount;
+                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
+                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
+            }
 #endif
 #ifdef Multi_Draw_Indirect
-        unsigned ptr = 0;
-        glUseProgram(MeshShader::InstancedShadowShader::getInstance()->Program);
-        glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-        glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatDefault::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-        ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatDefault::getInstance()->size();
-
-        glUseProgram(MeshShader::InstancedShadowShader::getInstance()->Program);
-        glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
-        glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatNormalMap::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-        ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatNormalMap::getInstance()->size();
-
-        glUseProgram(MeshShader::InstancedRefShadowShader::getInstance()->Program);
-        glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-        glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatAlphaRef::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-        ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatAlphaRef::getInstance()->size();
-
-        glUseProgram(MeshShader::InstancedGrassShadowShader::getInstance()->Program);
-        MeshShader::InstancedGrassShadowShader::getInstance()->setUniforms(STK::tuple_get<2>(ListInstancedMatGrass::getInstance()->at(0)));
-        glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-        glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatGrass::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-#endif
-    }
-    else
-    {
-        if (irr_driver->hasARB_base_instance())
+            unsigned ptr = 0;
+            glUseProgram(MeshShader::InstancedShadowShader::getInstance()->Program);
             glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-        renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, ListInstancedMatDefault::getInstance());
-        if (irr_driver->hasARB_base_instance())
-            glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-        renderInstancedShadow<MeshShader::InstancedRefShadowShader>(std::vector<GLuint>{ 0 }, ListInstancedMatAlphaRef::getInstance());
-        if (irr_driver->hasARB_base_instance())
-            glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-        renderInstancedShadow<MeshShader::InstancedGrassShadowShader, 2>(std::vector<GLuint>{ 0 }, ListInstancedMatGrass::getInstance());
-        if (irr_driver->hasARB_base_instance())
+            glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatDefault::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatDefault::getInstance()->size();
+
+            glUseProgram(MeshShader::InstancedShadowShader::getInstance()->Program);
             glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
-        renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, ListInstancedMatNormalMap::getInstance());
+            glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatNormalMap::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatNormalMap::getInstance()->size();
+
+            glUseProgram(MeshShader::InstancedRefShadowShader::getInstance()->Program);
+            glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+            glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatAlphaRef::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatAlphaRef::getInstance()->size();
+
+            glUseProgram(MeshShader::InstancedGrassShadowShader::getInstance()->Program);
+            //        MeshShader::InstancedGrassShadowShader::getInstance()->setUniforms(STK::tuple_get<2>(ListInstancedMatGrass::getInstance()->at(0)));
+            glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+            glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatGrass::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+#endif
+        }
+        else
+        {
+            if (irr_driver->hasARB_base_instance())
+                glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+            renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, cascade, ListInstancedMatDefault::getInstance());
+            if (irr_driver->hasARB_base_instance())
+                glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+            renderInstancedShadow<MeshShader::InstancedRefShadowShader>(std::vector<GLuint>{ 0 }, cascade, ListInstancedMatAlphaRef::getInstance());
+            if (irr_driver->hasARB_base_instance())
+                glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
+            renderInstancedShadow<MeshShader::InstancedGrassShadowShader, 2>(std::vector<GLuint>{ 0 }, cascade, ListInstancedMatGrass::getInstance());
+            if (irr_driver->hasARB_base_instance())
+                glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
+            renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, cascade, ListInstancedMatNormalMap::getInstance());
+        }
     }
 
     glDisable(GL_POLYGON_OFFSET_FILL);
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index b43ba71bd..8a901c38c 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1155,7 +1155,7 @@ namespace MeshShader
                 GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/shadow.geom").c_str(),
                 GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/white.frag").c_str());
         }
-        AssignUniforms("ModelMatrix");
+        AssignUniforms("layer", "ModelMatrix");
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
     }
@@ -1206,6 +1206,7 @@ namespace MeshShader
                 GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/instanced_shadow.geom").c_str(),
                 GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/white.frag").c_str());
         }
+        AssignUniforms("layer");
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
     }
@@ -1228,7 +1229,7 @@ namespace MeshShader
                 GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/shadow.geom").c_str(),
                 GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_unlit.frag").c_str());
         }
-        AssignUniforms("ModelMatrix");
+        AssignUniforms("layer", "ModelMatrix");
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
@@ -1255,7 +1256,7 @@ namespace MeshShader
                 GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/instanced_shadow.geom").c_str(),
                 GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_shadowref.frag").c_str());
         }
-
+        AssignUniforms("layer");
         AssignSamplerNames(Program, 0, "tex");
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -1279,7 +1280,7 @@ namespace MeshShader
                 GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/shadow.geom").c_str(),
                 GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_unlit.frag").c_str());
         }
-        AssignUniforms("ModelMatrix", "windDir");
+        AssignUniforms("layer", "ModelMatrix", "windDir");
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
@@ -1309,7 +1310,7 @@ namespace MeshShader
 
         AssignSamplerNames(Program, 0, "tex");
 
-        AssignUniforms("windDir");
+        AssignUniforms("layer", "windDir");
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
     }
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 147f9daa2..e3898a661 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -613,7 +613,7 @@ public:
     ColorizeShader();
 };
 
-class ShadowShader : public ShaderHelperSingleton<ShadowShader, core::matrix4>, public TextureRead<>
+class ShadowShader : public ShaderHelperSingleton<ShadowShader, int, core::matrix4>, public TextureRead<>
 {
 public:
     ShadowShader();
@@ -632,31 +632,31 @@ public:
     SplattingRSMShader();
 };
 
-class InstancedShadowShader : public ShaderHelperSingleton<InstancedShadowShader>, public TextureRead<>
+class InstancedShadowShader : public ShaderHelperSingleton<InstancedShadowShader, int>, public TextureRead<>
 {
 public:
     InstancedShadowShader();
 };
 
-class RefShadowShader : public ShaderHelperSingleton<RefShadowShader, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class RefShadowShader : public ShaderHelperSingleton<RefShadowShader, int, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     RefShadowShader();
 };
 
-class InstancedRefShadowShader : public ShaderHelperSingleton<InstancedRefShadowShader>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class InstancedRefShadowShader : public ShaderHelperSingleton<InstancedRefShadowShader, int>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedRefShadowShader();
 };
 
-class GrassShadowShader : public ShaderHelperSingleton<GrassShadowShader, core::matrix4, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class GrassShadowShader : public ShaderHelperSingleton<GrassShadowShader, int, core::matrix4, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     GrassShadowShader();
 };
 
-class InstancedGrassShadowShader : public ShaderHelperSingleton<InstancedGrassShadowShader, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class InstancedGrassShadowShader : public ShaderHelperSingleton<InstancedGrassShadowShader, int, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedGrassShadowShader();
diff --git a/src/graphics/stkinstancedscenenode.cpp b/src/graphics/stkinstancedscenenode.cpp
index 03de07b9b..4c0421392 100644
--- a/src/graphics/stkinstancedscenenode.cpp
+++ b/src/graphics/stkinstancedscenenode.cpp
@@ -88,13 +88,13 @@ void STKInstancedSceneNode::initinstancedvaostate(GLMesh &mesh, const std::vecto
         glBindBuffer(GL_ARRAY_BUFFER, instances_vbo);
         glEnableVertexAttribArray(7);
         glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
-        glVertexAttribDivisor(7, 4);
+        glVertexAttribDivisor(7, 1);
         glEnableVertexAttribArray(8);
         glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(3 * sizeof(float)));
-        glVertexAttribDivisor(8, 4);
+        glVertexAttribDivisor(8, 1);
         glEnableVertexAttribArray(9);
         glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
-        glVertexAttribDivisor(9, 4);
+        glVertexAttribDivisor(9, 1);
 
         glBindVertexArray(0);
     }

From a1ec19e672d6236d1d7c9b7ab84f0580f5544fd9 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 26 Aug 2014 22:03:52 +0200
Subject: [PATCH 126/248] Factorise AZDO related code

---
 src/graphics/render_geometry.cpp | 195 +++++++++++++++----------------
 src/graphics/stkscenemanager.hpp |  42 +++++++
 2 files changed, 133 insertions(+), 104 deletions(-)
 create mode 100644 src/graphics/stkscenemanager.hpp

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 987218d8c..829721c7c 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -29,6 +29,7 @@
 #include "utils/log.hpp"
 #include "utils/profiler.hpp"
 #include "utils/tuple.hpp"
+#include "stkscenemanager.hpp"
 
 #include <algorithm>
 
@@ -222,8 +223,21 @@ void renderInstancedMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vec
 }
 
 static GLsync m_sync;
-static GLuint drawindirectcmd;
-static DrawElementsIndirectCommand *CommandBufferPtr = 0;
+template<typename Shader, MeshMaterial Mat, video::E_VERTEX_TYPE VT, typename...Args>
+void multidraw1stPass(Args...args)
+{
+    glUseProgram(Shader::getInstance()->Program);
+    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(VT, InstanceTypeDefault));
+    if (SolidPassCmd::getInstance()->Size[Mat])
+    {
+        Shader::getInstance()->setUniforms(args...);
+        glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT,
+            (const void*)(SolidPassCmd::getInstance()->Offset[Mat] * sizeof(DrawElementsIndirectCommand)),
+            SolidPassCmd::getInstance()->Size[Mat],
+            sizeof(DrawElementsIndirectCommand));
+    }
+}
+
 
 void IrrDriver::renderSolidFirstPass()
 {
@@ -292,18 +306,11 @@ void IrrDriver::renderSolidFirstPass()
 
         if (UserConfigParams::m_azdo)
         {
-#ifdef Buffer_Storage
-            if (!CommandBufferPtr)
-            {
-                glGenBuffers(1, &drawindirectcmd);
-                glBindBuffer(GL_DRAW_INDIRECT_BUFFER, drawindirectcmd);
-                glBufferStorage(GL_DRAW_INDIRECT_BUFFER, 100 * sizeof(DrawElementsIndirectCommand), 0, GL_MAP_PERSISTENT_BIT | GL_MAP_WRITE_BIT | GL_MAP_COHERENT_BIT);
-                CommandBufferPtr = (DrawElementsIndirectCommand *)glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0, 100 * sizeof(DrawElementsIndirectCommand), GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT | GL_MAP_WRITE_BIT);
-            }
-
-            glBindBuffer(GL_DRAW_INDIRECT_BUFFER, drawindirectcmd);
+            glBindBuffer(GL_DRAW_INDIRECT_BUFFER, SolidPassCmd::getInstance()->drawindirectcmd);
+            DrawElementsIndirectCommand *CommandBufferPtr = SolidPassCmd::getInstance()->Ptr;
 
             size_t offset = 0;
+            SolidPassCmd::getInstance()->Offset[MAT_DEFAULT] = offset;
             for (unsigned i = 0; i < ListInstancedMatDefault::getInstance()->size(); i++)
             {
                 const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatDefault::getInstance()->at(i)));
@@ -315,6 +322,9 @@ void IrrDriver::renderSolidFirstPass()
                 CurrentCommand.firstIndex = mesh.vaoOffset / 2;
                 CurrentCommand.baseInstance = mesh.vaoBaseInstance;
             }
+            SolidPassCmd::getInstance()->Size[MAT_DEFAULT] = ListInstancedMatDefault::getInstance()->size();
+
+            SolidPassCmd::getInstance()->Offset[MAT_NORMAL_MAP] = offset;
             for (unsigned i = 0; i < ListInstancedMatNormalMap::getInstance()->size(); i++)
             {
                 const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatNormalMap::getInstance()->at(i)));
@@ -326,6 +336,9 @@ void IrrDriver::renderSolidFirstPass()
                 CurrentCommand.firstIndex = mesh.vaoOffset / 2;
                 CurrentCommand.baseInstance = mesh.vaoBaseInstance;
             }
+            SolidPassCmd::getInstance()->Size[MAT_NORMAL_MAP] = ListInstancedMatNormalMap::getInstance()->size();
+
+            SolidPassCmd::getInstance()->Offset[MAT_ALPHA_REF] = offset;
             for (unsigned i = 0; i < ListInstancedMatAlphaRef::getInstance()->size(); i++)
             {
                 const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatAlphaRef::getInstance()->at(i)));
@@ -337,6 +350,9 @@ void IrrDriver::renderSolidFirstPass()
                 CurrentCommand.firstIndex = mesh.vaoOffset / 2;
                 CurrentCommand.baseInstance = mesh.vaoBaseInstance;
             }
+            SolidPassCmd::getInstance()->Size[MAT_ALPHA_REF] = ListInstancedMatAlphaRef::getInstance()->size();
+
+            SolidPassCmd::getInstance()->Offset[MAT_GRASS] = offset;
             for (unsigned i = 0; i < ListInstancedMatGrass::getInstance()->size(); i++)
             {
                 const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatGrass::getInstance()->at(i)));
@@ -348,33 +364,13 @@ void IrrDriver::renderSolidFirstPass()
                 CurrentCommand.firstIndex = mesh.vaoOffset / 2;
                 CurrentCommand.baseInstance = mesh.vaoBaseInstance;
             }
-#endif
+            SolidPassCmd::getInstance()->Size[MAT_GRASS] = ListInstancedMatGrass::getInstance()->size();
 #ifdef Multi_Draw_Indirect
-            unsigned ptr = 0;
-            glUseProgram(MeshShader::InstancedObjectPass1Shader::getInstance()->Program);
-            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            if (!ListInstancedMatDefault::getInstance()->empty())
-                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatDefault::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatDefault::getInstance()->size();
-
-            glUseProgram(MeshShader::InstancedNormalMapShader::getInstance()->Program);
-            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
-            if (!ListInstancedMatNormalMap::getInstance()->empty())
-                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatNormalMap::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatNormalMap::getInstance()->size();
-
-            glUseProgram(MeshShader::InstancedObjectRefPass1Shader::getInstance()->Program);
-            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            if (!ListInstancedMatAlphaRef::getInstance()->empty())
-                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatAlphaRef::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatAlphaRef::getInstance()->size();
-
-            glUseProgram(MeshShader::InstancedGrassPass1Shader::getInstance()->Program);
-            if (!ListInstancedMatGrass::getInstance()->empty())
-            {
-                MeshShader::InstancedGrassPass1Shader::getInstance()->setUniforms(STK::tuple_get<2>(ListInstancedMatGrass::getInstance()->at(0)));
-                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatGrass::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-            }
+            multidraw1stPass<MeshShader::InstancedObjectPass1Shader, MAT_DEFAULT, video::EVT_STANDARD>();
+            multidraw1stPass<MeshShader::InstancedObjectRefPass1Shader, MAT_ALPHA_REF, video::EVT_STANDARD>();
+            multidraw1stPass<MeshShader::InstancedNormalMapShader, MAT_NORMAL_MAP, video::EVT_TANGENTS>();
+            core::vector3df dir = ListInstancedMatGrass::getInstance()->empty() ? core::vector3df(0., 0., 0.) : STK::tuple_get<2>(ListInstancedMatGrass::getInstance()->at(0));
+            multidraw1stPass<MeshShader::InstancedGrassPass1Shader, MAT_GRASS, video::EVT_STANDARD>(dir);
 #endif
         }
         else
@@ -473,6 +469,23 @@ void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vec
     }
 }
 
+template<typename Shader, MeshMaterial Mat, video::E_VERTEX_TYPE VT, typename...Args>
+void multidraw2ndPass(const std::vector<uint64_t> &Handles, Args... args)
+{
+    glUseProgram(Shader::getInstance()->Program);
+    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(VT, InstanceTypeDefault));
+    if (SolidPassCmd::getInstance()->Size[Mat])
+    {
+        Shader::getInstance()->SetTextureHandles(Handles);
+        Shader::getInstance()->setUniforms(args...);
+        glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT,
+            (const void*)(SolidPassCmd::getInstance()->Offset[Mat] * sizeof(DrawElementsIndirectCommand)),
+            SolidPassCmd::getInstance()->Size[Mat],
+            sizeof(DrawElementsIndirectCommand));
+    }
+}
+
+
 void IrrDriver::renderSolidSecondPass()
 {
     SColor clearColor(0, 150, 150, 150);
@@ -561,34 +574,12 @@ void IrrDriver::renderSolidSecondPass()
         if (UserConfigParams::m_azdo)
         {
 #ifdef Multi_Draw_Indirect
-            unsigned ptr = 0;
-            glUseProgram(MeshShader::InstancedObjectPass2Shader::getInstance()->Program);
-            MeshShader::InstancedObjectPass2Shader::getInstance()->SetTextureHandles(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0));
-            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            if (!ListInstancedMatDefault::getInstance()->empty())
-                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatDefault::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatDefault::getInstance()->size();
-
-            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
-            MeshShader::InstancedObjectPass2Shader::getInstance()->SetTextureHandles(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0));
-            if (!ListInstancedMatNormalMap::getInstance()->empty())
-                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatNormalMap::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatNormalMap::getInstance()->size();
-
-            glUseProgram(MeshShader::InstancedObjectRefPass2Shader::getInstance()->Program);
-            glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            MeshShader::InstancedObjectRefPass2Shader::getInstance()->SetTextureHandles(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0));
-            if (!ListInstancedMatAlphaRef::getInstance()->empty())
-                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatAlphaRef::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatAlphaRef::getInstance()->size();
-
-            glUseProgram(MeshShader::InstancedGrassPass2Shader::getInstance()->Program);
-            MeshShader::InstancedGrassPass2Shader::getInstance()->SetTextureHandles(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, DepthHandle, 0));
-            if (!ListInstancedMatGrass::getInstance()->empty())
-            {
-                MeshShader::InstancedGrassPass2Shader::getInstance()->setUniforms(STK::tuple_get<2>(ListInstancedMatGrass::getInstance()->at(0)), STK::tuple_get<3>(ListInstancedMatGrass::getInstance()->at(0)));
-                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatGrass::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-            }
+            multidraw2ndPass<MeshShader::InstancedObjectPass2Shader, MAT_DEFAULT, video::EVT_STANDARD>(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0));
+            multidraw2ndPass<MeshShader::InstancedObjectPass2Shader, MAT_NORMAL_MAP, video::EVT_TANGENTS>(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0));
+            multidraw2ndPass<MeshShader::InstancedObjectRefPass2Shader, MAT_ALPHA_REF, video::EVT_STANDARD>(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0));
+            core::vector3df dir = ListInstancedMatGrass::getInstance()->empty() ? core::vector3df(0., 0., 0.) : STK::tuple_get<2>(ListInstancedMatGrass::getInstance()->at(0));
+            SunLightProvider * const cb = (SunLightProvider *)irr_driver->getCallback(ES_SUNLIGHT);
+            multidraw2ndPass<MeshShader::InstancedGrassPass2Shader, MAT_GRASS, video::EVT_STANDARD>(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, DepthHandle, 0), dir, cb->getPosition());
 #endif
         }
         else
@@ -904,8 +895,17 @@ void renderInstancedShadow(const std::vector<GLuint> TextureUnits, unsigned casc
     }
 }
 
-static GLuint shadowdrawindirectcmd;
-static DrawElementsIndirectCommand *ShadowCommandBufferPtr = 0;
+template<typename Shader, MeshMaterial Mat, video::E_VERTEX_TYPE VT, typename...Args>
+static void multidrawShadow(unsigned i, Args ...args)
+{
+    glUseProgram(Shader::getInstance()->Program);
+    glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(VT, InstanceTypeDefault));
+    if (ShadowPassCmd::getInstance()->Size[i][Mat])
+    {
+        Shader::getInstance()->setUniforms(i, args...);
+        glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)(ShadowPassCmd::getInstance()->Offset[i][Mat] * sizeof(DrawElementsIndirectCommand)), ShadowPassCmd::getInstance()->Size[i][Mat], sizeof(DrawElementsIndirectCommand));
+    }
+}
 
 void IrrDriver::renderShadows()
 {
@@ -934,6 +934,7 @@ void IrrDriver::renderShadows()
     ListInstancedMatGrass::getInstance()->clear();
     ListInstancedMatNormalMap::getInstance()->clear();
     m_scene_manager->drawAll(scene::ESNRP_SOLID);
+    size_t offset = 0;
 
     for (unsigned cascade = 0; cascade < 4; cascade++)
     {
@@ -949,84 +950,70 @@ void IrrDriver::renderShadows()
 
         if (UserConfigParams::m_azdo)
         {
-#ifdef Buffer_Storage
-            if (!ShadowCommandBufferPtr)
-            {
-                glGenBuffers(1, &shadowdrawindirectcmd);
-                glBindBuffer(GL_DRAW_INDIRECT_BUFFER, shadowdrawindirectcmd);
-                glBufferStorage(GL_DRAW_INDIRECT_BUFFER, 100 * sizeof(DrawElementsIndirectCommand), 0, GL_MAP_PERSISTENT_BIT | GL_MAP_WRITE_BIT | GL_MAP_COHERENT_BIT);
-                ShadowCommandBufferPtr = (DrawElementsIndirectCommand *)glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0, 100 * sizeof(DrawElementsIndirectCommand), GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT | GL_MAP_WRITE_BIT);
-            }
+            glBindBuffer(GL_DRAW_INDIRECT_BUFFER, ShadowPassCmd::getInstance()->drawindirectcmd);
+            DrawElementsIndirectCommand *ShadowCommandBufferPtr = ShadowPassCmd::getInstance()->Ptr;
 
-            glBindBuffer(GL_DRAW_INDIRECT_BUFFER, shadowdrawindirectcmd);
-
-            size_t offset = 0;
+            ShadowPassCmd::getInstance()->Offset[cascade][MAT_DEFAULT] = offset;
             for (unsigned i = 0; i < ListInstancedMatDefault::getInstance()->size(); i++)
             {
                 const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatDefault::getInstance()->at(i)));
                 size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatDefault::getInstance()->at(i));
                 DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
-                CurrentCommand.instanceCount = 4 * instanceCount;
+                CurrentCommand.instanceCount = instanceCount;
                 CurrentCommand.baseVertex = mesh.vaoBaseVertex;
                 CurrentCommand.count = mesh.IndexCount;
                 CurrentCommand.firstIndex = mesh.vaoOffset / 2;
                 CurrentCommand.baseInstance = mesh.vaoBaseInstance;
             }
+            ShadowPassCmd::getInstance()->Size[cascade][MAT_DEFAULT] = offset - ShadowPassCmd::getInstance()->Offset[cascade][MAT_DEFAULT];
+
+            ShadowPassCmd::getInstance()->Offset[cascade][MAT_NORMAL_MAP] = offset;
             for (unsigned i = 0; i < ListInstancedMatNormalMap::getInstance()->size(); i++)
             {
                 const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatNormalMap::getInstance()->at(i)));
                 size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatNormalMap::getInstance()->at(i));
                 DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
-                CurrentCommand.instanceCount = 4 * instanceCount;
+                CurrentCommand.instanceCount = instanceCount;
                 CurrentCommand.baseVertex = mesh.vaoBaseVertex;
                 CurrentCommand.count = mesh.IndexCount;
                 CurrentCommand.firstIndex = mesh.vaoOffset / 2;
                 CurrentCommand.baseInstance = mesh.vaoBaseInstance;
             }
+            ShadowPassCmd::getInstance()->Size[cascade][MAT_NORMAL_MAP] = offset - ShadowPassCmd::getInstance()->Offset[cascade][MAT_NORMAL_MAP];
+
+            ShadowPassCmd::getInstance()->Offset[cascade][MAT_ALPHA_REF] = offset;
             for (unsigned i = 0; i < ListInstancedMatAlphaRef::getInstance()->size(); i++)
             {
                 const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatAlphaRef::getInstance()->at(i)));
                 size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatAlphaRef::getInstance()->at(i));
                 DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
-                CurrentCommand.instanceCount = 4 * instanceCount;
+                CurrentCommand.instanceCount = instanceCount;
                 CurrentCommand.baseVertex = mesh.vaoBaseVertex;
                 CurrentCommand.count = mesh.IndexCount;
                 CurrentCommand.firstIndex = mesh.vaoOffset / 2;
                 CurrentCommand.baseInstance = mesh.vaoBaseInstance;
             }
+            ShadowPassCmd::getInstance()->Size[cascade][MAT_ALPHA_REF] = offset - ShadowPassCmd::getInstance()->Offset[cascade][MAT_ALPHA_REF];
+
+            ShadowPassCmd::getInstance()->Offset[cascade][MAT_GRASS] = offset;
             for (unsigned i = 0; i < ListInstancedMatGrass::getInstance()->size(); i++)
             {
                 const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatGrass::getInstance()->at(i)));
                 size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatGrass::getInstance()->at(i));
                 DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
-                CurrentCommand.instanceCount = 4 * instanceCount;
+                CurrentCommand.instanceCount = instanceCount;
                 CurrentCommand.baseVertex = mesh.vaoBaseVertex;
                 CurrentCommand.count = mesh.IndexCount;
                 CurrentCommand.firstIndex = mesh.vaoOffset / 2;
                 CurrentCommand.baseInstance = mesh.vaoBaseInstance;
             }
-#endif
+            ShadowPassCmd::getInstance()->Size[cascade][MAT_GRASS] = offset - ShadowPassCmd::getInstance()->Offset[cascade][MAT_GRASS];
 #ifdef Multi_Draw_Indirect
-            unsigned ptr = 0;
-            glUseProgram(MeshShader::InstancedShadowShader::getInstance()->Program);
-            glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatDefault::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatDefault::getInstance()->size();
-
-            glUseProgram(MeshShader::InstancedShadowShader::getInstance()->Program);
-            glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
-            glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatNormalMap::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatNormalMap::getInstance()->size();
-
-            glUseProgram(MeshShader::InstancedRefShadowShader::getInstance()->Program);
-            glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatAlphaRef::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
-            ptr += sizeof(DrawElementsIndirectCommand)* ListInstancedMatAlphaRef::getInstance()->size();
-
-            glUseProgram(MeshShader::InstancedGrassShadowShader::getInstance()->Program);
-            //        MeshShader::InstancedGrassShadowShader::getInstance()->setUniforms(STK::tuple_get<2>(ListInstancedMatGrass::getInstance()->at(0)));
-            glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)ptr, ListInstancedMatGrass::getInstance()->size(), sizeof(DrawElementsIndirectCommand));
+            multidrawShadow<MeshShader::InstancedShadowShader, MAT_DEFAULT, video::EVT_STANDARD>(cascade);
+            multidrawShadow<MeshShader::InstancedShadowShader, MAT_NORMAL_MAP, video::EVT_TANGENTS>(cascade);
+            multidrawShadow<MeshShader::InstancedRefShadowShader, MAT_ALPHA_REF, video::EVT_STANDARD>(cascade);
+            core::vector3df dir = ListInstancedMatGrass::getInstance()->empty() ? core::vector3df(0., 0., 0.) : STK::tuple_get<2>(ListInstancedMatGrass::getInstance()->at(0));
+            multidrawShadow<MeshShader::InstancedGrassShadowShader, MAT_GRASS, video::EVT_STANDARD>(cascade, dir);
 #endif
         }
         else
diff --git a/src/graphics/stkscenemanager.hpp b/src/graphics/stkscenemanager.hpp
new file mode 100644
index 000000000..fa924e05d
--- /dev/null
+++ b/src/graphics/stkscenemanager.hpp
@@ -0,0 +1,42 @@
+// Not really a scene manager yet but hold algorithm that
+// rework scene manager output
+
+#ifndef HEADER_STKSCENEMANAGER_HPP
+#define HEADER_STKSCENEMANAGER_HPP
+
+#include "utils/singleton.hpp"
+#include "gl_headers.hpp"
+#include "stkmesh.hpp"
+
+template<typename T>
+class CommandBuffer : public Singleton<T>
+{
+public:
+    GLuint drawindirectcmd;
+    DrawElementsIndirectCommand *Ptr;
+    CommandBuffer()
+    {
+#ifdef Buffer_Storage
+        glGenBuffers(1, &drawindirectcmd);
+        glBindBuffer(GL_DRAW_INDIRECT_BUFFER, drawindirectcmd);
+        glBufferStorage(GL_DRAW_INDIRECT_BUFFER, 10000 * sizeof(DrawElementsIndirectCommand), 0, GL_MAP_PERSISTENT_BIT | GL_MAP_WRITE_BIT);
+        Ptr = (DrawElementsIndirectCommand *)glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0, 10000 * sizeof(DrawElementsIndirectCommand), GL_MAP_PERSISTENT_BIT | GL_MAP_WRITE_BIT);
+#endif
+    }
+};
+
+
+class SolidPassCmd : public CommandBuffer<SolidPassCmd>
+{
+public:
+    size_t Offset[MAT_COUNT], Size[MAT_COUNT];
+};
+
+class ShadowPassCmd : public CommandBuffer<ShadowPassCmd>
+{
+public:
+    size_t Offset[4][MAT_COUNT], Size[4][MAT_COUNT];
+};
+
+
+#endif
\ No newline at end of file

From 4cb8955f83ec733a2711856ecedd54b692ab03c7 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 26 Aug 2014 23:58:42 +0200
Subject: [PATCH 127/248] Free texture memory when an object is destroyed

---
 src/graphics/stkanimatedmesh.cpp       | 7 +++++++
 src/graphics/stkinstancedscenenode.cpp | 7 +++++++
 src/graphics/stkmeshscenenode.cpp      | 7 +++++++
 3 files changed, 21 insertions(+)

diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stkanimatedmesh.cpp
index 15c94e2b5..2c952e62a 100644
--- a/src/graphics/stkanimatedmesh.cpp
+++ b/src/graphics/stkanimatedmesh.cpp
@@ -33,6 +33,13 @@ void STKAnimatedMesh::cleanGLMeshes()
             glDeleteVertexArrays(1, &(mesh.vao));
         glDeleteBuffers(1, &(mesh.vertex_buffer));
         glDeleteBuffers(1, &(mesh.index_buffer));
+#ifdef Bindless_Texture_Support
+        for (unsigned j = 0; j < 6; j++)
+        {
+            if (mesh.TextureHandles[j] && glIsTextureHandleResidentARB(mesh.TextureHandles[j]))
+                glMakeTextureHandleNonResidentARB(mesh.TextureHandles[j]);
+        }
+#endif
     }
 }
 
diff --git a/src/graphics/stkinstancedscenenode.cpp b/src/graphics/stkinstancedscenenode.cpp
index 4c0421392..1059ae366 100644
--- a/src/graphics/stkinstancedscenenode.cpp
+++ b/src/graphics/stkinstancedscenenode.cpp
@@ -31,6 +31,13 @@ void STKInstancedSceneNode::cleanGL()
             glDeleteVertexArrays(1, &(mesh.vao_shadow_pass));
         glDeleteBuffers(1, &(mesh.vertex_buffer));
         glDeleteBuffers(1, &(mesh.index_buffer));
+#ifdef Bindless_Texture_Support
+        for (unsigned j = 0; i < 6; i++)
+        {
+            if (mesh.TextureHandles[j] && glIsTextureHandleResidentARB(mesh.TextureHandles[j]))
+                glMakeTextureHandleNonResidentARB(mesh.TextureHandles[j]);
+        }
+#endif
     }
     glDeleteBuffers(1, &instances_vbo);
 }
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 47606345b..74d93d060 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -115,6 +115,13 @@ void STKMeshSceneNode::cleanGLMeshes()
             glDeleteVertexArrays(1, &(mesh.vao));
         glDeleteBuffers(1, &(mesh.vertex_buffer));
         glDeleteBuffers(1, &(mesh.index_buffer));
+#ifdef Bindless_Texture_Support
+        for (unsigned j = 0; j < 6; j++)
+        {
+            if (mesh.TextureHandles[j] && glIsTextureHandleResidentARB(mesh.TextureHandles[j]))
+                glMakeTextureHandleNonResidentARB(mesh.TextureHandles[j]);
+        }
+#endif
     }
     GLmeshes.clear();
     for (unsigned i = 0; i < MAT_COUNT; i++)

From 46396f4a7e564f3ec02705cd01391fcb2ca22c10 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 27 Aug 2014 13:46:42 +1000
Subject: [PATCH 128/248] Fix #1484 (crash on windows in release mode).

---
 src/network/client_network_manager.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/network/client_network_manager.cpp b/src/network/client_network_manager.cpp
index dbd8e34b5..ee9a5abc0 100644
--- a/src/network/client_network_manager.cpp
+++ b/src/network/client_network_manager.cpp
@@ -117,7 +117,10 @@ ClientNetworkManager::ClientNetworkManager()
 
 ClientNetworkManager::~ClientNetworkManager()
 {
-    pthread_cancel(*m_thread_keyboard);
+    // On windows in release mode there is no console, and the
+    // thread is not created.
+    if(m_thread_keyboard)
+        pthread_cancel(*m_thread_keyboard);
 }
 
 void ClientNetworkManager::run()
@@ -133,10 +136,17 @@ void ClientNetworkManager::run()
 
     Log::info("ClientNetworkManager", "Host initialized.");
 
+    // On windows in release mode the console is suppressed, so nothing can
+    // be read from std::cin. Since getline(std::cin,...) then returns
+    // an empty string, the waitInput thread is running all the time, consuming
+    // CPU. Therefore don't start the console thread in this case.
+#if defined(WIN32) && defined(_MSC_VER) && !defined(DEBUG)
+    m_thread_keyboard = NULL;
+#else
     // listen keyboard console input
     m_thread_keyboard = (pthread_t*)(malloc(sizeof(pthread_t)));
     pthread_create(m_thread_keyboard, NULL, waitInput, NULL);
-
+#endif
     NetworkManager::run();
 
     Log::info("ClientNetworkManager", "Ready !");

From db3db6f8b57cea02559ef725fe1f469ab57e51ad Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 27 Aug 2014 22:08:50 +1000
Subject: [PATCH 129/248] First version of the GP info screen (instead of
 dialog).

---
 data/gui/gp_info.stkgui               |  59 +++++++
 sources.cmake                         |   2 +-
 src/states_screens/gp_info_screen.cpp | 214 ++++++++++++++++++++++++++
 src/states_screens/gp_info_screen.hpp |  75 +++++++++
 src/states_screens/tracks_screen.cpp  |   8 +-
 5 files changed, 355 insertions(+), 3 deletions(-)
 create mode 100644 data/gui/gp_info.stkgui
 create mode 100644 src/states_screens/gp_info_screen.cpp
 create mode 100644 src/states_screens/gp_info_screen.hpp

diff --git a/data/gui/gp_info.stkgui b/data/gui/gp_info.stkgui
new file mode 100644
index 000000000..c72841d35
--- /dev/null
+++ b/data/gui/gp_info.stkgui
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row">
+
+        <header id="name" width="100%" text_align="center"/>
+
+        <spacer width="1" height="5%"/>
+
+        <box width="95%" height="50%" padding="10" layout="horizontal-row">
+            <spacer width="10" height="100%"/>
+            <!-- Left pane -->
+            <div width="45%" height="95%" align="center" layout="vertical-row">
+                <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
+                </placeholder>
+            </div>
+
+            <spacer width="5%" height="100%"/>
+
+            <!-- Right pane -->
+            <div width="45%" height="95%" align="center" layout="vertical-row">
+                <list id="tracks" width="100%" height="100%"/>
+            </div>
+
+        </box>
+        <spacer width="1" height="3%"/>
+        <box width="95%" height="17%" padding="10" layout="vertical-row">
+            <spacer width="1" height="5%"/>
+
+            <div width="75%" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="2" />
+                <label id="ai-text" height="100%" width="40%" I18N="Number of AI karts" text="Number of AI karts"/>
+                <spacer with="40" height="2" />
+                <spinner id="ai-spinner" width="20%" min_value="1" max_value="20" align="center"
+                         wrap_around="true" />
+                <spacer proportion="1" height="2" />
+            </div>
+            <div width="75%" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="2" />
+                <label id="reverse-text" height="100%" width="40%" I18N="Drive the track reverse" text="Drive in reverse"/>
+                <spacer width="40" height="2" />
+                <checkbox id="reverse"/>
+                <spacer proportion="1" height="2" />
+            </div>
+            <spacer width="1" height="2%"/>
+        </box>
+        <spacer width="1" height="2%"/>
+        <buttonbar id="buttons" height="15%" width="100%" align="center">
+
+            <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
+                    I18N="Start race" text="Start Race"/>
+
+            <icon-button id="continue" width="64" height="64" icon="gui/green_check.png"
+                    I18N="Continue race" text="Continue Race"/>
+        </buttonbar>
+
+    </div>
+</stkgui>
diff --git a/sources.cmake b/sources.cmake
index f484b15d5..ddc029d4f 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,5 +1,5 @@
 # Modify this file to change the last-modified date when you add/remove a file. 
-# This will then trigger a new cmake run automatically. 
+# This will then trigger a new cmake run automatically.
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")
diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
new file mode 100644
index 000000000..16f18d499
--- /dev/null
+++ b/src/states_screens/gp_info_screen.cpp
@@ -0,0 +1,214 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2009-2013 Marianne Gagnon
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "states_screens/gp_info_screen.hpp"
+
+#include "audio/sfx_manager.hpp"
+#include "challenges/unlock_manager.hpp"
+#include "config/player_manager.hpp"
+#include "config/saved_grand_prix.hpp"
+#include "graphics/irr_driver.hpp"
+#include "guiengine/engine.hpp"
+#include "guiengine/screen.hpp"
+#include "guiengine/widgets/check_box_widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/list_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "io/file_manager.hpp"
+#include "race/grand_prix_manager.hpp"
+#include "race/grand_prix_data.hpp"
+#include "race/race_manager.hpp"
+#include "states_screens/state_manager.hpp"
+#include "states_screens/tracks_screen.hpp"
+#include "tracks/track.hpp"
+#include "tracks/track_manager.hpp"
+#include "utils/translation.hpp"
+
+#include <IGUIEnvironment.h>
+#include <IGUIStaticText.h>
+
+using irr::gui::IGUIStaticText;
+using GUIEngine::PROP_ID;
+
+using namespace GUIEngine;
+
+DEFINE_SCREEN_SINGLETON( GPInfoScreen );
+
+GPInfoScreen::GPInfoScreen() : Screen("gp_info.stkgui")
+{
+    m_gp        = NULL;
+    m_curr_time = 0.0f;
+}   // GPInfoScreen
+
+// ----------------------------------------------------------------------------
+
+GPInfoScreen::~GPInfoScreen()
+{
+}   // ~GPInfoScreen
+
+// ----------------------------------------------------------------------------
+/** Sets the GP to be displayed.
+ */
+void GPInfoScreen::setGP(const std::string &gp_ident)
+{
+    m_gp = grand_prix_manager->getGrandPrix(gp_ident);
+}   // setGP
+
+// ----------------------------------------------------------------------------
+void GPInfoScreen::init()
+{
+    Screen::init();
+    m_curr_time = 0.0f;
+
+    getWidget<LabelWidget>("name")->setText(m_gp->getName(), false);
+
+    m_gp->checkConsistency();
+
+    m_over_body   = UserConfigParams::m_height/7;
+    m_lower_bound = UserConfigParams::m_height*6/7;
+
+    addTracks();
+    addScreenshot();
+
+    CheckBoxWidget *reverse = getWidget<CheckBoxWidget>("reverse");
+    reverse->setState(false);
+
+    // Check if there is a saved GP:
+    SavedGrandPrix* saved_gp = 
+        SavedGrandPrix::getSavedGP(StateManager::get()
+                                   ->getActivePlayerProfile(0)->getUniqueID(),
+                                   m_gp->getId(),
+                                   race_manager->getDifficulty(),
+                                   race_manager->getNumberOfKarts(),
+                                   race_manager->getNumLocalPlayers());
+    
+    getWidget<IconButtonWidget>("continue")->setVisible(saved_gp!=NULL);
+}   // init
+
+// ----------------------------------------------------------------------------
+void GPInfoScreen::loadedFromFile()
+{
+}   // loadedFromFile
+
+// ----------------------------------------------------------------------------
+
+void GPInfoScreen::addTracks()
+{
+    const std::vector<std::string> tracks = m_gp->getTrackNames();
+
+    ListWidget *list = getWidget<ListWidget>("tracks");
+    list->clear();
+    for(unsigned int i=0; i<tracks.size(); i++)
+    {
+        const Track *track = track_manager->getTrack(tracks[i]);
+        std::string s = StringUtils::toString(i);
+        list->addItem(s, translations->fribidize(track->getName()) );
+    }
+}   // addTracks
+
+// ----------------------------------------------------------------------------
+
+void GPInfoScreen::addScreenshot()
+{
+    Widget* screenshot_div = getWidget("screenshot_div");
+
+    m_screenshot_widget = new GUIEngine::IconButtonWidget(
+        GUIEngine::IconButtonWidget::SCALE_MODE_KEEP_CUSTOM_ASPECT_RATIO,
+        false, false, GUIEngine::IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
+    // images are saved squared, but must be stretched to 4:3
+    m_screenshot_widget->setCustomAspectRatio(4.0f / 3.0f);
+    m_screenshot_widget->m_x = screenshot_div->m_x;
+    m_screenshot_widget->m_y = screenshot_div->m_y;
+    m_screenshot_widget->m_w = screenshot_div->m_w;
+    m_screenshot_widget->m_h = screenshot_div->m_h;
+
+
+    // Temporary icon, will replace it just after 
+    // (but it will be shown if the given icon is not found)
+    m_screenshot_widget->m_properties[PROP_ICON] = "gui/main_help.png";
+    m_screenshot_widget->add();
+
+    const Track *track = track_manager->getTrack(m_gp->getTrackId(0));
+    video::ITexture* screenshot = irr_driver->getTexture(track->getScreenshotFile(),
+                                    "While loading screenshot for track '%s':",
+                                           track->getFilename()            );
+    if (screenshot != NULL)
+        m_screenshot_widget->setImage(screenshot);
+    m_widgets.push_back(m_screenshot_widget);
+}   // addScreenShot
+
+// ----------------------------------------------------------------------------
+
+void GPInfoScreen::onEnterPressedInternal()
+{
+    // Save the GP id because dismiss() will destroy this instance
+    std::string gp_id = m_gp->getId();
+//FIXME    ModalDialog::dismiss();
+    // Disable accidentally unlocking of a challenge
+    PlayerManager::getCurrentPlayer()->setCurrentChallenge("");
+    race_manager->startGP(grand_prix_manager->getGrandPrix(gp_id), false, false);
+}
+
+// ----------------------------------------------------------------------------
+
+void GPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &name,
+                                 const int player_id)
+{
+    if(name=="buttons")
+    {
+        const std::string &button = getWidget<GUIEngine::RibbonWidget>("buttons")
+                                  ->getSelectionIDString(PLAYER_ID_GAME_MASTER);
+
+        if (button == "start")
+        {
+            // Save GP identifier, since dismiss will delete this object.
+            std::string gp_id = m_gp->getId();
+            // Also create a copy of the string: it is a reference to data
+            // in a widget in the dialog - so if we call dismiss, this reference
+            // becomes invalid!
+            std::string save_source = name;
+            // FIXME ModalDialog::dismiss();
+            race_manager->startGP(grand_prix_manager->getGrandPrix(gp_id), false,
+                (save_source == "continue"));
+        }
+    }   // name=="buttons"
+
+}   // eventCallback
+
+// ----------------------------------------------------------------------------
+
+void GPInfoScreen::onUpdate(float dt)
+{
+    if (dt == 0)
+        return; // if nothing changed, return right now
+
+    m_curr_time += dt;
+    int frameAfter = (int)(m_curr_time / 1.5f);
+
+    const std::vector<std::string> tracks = m_gp->getTrackNames();
+    if (frameAfter >= (int)tracks.size())
+    {
+        frameAfter = 0;
+        m_curr_time = 0;
+    }
+
+    Track* track = track_manager->getTrack(tracks[frameAfter]);
+    std::string file = track->getScreenshotFile();
+    m_screenshot_widget->setImage(file, IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
+    m_screenshot_widget->m_properties[GUIEngine::PROP_ICON] = file;
+}   // onUpdate
\ No newline at end of file
diff --git a/src/states_screens/gp_info_screen.hpp b/src/states_screens/gp_info_screen.hpp
new file mode 100644
index 000000000..976d2c2b4
--- /dev/null
+++ b/src/states_screens/gp_info_screen.hpp
@@ -0,0 +1,75 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2009-2014 Marianne Gagnon
+//                2014      Joerg Henrichs
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+#ifndef HEADER_GP_INFO_SCREEN_HPP
+#define HEADER_GP_INFO_SCREEN_HPP
+
+#include "guiengine/screen.hpp"
+
+class GrandPrixData;
+
+namespace GUIEngine
+{
+    class IconButtonWidget;
+}
+
+/**
+ * \brief Dialog that shows information about a specific grand prix
+ * \ingroup states_screens
+ */
+class GPInfoScreen : public GUIEngine::Screen,
+                     public GUIEngine::ScreenSingleton<GPInfoScreen>
+{
+protected: // Necessary for RandomGPInfoScreen
+    GUIEngine::IconButtonWidget* m_screenshot_widget;
+    float m_curr_time;
+
+    /** The grand prix data. */
+    GrandPrixData *m_gp;
+
+    /** height of the separator over the body */
+    int m_over_body;
+    /** height of the seperator over the buttons */
+    int m_lower_bound;
+
+    /** \brief display all the tracks according to the current gp
+     * For a normal gp info dialog, it just creates a label for every track.
+     * But with a random gp info dialog, it tries to reuse as many
+     * labels as possible by just changing their text. */
+    void addTracks();
+    void addScreenshot();
+
+public:
+    GPInfoScreen();
+    /** Places the focus back on the selected GP, in the case that the dialog
+     * was cancelled and we're returning to the track selection screen */
+    virtual ~GPInfoScreen();
+
+    void onEnterPressedInternal();
+    virtual void eventCallback(GUIEngine::Widget *, const std::string &name,
+                               const int player_id);
+    virtual void loadedFromFile();
+    virtual void init();
+
+    virtual void onUpdate(float dt);
+
+    void setGP(const std::string &gp_ident);
+};
+
+#endif
diff --git a/src/states_screens/tracks_screen.cpp b/src/states_screens/tracks_screen.cpp
index 8832a6902..ba4865c07 100644
--- a/src/states_screens/tracks_screen.cpp
+++ b/src/states_screens/tracks_screen.cpp
@@ -29,7 +29,7 @@
 #include "race/grand_prix_manager.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/track_info_screen.hpp"
-#include "states_screens/dialogs/gp_info_dialog.hpp"
+#include "states_screens/gp_info_screen.hpp"
 #include "states_screens/dialogs/random_gp_dialog.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_manager.hpp"
@@ -118,7 +118,11 @@ void TracksScreen::eventCallback(Widget* widget, const std::string& name,
             if (selection == "Random Grand Prix")
                 new RandomGPInfoDialog();
             else
-                new GPInfoDialog(selection);
+            {
+                GPInfoScreen *gpis = GPInfoScreen::getInstance();
+                gpis->setGP(selection);
+                StateManager::get()->pushScreen(gpis);
+            }
         }
     }
     else if (name == "trackgroups")

From 2a5591ad1f99ee9f9020f2f8f50c9786827b7787 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 27 Aug 2014 22:57:03 +1000
Subject: [PATCH 130/248] Enable continue button.

---
 src/states_screens/gp_info_screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index 16f18d499..8966f836c 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -174,7 +174,7 @@ void GPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &name,
         const std::string &button = getWidget<GUIEngine::RibbonWidget>("buttons")
                                   ->getSelectionIDString(PLAYER_ID_GAME_MASTER);
 
-        if (button == "start")
+        if (button == "start" || button=="continue")
         {
             // Save GP identifier, since dismiss will delete this object.
             std::string gp_id = m_gp->getId();

From 00049f2f043e8166f75c02460235282349f82e7f Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 27 Aug 2014 17:22:59 +0200
Subject: [PATCH 131/248] Init texture only once, not each frame

---
 src/graphics/render_geometry.cpp       | 49 --------------------------
 src/graphics/stkanimatedmesh.cpp       |  1 +
 src/graphics/stkinstancedscenenode.cpp |  1 +
 src/graphics/stkmesh.cpp               | 42 ++++++++++++++++++++++
 src/graphics/stkmesh.hpp               |  2 ++
 src/graphics/stkmeshscenenode.cpp      |  3 ++
 6 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 829721c7c..27c2b9beb 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -128,19 +128,8 @@ void renderMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
         for (unsigned j = 0; j < TexUnits.size(); j++)
         {
-            if (!mesh.textures[TexUnits[j].m_id])
-                mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-            compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
             if (UserConfigParams::m_azdo)
-            {
-#ifdef Bindless_Texture_Support
-                if (!mesh.TextureHandles[TexUnits[j].m_id])
-                    mesh.TextureHandles[TexUnits[j].m_id] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[TexUnits[j].m_id]), Shader::getInstance()->SamplersId[j]);
-                if (!glIsTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]))
-                    glMakeTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]);
-#endif
                 Handles.push_back(mesh.TextureHandles[TexUnits[j].m_id]);
-            }
             else
                 Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
         }
@@ -211,12 +200,7 @@ void renderInstancedMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vec
         if (!irr_driver->hasARB_base_instance())
             glBindVertexArray(mesh.vao);
         for (unsigned j = 0; j < TexUnits.size(); j++)
-        {
-            if (!mesh.textures[TexUnits[j].m_id])
-                mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-            compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
             Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
-        }
         Shader::getInstance()->SetTextureUnits(Textures);
         instanced_custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
@@ -412,19 +396,8 @@ void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
         for (unsigned j = 0; j < TexUnits.size(); j++)
         {
-            if (!mesh.textures[TexUnits[j].m_id])
-                mesh.textures[TexUnits[j].m_id] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-            compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
             if (UserConfigParams::m_azdo)
-            {
-#ifdef Bindless_Texture_Support
-                if (!mesh.TextureHandles[TexUnits[j].m_id])
-                    mesh.TextureHandles[TexUnits[j].m_id] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[TexUnits[j].m_id]), Shader::getInstance()->SamplersId[Handles.size()]);
-                if (!glIsTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]))
-                    glMakeTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]);
                 Handles.push_back(mesh.TextureHandles[TexUnits[j].m_id]);
-#endif
-            }
             else
                 Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
         }
@@ -457,13 +430,7 @@ void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vec
 
         std::vector<GLuint> Textures(Prefilled_tex);
         for (unsigned j = 0; j < TexUnits.size(); j++)
-        {
-            if (!mesh.textures[TexUnits[j].m_id])
-                mesh.textures[TexUnits[j].m_id] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-            compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
             Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
-
-        }
         Shader::getInstance()->SetTextureUnits(Textures);
         instanced_custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
@@ -816,15 +783,7 @@ void renderShadow(const std::vector<GLuint> TextureUnits, unsigned cascade, cons
         {
             compressTexture(mesh->textures[TextureUnits[j]], true);
             if (UserConfigParams::m_azdo)
-            {
-#ifdef Bindless_Texture_Support
-                if (!mesh->TextureHandles[TextureUnits[j]])
-                    mesh->TextureHandles[TextureUnits[j]] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh->textures[TextureUnits[j]]), T::getInstance()->SamplersId[j]);
-                if (!glIsTextureHandleResidentARB(mesh->TextureHandles[TextureUnits[j]]))
-                    glMakeTextureHandleResidentARB(mesh->TextureHandles[TextureUnits[j]]);
-#endif
                 Handles.push_back(mesh->TextureHandles[TextureUnits[j]]);
-            }
             else
                 Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
         }
@@ -885,11 +844,8 @@ void renderInstancedShadow(const std::vector<GLuint> TextureUnits, unsigned casc
             glBindVertexArray(mesh->vao_shadow_pass);
 
         for (unsigned j = 0; j < TextureUnits.size(); j++)
-        {
-            compressTexture(mesh->textures[TextureUnits[j]], true);
             Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
 
-        }
         T::getInstance()->SetTextureUnits(Textures);
         instanced_shadow_custom_unroll_args<List...>::template exec<T>(T::getInstance(), cascade, t->at(i));
     }
@@ -1071,12 +1027,7 @@ void drawRSM(const core::matrix4 & rsm_matrix, const std::vector<GLuint> &Textur
         std::vector<GLuint> Textures;
         GLMesh *mesh = STK::tuple_get<0>(t->at(i));
         for (unsigned j = 0; j < TextureUnits.size(); j++)
-        {
-            if (!mesh->textures[TextureUnits[j]])
-                mesh->textures[TextureUnits[j]] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-            compressTexture(mesh->textures[TextureUnits[j]], true);
             Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
-        }
         T::getInstance()->SetTextureUnits(Textures);
         rsm_custom_unroll_args<Selector...>::template exec<T>(rsm_matrix, t->at(i));
     }
diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stkanimatedmesh.cpp
index 2c952e62a..54ad2a5c3 100644
--- a/src/graphics/stkanimatedmesh.cpp
+++ b/src/graphics/stkanimatedmesh.cpp
@@ -106,6 +106,7 @@ void STKAnimatedMesh::render()
             {
                 MeshMaterial MatType = MaterialTypeToMeshMaterial(type, mb->getVertexType());
                 MeshSolidMaterial[MatType].push_back(&mesh);
+                InitTextures(mesh, MatType);
             }
             std::pair<unsigned, unsigned> p = VAOManager::getInstance()->getBase(mb);
             mesh.vaoBaseVertex = p.first;
diff --git a/src/graphics/stkinstancedscenenode.cpp b/src/graphics/stkinstancedscenenode.cpp
index 1059ae366..27ebb01d7 100644
--- a/src/graphics/stkinstancedscenenode.cpp
+++ b/src/graphics/stkinstancedscenenode.cpp
@@ -124,6 +124,7 @@ void STKInstancedSceneNode::setFirstTimeMaterial()
         if (irr_driver->hasARB_base_instance())
             mesh.vaoBaseInstance = VAOManager::getInstance()->appendInstance(InstanceTypeDefault, instanceData[i]);
         MeshSolidMaterial[MatType].push_back(&mesh);
+        InitTextures(mesh, MatType);
     }
     isMaterialInitialized = true;
 }
diff --git a/src/graphics/stkmesh.cpp b/src/graphics/stkmesh.cpp
index 568479942..831865ed5 100644
--- a/src/graphics/stkmesh.cpp
+++ b/src/graphics/stkmesh.cpp
@@ -292,4 +292,46 @@ bool isObject(video::E_MATERIAL_TYPE type)
     if (type == video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF)
         return true;
     return false;
+}
+
+static void
+SetTexture(GLMesh &mesh, unsigned i, bool isSrgb)
+{
+    if (!mesh.textures[i])
+        mesh.textures[i] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
+    compressTexture(mesh.textures[i], isSrgb);
+    if (UserConfigParams::m_azdo)
+    {
+        if (!mesh.TextureHandles[i])
+            mesh.TextureHandles[i] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[i]), MeshShader::ObjectPass1Shader::getInstance()->SamplersId[0]);
+        if (!glIsTextureHandleResidentARB(mesh.TextureHandles[i]))
+            glMakeTextureHandleResidentARB(mesh.TextureHandles[i]);
+    }
+}
+
+void InitTextures(GLMesh &mesh, MeshMaterial Mat)
+{
+    switch (Mat)
+    {
+    default:
+    case MAT_DEFAULT:
+    case MAT_ALPHA_REF:
+    case MAT_GRASS:
+    case MAT_SPHEREMAP:
+    case MAT_UNLIT:
+        SetTexture(mesh, 0, true);
+        break;
+    case MAT_DETAIL:
+    case MAT_NORMAL_MAP:
+        SetTexture(mesh, 0, true);
+        SetTexture(mesh, 1, false);
+        break;
+    case MAT_SPLATTING:
+        SetTexture(mesh, 0, true);
+        SetTexture(mesh, 1, true);
+        SetTexture(mesh, 2, true);
+        SetTexture(mesh, 3, true);
+        SetTexture(mesh, 4, true);
+        break;
+    }
 }
\ No newline at end of file
diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stkmesh.hpp
index 87fdf9071..c47f8b601 100644
--- a/src/graphics/stkmesh.hpp
+++ b/src/graphics/stkmesh.hpp
@@ -109,4 +109,6 @@ void drawBubble(const GLMesh &mesh, const core::matrix4 &ModelViewProjectionMatr
 MeshMaterial MaterialTypeToMeshMaterial(video::E_MATERIAL_TYPE, video::E_VERTEX_TYPE);
 TransparentMaterial MaterialTypeToTransparentMaterial(video::E_MATERIAL_TYPE, f32 MaterialTypeParam);
 
+void InitTextures(GLMesh &mesh, MeshMaterial);
+
 #endif // STKMESH_H
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 74d93d060..da3e39cd1 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -90,7 +90,10 @@ void STKMeshSceneNode::setFirstTimeMaterial()
               glBindVertexArray(0);
           }
           else
+          {
+              InitTextures(mesh, MatType);
               MeshSolidMaterials[MatType].push_back(&mesh);
+          }
       }
 
       if (!immediate_draw)

From 5a212989df3b5377ecebb59a8b98042f4add753a Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Wed, 27 Aug 2014 17:44:24 +0200
Subject: [PATCH 132/248] Fix build on travis

---
 src/graphics/stkmesh.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/graphics/stkmesh.cpp b/src/graphics/stkmesh.cpp
index 831865ed5..fee55f00e 100644
--- a/src/graphics/stkmesh.cpp
+++ b/src/graphics/stkmesh.cpp
@@ -300,6 +300,7 @@ SetTexture(GLMesh &mesh, unsigned i, bool isSrgb)
     if (!mesh.textures[i])
         mesh.textures[i] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
     compressTexture(mesh.textures[i], isSrgb);
+#ifdef Bindless_Texture_Support
     if (UserConfigParams::m_azdo)
     {
         if (!mesh.TextureHandles[i])
@@ -307,6 +308,7 @@ SetTexture(GLMesh &mesh, unsigned i, bool isSrgb)
         if (!glIsTextureHandleResidentARB(mesh.TextureHandles[i]))
             glMakeTextureHandleResidentARB(mesh.TextureHandles[i]);
     }
+#endif
 }
 
 void InitTextures(GLMesh &mesh, MeshMaterial Mat)

From 998b5a89ac7462f8c60a08b9110ad7a8a79a388e Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Wed, 27 Aug 2014 19:32:45 +0200
Subject: [PATCH 133/248] Fix transparents

---
 src/graphics/render_geometry.cpp | 65 ++++++++++++++++++++++++++------
 1 file changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 27c2b9beb..335d5a73b 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -611,6 +611,51 @@ void IrrDriver::renderNormalsVisualisation()
 
 }
 
+template<typename Shader, enum E_VERTEX_TYPE VertexType, int...List, typename... TupleType>
+void renderTransparenPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes)
+{
+    glUseProgram(Shader::getInstance()->Program);
+    glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
+    for (unsigned i = 0; i < meshes->size(); i++)
+    {
+        std::vector<uint64_t> Handles;
+        std::vector<GLuint> Textures;
+        GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
+        for (unsigned j = 0; j < TexUnits.size(); j++)
+        {
+            if (!mesh.textures[TexUnits[j].m_id])
+                mesh.textures[TexUnits[j].m_id] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
+            compressTexture(mesh.textures[TexUnits[j].m_id], TexUnits[j].m_premul_alpha);
+            if (UserConfigParams::m_azdo)
+            {
+#ifdef Bindless_Texture_Support
+                if (!mesh.TextureHandles[TexUnits[j].m_id])
+                    mesh.TextureHandles[TexUnits[j].m_id] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[TexUnits[j].m_id]), Shader::getInstance()->SamplersId[Handles.size()]);
+                if (!glIsTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]))
+                    glMakeTextureHandleResidentARB(mesh.TextureHandles[TexUnits[j].m_id]);
+#endif
+                Handles.push_back(mesh.TextureHandles[TexUnits[j].m_id]);
+            }
+            else
+                Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
+        }
+
+        if (mesh.VAOType != VertexType)
+        {
+#ifdef DEBUG
+            Log::error("Materials", "Wrong vertex Type associed to pass 2 (hint texture : %s)", mesh.textures[0]->getName().getPath().c_str());
+#endif
+            continue;
+        }
+
+        if (UserConfigParams::m_azdo)
+            Shader::getInstance()->SetTextureHandles(Handles);
+        else
+            Shader::getInstance()->SetTextureUnits(Textures);
+        custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
+    }
+}
+
 static video::ITexture *displaceTex = 0;
 
 void IrrDriver::renderTransparent()
@@ -634,24 +679,20 @@ void IrrDriver::renderTransparent()
     if (World::getWorld() && World::getWorld()->isFogEnabled())
     {
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-        renderMeshes2ndPass<MeshShader::TransparentFogShader, video::EVT_STANDARD, 8, 7, 6, 5, 4, 3, 2, 1>(TexUnits(
-            TexUnit(0, true)
-            ), ListBlendTransparentFog::getInstance(), createVector<uint64_t>(), createVector<GLuint>());
+        renderTransparenPass<MeshShader::TransparentFogShader, video::EVT_STANDARD, 8, 7, 6, 5, 4, 3, 2, 1>(TexUnits(
+            TexUnit(0, true)), ListBlendTransparentFog::getInstance());
         glBlendFunc(GL_ONE, GL_ONE);
-        renderMeshes2ndPass<MeshShader::TransparentFogShader, video::EVT_STANDARD, 8, 7, 6, 5, 4, 3, 2, 1>(TexUnits(
-            TexUnit(0, true)
-            ), ListAdditiveTransparentFog::getInstance(), createVector<uint64_t>(), createVector<GLuint>());
+        renderTransparenPass<MeshShader::TransparentFogShader, video::EVT_STANDARD, 8, 7, 6, 5, 4, 3, 2, 1>(TexUnits(
+            TexUnit(0, true)), ListAdditiveTransparentFog::getInstance());
     }
     else
     {
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-        renderMeshes2ndPass<MeshShader::TransparentShader, video::EVT_STANDARD, 2, 1>(TexUnits(
-            TexUnit(0, true)
-            ), ListBlendTransparent::getInstance(), createVector<uint64_t>(), createVector<GLuint>());
+        renderTransparenPass<MeshShader::TransparentShader, video::EVT_STANDARD, 2, 1>(TexUnits(
+            TexUnit(0, true)), ListBlendTransparent::getInstance());
         glBlendFunc(GL_ONE, GL_ONE);
-        renderMeshes2ndPass<MeshShader::TransparentShader, video::EVT_STANDARD, 2, 1>(TexUnits(
-            TexUnit(0, true)
-            ), ListAdditiveTransparent::getInstance(), createVector<uint64_t>(), createVector<GLuint>());
+        renderTransparenPass<MeshShader::TransparentShader, video::EVT_STANDARD, 2, 1>(TexUnits(
+            TexUnit(0, true)), ListAdditiveTransparent::getInstance());
     }
 
     if (!UserConfigParams::m_dynamic_lights)

From a3b8494ad591445803d415b7c084c2f1720ff417 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Wed, 27 Aug 2014 21:21:17 +0200
Subject: [PATCH 134/248] Remove Base Vertex/Offset if base instance is
 unavailable

---
 src/graphics/render.cpp                |  3 +-
 src/graphics/render_geometry.cpp       | 37 +++++++++++++----
 src/graphics/stkanimatedmesh.cpp       | 34 +++++++++++++---
 src/graphics/stkinstancedscenenode.cpp | 29 ++++---------
 src/graphics/stkinstancedscenenode.hpp |  1 -
 src/graphics/stkmesh.cpp               |  1 +
 src/graphics/stkmesh.hpp               |  2 +-
 src/graphics/stkmeshscenenode.cpp      | 56 +++++++++++++++++---------
 8 files changed, 106 insertions(+), 57 deletions(-)

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 7cac587c1..f3f830fd6 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -768,7 +768,8 @@ void IrrDriver::renderGlow(std::vector<GlowData>& glows)
     glDepthMask(GL_FALSE);
     glDisable(GL_BLEND);
 
-    glBindVertexArray(VAOManager::getInstance()->getVAO(EVT_STANDARD));
+    if (irr_driver->hasARB_base_instance())
+        glBindVertexArray(VAOManager::getInstance()->getVAO(EVT_STANDARD));
     for (u32 i = 0; i < glowcount; i++)
     {
         const GlowData &dat = glows[i];
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 335d5a73b..a46f59331 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -120,12 +120,15 @@ template<typename Shader, enum E_VERTEX_TYPE VertexType, int ...List, typename..
 void renderMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes)
 {
     glUseProgram(Shader::getInstance()->Program);
-    glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
+    if (irr_driver->hasARB_base_instance())
+        glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
     for (unsigned i = 0; i < meshes->size(); i++)
     {
         std::vector<GLuint> Textures;
         std::vector<uint64_t> Handles;
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
+        if (!irr_driver->hasARB_base_instance())
+            glBindVertexArray(mesh.vao);
         for (unsigned j = 0; j < TexUnits.size(); j++)
         {
             if (UserConfigParams::m_azdo)
@@ -388,12 +391,15 @@ void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
     const std::vector<GLuint> &Prefilled_Tex)
 {
     glUseProgram(Shader::getInstance()->Program);
-    glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
+    if (irr_driver->hasARB_base_instance())
+        glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
     for (unsigned i = 0; i < meshes->size(); i++)
     {
         std::vector<uint64_t> Handles(Prefilled_Handle);
         std::vector<GLuint> Textures(Prefilled_Tex);
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
+        if (!irr_driver->hasARB_base_instance())
+            glBindVertexArray(mesh.vao);
         for (unsigned j = 0; j < TexUnits.size(); j++)
         {
             if (UserConfigParams::m_azdo)
@@ -615,12 +621,15 @@ template<typename Shader, enum E_VERTEX_TYPE VertexType, int...List, typename...
 void renderTransparenPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes)
 {
     glUseProgram(Shader::getInstance()->Program);
-    glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
+    if (irr_driver->hasARB_base_instance())
+        glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
     for (unsigned i = 0; i < meshes->size(); i++)
     {
         std::vector<uint64_t> Handles;
         std::vector<GLuint> Textures;
         GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
+        if (!irr_driver->hasARB_base_instance())
+            glBindVertexArray(mesh.vao);
         for (unsigned j = 0; j < TexUnits.size(); j++)
         {
             if (!mesh.textures[TexUnits[j].m_id])
@@ -674,7 +683,8 @@ void IrrDriver::renderTransparent()
     ListDisplacement::getInstance()->clear();
     m_scene_manager->drawAll(scene::ESNRP_TRANSPARENT);
 
-    glBindVertexArray(VAOManager::getInstance()->getVAO(EVT_STANDARD));
+    if (irr_driver->hasARB_base_instance())
+        glBindVertexArray(VAOManager::getInstance()->getVAO(EVT_STANDARD));
 
     if (World::getWorld() && World::getWorld()->isFogEnabled())
     {
@@ -716,13 +726,16 @@ void IrrDriver::renderTransparent()
     glStencilFunc(GL_ALWAYS, 1, 0xFF);
     glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
 
-    glBindVertexArray(VAOManager::getInstance()->getVAO(EVT_2TCOORDS));
+    if (irr_driver->hasARB_base_instance())
+        glBindVertexArray(VAOManager::getInstance()->getVAO(EVT_2TCOORDS));
     // Generate displace mask
     // Use RTT_TMP4 as displace mask
     irr_driver->getFBO(FBO_TMP1_WITH_DS).Bind();
     for (unsigned i = 0; i < ListDisplacement::getInstance()->size(); i++)
     {
         const GLMesh &mesh = *(STK::tuple_get<0>(ListDisplacement::getInstance()->at(i)));
+        if (!irr_driver->hasARB_base_instance())
+            glBindVertexArray(mesh.vao);
         const core::matrix4 &AbsoluteTransformation = STK::tuple_get<1>(ListDisplacement::getInstance()->at(i));
         if (mesh.VAOType != video::EVT_2TCOORDS)
         {
@@ -747,6 +760,8 @@ void IrrDriver::renderTransparent()
     for (unsigned i = 0; i < ListDisplacement::getInstance()->size(); i++)
     {
         const GLMesh &mesh = *(STK::tuple_get<0>(ListDisplacement::getInstance()->at(i)));
+        if (!irr_driver->hasARB_base_instance())
+            glBindVertexArray(mesh.vao);
         const core::matrix4 &AbsoluteTransformation = STK::tuple_get<1>(ListDisplacement::getInstance()->at(i));
         if (mesh.VAOType != video::EVT_2TCOORDS)
             continue;
@@ -814,12 +829,15 @@ template<typename T, enum E_VERTEX_TYPE VertexType, int...List, typename... Args
 void renderShadow(const std::vector<GLuint> TextureUnits, unsigned cascade, const std::vector<STK::Tuple<Args...> > *t)
 {
     glUseProgram(T::getInstance()->Program);
-    glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
+    if (irr_driver->hasARB_base_instance())
+        glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
     for (unsigned i = 0; i < t->size(); i++)
     {
         std::vector<uint64_t> Handles;
         std::vector<GLuint> Textures;
         GLMesh *mesh = STK::tuple_get<0>(t->at(i));
+        if (!irr_driver->hasARB_base_instance())
+            glBindVertexArray(mesh->vao);
         for (unsigned j = 0; j < TextureUnits.size(); j++)
         {
             compressTexture(mesh->textures[TextureUnits[j]], true);
@@ -882,7 +900,7 @@ void renderInstancedShadow(const std::vector<GLuint> TextureUnits, unsigned casc
         std::vector<GLuint> Textures;
         GLMesh *mesh = STK::tuple_get<0>(t->at(i));
         if (!irr_driver->hasARB_base_instance())
-            glBindVertexArray(mesh->vao_shadow_pass);
+            glBindVertexArray(mesh->vao);
 
         for (unsigned j = 0; j < TextureUnits.size(); j++)
             Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
@@ -1062,11 +1080,14 @@ template<typename T, enum E_VERTEX_TYPE VertexType, int... Selector, typename...
 void drawRSM(const core::matrix4 & rsm_matrix, const std::vector<GLuint> &TextureUnits, std::vector<STK::Tuple<Args...> > *t)
 {
     glUseProgram(T::getInstance()->Program);
-    glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
+    if (irr_driver->hasARB_base_instance())
+        glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
     for (unsigned i = 0; i < t->size(); i++)
     {
         std::vector<GLuint> Textures;
         GLMesh *mesh = STK::tuple_get<0>(t->at(i));
+        if (!irr_driver->hasARB_base_instance())
+            glBindVertexArray(mesh->vao);
         for (unsigned j = 0; j < TextureUnits.size(); j++)
             Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
         T::getInstance()->SetTextureUnits(Textures);
diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stkanimatedmesh.cpp
index 54ad2a5c3..6c9cf872c 100644
--- a/src/graphics/stkanimatedmesh.cpp
+++ b/src/graphics/stkanimatedmesh.cpp
@@ -33,6 +33,8 @@ void STKAnimatedMesh::cleanGLMeshes()
             glDeleteVertexArrays(1, &(mesh.vao));
         glDeleteBuffers(1, &(mesh.vertex_buffer));
         glDeleteBuffers(1, &(mesh.index_buffer));
+        if (mesh.instance_buffer)
+            glDeleteBuffers(1, &(mesh.instance_buffer));
 #ifdef Bindless_Texture_Support
         for (unsigned j = 0; j < 6; j++)
         {
@@ -108,10 +110,29 @@ void STKAnimatedMesh::render()
                 MeshSolidMaterial[MatType].push_back(&mesh);
                 InitTextures(mesh, MatType);
             }
-            std::pair<unsigned, unsigned> p = VAOManager::getInstance()->getBase(mb);
-            mesh.vaoBaseVertex = p.first;
-            mesh.vaoOffset = p.second;
-            mesh.VAOType = mb->getVertexType();
+
+            if (irr_driver->hasARB_base_instance())
+            {
+                std::pair<unsigned, unsigned> p = VAOManager::getInstance()->getBase(mb);
+                mesh.vaoBaseVertex = p.first;
+                mesh.vaoOffset = p.second;
+            }
+            else
+            {
+                fillLocalBuffer(mesh, mb);
+                mesh.vao = createVAO(mesh.vertex_buffer, mesh.index_buffer, mb->getVertexType());
+                glGenBuffers(1, &(mesh.instance_buffer));
+                glBindBuffer(GL_ARRAY_BUFFER, mesh.instance_buffer);
+                glEnableVertexAttribArray(7);
+                glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
+                glVertexAttribDivisor(7, 1);
+                glEnableVertexAttribArray(8);
+                glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(3 * sizeof(float)));
+                glVertexAttribDivisor(8, 1);
+                glEnableVertexAttribArray(9);
+                glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
+                glVertexAttribDivisor(9, 1);
+            }
         }
     }
     firstTime = false;
@@ -126,7 +147,10 @@ void STKAnimatedMesh::render()
             {
                 glBindVertexArray(0);
                 size_t size = mb->getVertexCount() * GLmeshes[i].Stride;
-                glBindBuffer(GL_ARRAY_BUFFER, VAOManager::getInstance()->getVBO(mb->getVertexType()));
+                if (irr_driver->hasARB_base_instance())
+                    glBindBuffer(GL_ARRAY_BUFFER, VAOManager::getInstance()->getVBO(mb->getVertexType()));
+                else
+                    glBindBuffer(GL_ARRAY_BUFFER, GLmeshes[i].vertex_buffer);
                 GLbitfield bitfield = GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_UNSYNCHRONIZED_BIT;
                 void * buf = glMapBufferRange(GL_ARRAY_BUFFER, GLmeshes[i].vaoBaseVertex * GLmeshes[i].Stride, size, bitfield);
                 memcpy(buf, mb->getVertices(), size);
diff --git a/src/graphics/stkinstancedscenenode.cpp b/src/graphics/stkinstancedscenenode.cpp
index 27ebb01d7..cde162d82 100644
--- a/src/graphics/stkinstancedscenenode.cpp
+++ b/src/graphics/stkinstancedscenenode.cpp
@@ -27,10 +27,12 @@ void STKInstancedSceneNode::cleanGL()
             continue;
         if (mesh.vao)
             glDeleteVertexArrays(1, &(mesh.vao));
-        if (mesh.vao_shadow_pass)
-            glDeleteVertexArrays(1, &(mesh.vao_shadow_pass));
-        glDeleteBuffers(1, &(mesh.vertex_buffer));
-        glDeleteBuffers(1, &(mesh.index_buffer));
+        if (mesh.vertex_buffer)
+            glDeleteBuffers(1, &(mesh.vertex_buffer));
+        if (mesh.index_buffer)
+            glDeleteBuffers(1, &(mesh.index_buffer));
+        if (mesh.instance_buffer)
+            glDeleteBuffers(1, &(mesh.instance_buffer));
 #ifdef Bindless_Texture_Support
         for (unsigned j = 0; i < 6; i++)
         {
@@ -39,7 +41,6 @@ void STKInstancedSceneNode::cleanGL()
         }
 #endif
     }
-    glDeleteBuffers(1, &instances_vbo);
 }
 
 STKInstancedSceneNode::~STKInstancedSceneNode()
@@ -63,7 +64,6 @@ void STKInstancedSceneNode::createGLMeshes()
             std::pair<unsigned, unsigned> p = VAOManager::getInstance()->getBase(mb);
             mesh.vaoBaseVertex = p.first;
             mesh.vaoOffset = p.second;
-            mesh.VAOType = mb->getVertexType();
         }
         else
             fillLocalBuffer(mesh, mb);
@@ -77,8 +77,8 @@ void STKInstancedSceneNode::initinstancedvaostate(GLMesh &mesh, const std::vecto
     if (!irr_driver->hasARB_base_instance())
     {
         mesh.vao = createVAO(mesh.vertex_buffer, mesh.index_buffer, getVTXTYPEFromStride(mesh.Stride));
-        glGenBuffers(1, &instances_vbo);
-        glBindBuffer(GL_ARRAY_BUFFER, instances_vbo);
+        glGenBuffers(1, &(mesh.instance_buffer));
+        glBindBuffer(GL_ARRAY_BUFFER, mesh.instance_buffer);
         glBufferData(GL_ARRAY_BUFFER, instances.size() * sizeof(InstanceData), instances.data(), GL_STATIC_DRAW);
 
         glEnableVertexAttribArray(7);
@@ -90,19 +90,6 @@ void STKInstancedSceneNode::initinstancedvaostate(GLMesh &mesh, const std::vecto
         glEnableVertexAttribArray(9);
         glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
         glVertexAttribDivisor(9, 1);
-
-        mesh.vao_shadow_pass = createVAO(mesh.vertex_buffer, mesh.index_buffer, getVTXTYPEFromStride(mesh.Stride));
-        glBindBuffer(GL_ARRAY_BUFFER, instances_vbo);
-        glEnableVertexAttribArray(7);
-        glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
-        glVertexAttribDivisor(7, 1);
-        glEnableVertexAttribArray(8);
-        glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(3 * sizeof(float)));
-        glVertexAttribDivisor(8, 1);
-        glEnableVertexAttribArray(9);
-        glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
-        glVertexAttribDivisor(9, 1);
-
         glBindVertexArray(0);
     }
 }
diff --git a/src/graphics/stkinstancedscenenode.hpp b/src/graphics/stkinstancedscenenode.hpp
index 74dbc719d..466d0f96c 100644
--- a/src/graphics/stkinstancedscenenode.hpp
+++ b/src/graphics/stkinstancedscenenode.hpp
@@ -24,7 +24,6 @@ protected:
     std::vector<GLMesh> GLmeshes;
     std::vector<std::vector<InstanceData> > instanceData;
     core::matrix4 ModelViewProjectionMatrix, TransposeInverseModelView;
-    GLuint instances_vbo;
     void createGLMeshes();
     bool isMaterialInitialized;
     void setFirstTimeMaterial();
diff --git a/src/graphics/stkmesh.cpp b/src/graphics/stkmesh.cpp
index fee55f00e..a8a9f6ffe 100644
--- a/src/graphics/stkmesh.cpp
+++ b/src/graphics/stkmesh.cpp
@@ -178,6 +178,7 @@ GLMesh allocateMeshBuffer(scene::IMeshBuffer* mb)
     for (unsigned i = 0; i < 6; i++)
         result.textures[i] = mb->getMaterial().getTexture(i);
     result.TextureMatrix = 0;
+    result.VAOType = mb->getVertexType();
     return result;
 }
 
diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stkmesh.hpp
index c47f8b601..5df7f83ab 100644
--- a/src/graphics/stkmesh.hpp
+++ b/src/graphics/stkmesh.hpp
@@ -35,9 +35,9 @@ enum TransparentMaterial
 
 struct GLMesh {
     GLuint vao;
-    GLuint vao_shadow_pass;
     GLuint vertex_buffer;
     GLuint index_buffer;
+    GLuint instance_buffer;
     video::ITexture *textures[6];
     GLenum PrimitiveType;
     GLenum IndexType;
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index da3e39cd1..7d6b6fb78 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -70,38 +70,42 @@ void STKMeshSceneNode::setFirstTimeMaterial()
       if (rnd->isTransparent())
       {
           TransparentMaterial TranspMat = MaterialTypeToTransparentMaterial(type, MaterialTypeParam);
-          if (immediate_draw)
-          {
-              fillLocalBuffer(mesh, mb);
-              mesh.vao = createVAO(mesh.vertex_buffer, mesh.index_buffer, mb->getVertexType());
-              glBindVertexArray(0);
-          }
-          else
+          if (!immediate_draw)
               TransparentMesh[TranspMat].push_back(&mesh);
       }
       else
       {
           assert(!isDisplacement);
           MeshMaterial MatType = MaterialTypeToMeshMaterial(type, mb->getVertexType());
-          if (immediate_draw)
-          {
-              fillLocalBuffer(mesh, mb);
-              mesh.vao = createVAO(mesh.vertex_buffer, mesh.index_buffer, mb->getVertexType());
-              glBindVertexArray(0);
-          }
-          else
+          if (!immediate_draw)
           {
               InitTextures(mesh, MatType);
               MeshSolidMaterials[MatType].push_back(&mesh);
           }
       }
 
-      if (!immediate_draw)
+      if (!immediate_draw && irr_driver->hasARB_base_instance())
       {
           std::pair<unsigned, unsigned> p = VAOManager::getInstance()->getBase(mb);
           mesh.vaoBaseVertex = p.first;
           mesh.vaoOffset = p.second;
-          mesh.VAOType = mb->getVertexType();
+      }
+      else
+      {
+          fillLocalBuffer(mesh, mb);
+          mesh.vao = createVAO(mesh.vertex_buffer, mesh.index_buffer, mb->getVertexType());
+          glGenBuffers(1, &(mesh.instance_buffer));
+          glBindBuffer(GL_ARRAY_BUFFER, mesh.instance_buffer);
+          glEnableVertexAttribArray(7);
+          glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
+          glVertexAttribDivisor(7, 1);
+          glEnableVertexAttribArray(8);
+          glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(3 * sizeof(float)));
+          glVertexAttribDivisor(8, 1);
+          glEnableVertexAttribArray(9);
+          glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
+          glVertexAttribDivisor(9, 1);
+          glBindVertexArray(0);
       }
   }
   isMaterialInitialized = true;
@@ -116,8 +120,12 @@ void STKMeshSceneNode::cleanGLMeshes()
             continue;
         if (mesh.vao)
             glDeleteVertexArrays(1, &(mesh.vao));
-        glDeleteBuffers(1, &(mesh.vertex_buffer));
-        glDeleteBuffers(1, &(mesh.index_buffer));
+        if (mesh.vertex_buffer)
+            glDeleteBuffers(1, &(mesh.vertex_buffer));
+        if (mesh.index_buffer)
+            glDeleteBuffers(1, &(mesh.index_buffer));
+        if (mesh.instance_buffer)
+            glDeleteBuffers(1, &(mesh.instance_buffer));
 #ifdef Bindless_Texture_Support
         for (unsigned j = 0; j < 6; j++)
         {
@@ -310,7 +318,10 @@ void STKMeshSceneNode::render()
             scene::IMeshBuffer* mb = Mesh->getMeshBuffer(i);
             if (!mb)
                 continue;
-            glBindVertexArray(VAOManager::getInstance()->getVAO(video::EVT_STANDARD));
+            if (irr_driver->hasARB_base_instance())
+                glBindVertexArray(VAOManager::getInstance()->getVAO(video::EVT_STANDARD));
+            else
+                glBindVertexArray(GLmeshes[i].vao);
             drawGlow(GLmeshes[i]);
         }
     }
@@ -445,9 +456,14 @@ void STKMeshSceneNode::render()
 
         if (!TransparentMesh[TM_BUBBLE].empty())
             glUseProgram(MeshShader::BubbleShader::Program);
-        glBindVertexArray(VAOManager::getInstance()->getVAO(video::EVT_STANDARD));
+        if (irr_driver->hasARB_base_instance())
+            glBindVertexArray(VAOManager::getInstance()->getVAO(video::EVT_STANDARD));
         for_in(mesh, TransparentMesh[TM_BUBBLE])
+        {
+            if (irr_driver->hasARB_base_instance())
+                glBindVertexArray(mesh->vao);
             drawBubble(*mesh, ModelViewProjectionMatrix);
+        }
         return;
     }
 }

From 5878cb35ece00497ba97cbdede63caea8a5a9371 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Thu, 28 Aug 2014 21:59:55 +0200
Subject: [PATCH 135/248] Implement runtime detection of srgb bindless fix

---
 data/shaders/detailledobject_pass2.frag           | 2 ++
 data/shaders/grass_pass2.frag                     | 2 ++
 data/shaders/instanced_detailledobject_pass2.frag | 2 ++
 data/shaders/instanced_grass_pass2.frag           | 2 ++
 data/shaders/instanced_object_pass2.frag          | 5 ++++-
 data/shaders/instanced_object_unlit.frag          | 2 ++
 data/shaders/instanced_objectpass_spheremap.frag  | 2 ++
 data/shaders/instanced_objectref_pass2.frag       | 2 ++
 data/shaders/object_pass2.frag                    | 5 ++++-
 data/shaders/object_unlit.frag                    | 2 ++
 data/shaders/objectpass_spheremap.frag            | 2 ++
 data/shaders/objectref_pass2.frag                 | 2 ++
 data/shaders/splatting.frag                       | 2 ++
 src/graphics/glwrap.cpp                           | 2 ++
 src/graphics/irr_driver.cpp                       | 5 +++++
 src/graphics/irr_driver.hpp                       | 6 ++++++
 16 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/data/shaders/detailledobject_pass2.frag b/data/shaders/detailledobject_pass2.frag
index 18372dfab..a426b6935 100644
--- a/data/shaders/detailledobject_pass2.frag
+++ b/data/shaders/detailledobject_pass2.frag
@@ -22,7 +22,9 @@ void main(void)
 {
     vec4 color = texture(Albedo, uv);
 #ifdef GL_ARB_bindless_texture
+#ifdef SRGBBindlessFix
     color.xyz = pow(color.xyz, vec3(2.2));
+#endif
 #endif
     vec4 detail = texture(Detail, uv_bis);
     color *= detail;
diff --git a/data/shaders/grass_pass2.frag b/data/shaders/grass_pass2.frag
index b8e5e256c..408e78365 100644
--- a/data/shaders/grass_pass2.frag
+++ b/data/shaders/grass_pass2.frag
@@ -33,7 +33,9 @@ void main(void)
 
     vec4 color = texture(Albedo, uv);
 #ifdef GL_ARB_bindless_texture
+#ifdef SRGBBindlessFix
     color.xyz = pow(color.xyz, vec3(2.2));
+#endif
 #endif
     if (color.a < 0.5) discard;
     vec3 LightFactor = (scattering * 0.3) + getLightFactor(1.);
diff --git a/data/shaders/instanced_detailledobject_pass2.frag b/data/shaders/instanced_detailledobject_pass2.frag
index 4e06686aa..18ff5aa20 100644
--- a/data/shaders/instanced_detailledobject_pass2.frag
+++ b/data/shaders/instanced_detailledobject_pass2.frag
@@ -17,7 +17,9 @@ void main(void)
 {
 #ifdef GL_ARB_bindless_texture
     vec4 color = texture(handle, uv);
+#ifdef SRGBBindlessFix
     color.xyz = pow(color.xyz, vec3(2.2));
+#endif
     vec4 detail = texture(secondhandle, uv_bis);
 #else
     vec4 color = texture(Albedo, uv);
diff --git a/data/shaders/instanced_grass_pass2.frag b/data/shaders/instanced_grass_pass2.frag
index f3134047d..b297a4c88 100644
--- a/data/shaders/instanced_grass_pass2.frag
+++ b/data/shaders/instanced_grass_pass2.frag
@@ -35,7 +35,9 @@ void main(void)
 
 #ifdef GL_ARB_bindless_texture
     vec4 color = texture(handle, uv);
+#ifdef SRGBBindlessFix
     color.xyz = pow(color.xyz, vec3(2.2));
+#endif
 #else
     vec4 color = texture(Albedo, uv);
 #endif
diff --git a/data/shaders/instanced_object_pass2.frag b/data/shaders/instanced_object_pass2.frag
index 6cb4296a8..76176ba37 100644
--- a/data/shaders/instanced_object_pass2.frag
+++ b/data/shaders/instanced_object_pass2.frag
@@ -14,7 +14,10 @@ vec3 getLightFactor(float specMapValue);
 void main(void)
 {
 #ifdef GL_ARB_bindless_texture
-    vec4 col = pow(texture(handle, uv), vec4(2.2));
+    vec4 col = texture(handle, uv);
+#ifdef SRGBBindlessFix
+    col.xyz = pow(col.xyz, vec3(2.2));
+#endif
 #else
     vec4 col = texture(Albedo, uv);
 #endif
diff --git a/data/shaders/instanced_object_unlit.frag b/data/shaders/instanced_object_unlit.frag
index 8875371fe..4e90c0fc4 100644
--- a/data/shaders/instanced_object_unlit.frag
+++ b/data/shaders/instanced_object_unlit.frag
@@ -14,7 +14,9 @@ void main(void)
 {
 #ifdef GL_ARB_bindless_texture
     vec4 col = texture(handle, uv);
+#ifdef SRGBBindlessFix
     col.xyz = pow(col.xyz, vec3(2.2));
+#endif
 #else
     vec4 col = texture(tex, uv);
 #endif
diff --git a/data/shaders/instanced_objectpass_spheremap.frag b/data/shaders/instanced_objectpass_spheremap.frag
index 888e20320..5365dd7ef 100644
--- a/data/shaders/instanced_objectpass_spheremap.frag
+++ b/data/shaders/instanced_objectpass_spheremap.frag
@@ -23,7 +23,9 @@ void main() {
     r.y = - r.y;
 #ifdef GL_ARB_bindless_texture
     vec4 detail0 = texture(handle, r.xy / m + .5);
+#ifdef SRGBBindlessFix
     detail0.xyz = pow(detail0.xyz, vec3(2.2));
+#endif
 #else
     vec4 detail0 = texture(tex, r.xy / m + .5);
 #endif
diff --git a/data/shaders/instanced_objectref_pass2.frag b/data/shaders/instanced_objectref_pass2.frag
index 27d1bd03d..201f610a1 100644
--- a/data/shaders/instanced_objectref_pass2.frag
+++ b/data/shaders/instanced_objectref_pass2.frag
@@ -15,7 +15,9 @@ void main(void)
 {
 #ifdef GL_ARB_bindless_texture
     vec4 col = texture(handle, uv);
+#ifdef SRGBBindlessFix
     col.xyz = pow(col.xyz, vec3(2.2));
+#endif
 #else
     vec4 col = texture(Albedo, uv);
 #endif
diff --git a/data/shaders/object_pass2.frag b/data/shaders/object_pass2.frag
index f1b2200ad..047f0a192 100644
--- a/data/shaders/object_pass2.frag
+++ b/data/shaders/object_pass2.frag
@@ -13,7 +13,10 @@ vec3 getLightFactor(float specMapValue);
 void main(void)
 {
 #ifdef GL_ARB_bindless_texture
-    vec4 col = pow(texture(Albedo, uv), vec4(2.2));
+    vec4 col = texture(Albedo, uv);
+#ifdef SRGBBindlessFix
+    col.xyz = pow(col.xyz, vec3(2.2));
+#endif
 #else
     vec4 col = texture(Albedo, uv);
 #endif
diff --git a/data/shaders/object_unlit.frag b/data/shaders/object_unlit.frag
index f13fc0812..6f38a27be 100644
--- a/data/shaders/object_unlit.frag
+++ b/data/shaders/object_unlit.frag
@@ -12,7 +12,9 @@ void main(void)
 {
     vec4 col = texture(tex, uv);
 #ifdef GL_ARB_bindless_texture
+#ifdef SRGBBindlessFix
     col.xyz = pow(col.xyz, vec3(2.2));
+#endif
 #endif
     col.xyz *= pow(color.xyz, vec3(2.2));
     if (col.a < 0.5) discard;
diff --git a/data/shaders/objectpass_spheremap.frag b/data/shaders/objectpass_spheremap.frag
index 025151184..8e4e0f4fc 100644
--- a/data/shaders/objectpass_spheremap.frag
+++ b/data/shaders/objectpass_spheremap.frag
@@ -26,7 +26,9 @@ void main() {
     r.y = - r.y;
     vec4 detail0 = texture(tex, r.xy / m + .5);
 #ifdef GL_ARB_bindless_texture
+#ifdef SRGBBindlessFix
     detail0.xyz = pow(detail0.xyz, vec3(2.2));
+#endif
 #endif
     vec3 LightFactor = getLightFactor(1.);
 
diff --git a/data/shaders/objectref_pass2.frag b/data/shaders/objectref_pass2.frag
index 7ee2d3de0..13ff676f8 100644
--- a/data/shaders/objectref_pass2.frag
+++ b/data/shaders/objectref_pass2.frag
@@ -14,7 +14,9 @@ void main(void)
 {
     vec4 col = texture(Albedo, uv);
 #ifdef GL_ARB_bindless_texture
+#ifdef SRGBBindlessFix
     col.xyz = pow(col.xyz, vec3(2.2));
+#endif
 #endif
     col.xyz *= pow(color.xyz, vec3(2.2));
     if (col.a * color.a < 0.5) discard;
diff --git a/data/shaders/splatting.frag b/data/shaders/splatting.frag
index ccb957cd7..d302908d2 100644
--- a/data/shaders/splatting.frag
+++ b/data/shaders/splatting.frag
@@ -33,10 +33,12 @@ void main() {
     vec4 detail3 = texture(tex_detail3, uv);
     vec4 detail4 = vec4(0.0);
 #ifdef GL_ARB_bindless_texture
+#ifdef SRGBBindlessFix
     detail0.xyz = pow(detail0.xyz, vec3(2.2));
     detail1.xyz = pow(detail1.xyz, vec3(2.2));
     detail2.xyz = pow(detail2.xyz, vec3(2.2));
     detail3.xyz = pow(detail3.xyz, vec3(2.2));
+#endif
 #endif
 
     vec4 splatted = splatting.r * detail0 +
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index cef2d2b51..15c674841 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -333,6 +333,8 @@ GLuint LoadShader(const char * file, unsigned type)
         Code += "#define UBO_DISABLED\n";
     if (irr_driver->hasVSLayerExtension())
         Code += "#define VSLayer\n";
+    if (irr_driver->needsRGBBindlessWorkaround())
+        Code += "#define SRGBBindlessFix\n";
     Code += LoadHeader();
     if (Stream.is_open())
     {
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index b40d279d5..3e84a703e 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -470,6 +470,7 @@ void IrrDriver::initDevice()
 
         m_need_ubo_workaround = false;
         m_need_rh_workaround = false;
+        m_need_srgb_workaround = false;
 #ifdef WIN32
         // Fix for Intel Sandy Bridge on Windows which supports GL up to 3.1 only
         if (strstr((const char *)glGetString(GL_VENDOR), "Intel") != NULL && (GLMajorVersion == 3 && GLMinorVersion == 1))
@@ -478,6 +479,10 @@ void IrrDriver::initDevice()
         // Fix for Nvidia and instanced RH
         if (strstr((const char *)glGetString(GL_VENDOR), "NVIDIA") != NULL)
             m_need_rh_workaround = true;
+
+        // Fix for AMD and bindless sRGB textures
+        if (strstr((const char *)glGetString(GL_VENDOR), "AMD") != NULL)
+            m_need_srgb_workaround = true;
     }
     m_glsl = (GLMajorVersion > 3 || (GLMajorVersion == 3 && GLMinorVersion >= 1));
 
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index dec484903..5dceba6c2 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -202,6 +202,7 @@ private:
     bool hasBaseInstance;
     bool m_need_ubo_workaround;
     bool m_need_rh_workaround;
+    bool m_need_srgb_workaround;
     /** The irrlicht device. */
     IrrlichtDevice             *m_device;
     /** Irrlicht scene manager. */
@@ -294,6 +295,11 @@ public:
         return m_need_rh_workaround;
     }
 
+    bool needsRGBBindlessWorkaround() const
+    {
+        return m_need_srgb_workaround;
+    }
+
     bool hasARB_base_instance() const
     {
         return hasBaseInstance;

From ae18730c92e94693be93c3c0b9220cadd528ad14 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Thu, 28 Aug 2014 22:08:56 +0200
Subject: [PATCH 136/248] Use ATI instead of AMD in vendor name.

---
 src/graphics/irr_driver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 3e84a703e..ad1a834c1 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -481,7 +481,7 @@ void IrrDriver::initDevice()
             m_need_rh_workaround = true;
 
         // Fix for AMD and bindless sRGB textures
-        if (strstr((const char *)glGetString(GL_VENDOR), "AMD") != NULL)
+        if (strstr((const char *)glGetString(GL_VENDOR), "ATI") != NULL)
             m_need_srgb_workaround = true;
     }
     m_glsl = (GLMajorVersion > 3 || (GLMajorVersion == 3 && GLMinorVersion >= 1));

From 4ba8e85169bf213c59a17e6c617b284c847154a0 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 29 Aug 2014 07:42:42 +1000
Subject: [PATCH 137/248] Give the race setup screen a background box and added
 a text for difficulty.

---
 data/gui/racesetup.stkgui | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/data/gui/racesetup.stkgui b/data/gui/racesetup.stkgui
index 83a619741..76a21512c 100644
--- a/data/gui/racesetup.stkgui
+++ b/data/gui/racesetup.stkgui
@@ -4,26 +4,30 @@
 
         <header width="80%" text="Race Setup" align="center" text_align="center" />
 
-        <spacer proportion="1" width="25"/>
+        <spacer height="5%" width="25"/>
+        <box width="95%" height="40%" padding="10" layout="vertical-row">
+            <bright width="100%" text="Select a difficulty" align="center" text_align="left" />
 
-        <ribbon id="difficulty" height="135" width="65%" align="center">
-            <icon-button id="novice" width="128" height="128" icon="gui/difficulty_easy.png"
-                    I18N="Difficulty" text="Novice"/>
-            <icon-button id="intermediate" width="128" height="128" icon="gui/difficulty_medium.png"
-                    I18N="Difficulty" text="Intermediate"/>
-            <icon-button id="expert" width="128" height="128" icon="gui/difficulty_hard.png"
-                    I18N="Difficulty"  text="Expert"/>
-            <icon-button id="best" width="128" height="128" icon="gui/difficulty_best.png"
-                    I18N="Difficulty"  text="SuperTux"/>
-        </ribbon>
+            <ribbon id="difficulty" height="135" width="100%" align="center">
+                <icon-button id="novice" width="128" height="128" icon="gui/difficulty_easy.png"
+                        I18N="Difficulty" text="Novice"/>
+                <icon-button id="intermediate" width="128" height="128" icon="gui/difficulty_medium.png"
+                        I18N="Difficulty" text="Intermediate"/>
+                <icon-button id="expert" width="128" height="128" icon="gui/difficulty_hard.png"
+                        I18N="Difficulty"  text="Expert"/>
+                <icon-button id="best" width="128" height="128" icon="gui/difficulty_best.png"
+                        I18N="Difficulty"  text="SuperTux"/>
+            </ribbon>
+        </box>
+        <spacer height="5%"" width="25"/>
 
-        <spacer proportion="1" width="25"/>
+        <box width="95%" height="40%" padding="10" layout="vertical-row">
+            <bright width="100%" text="Select a game mode" align="center" text_align="left" />
 
-        <bright width="100%" text="Select a game mode" align="center" text_align="left" />
-
-        <scrollable_toolbar id="gamemode" height="135" width="85%" label_location="bottom" align="center"
-                            child_width="135" child_height="135" />
-        <spacer proportion="1" width="25" />
+            <scrollable_toolbar id="gamemode" height="135" width="85%" label_location="bottom" align="center"
+                                child_width="135" child_height="135" />
+            <spacer proportion="1" width="25" />
+        </box>
     </div>
 
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>

From 99b110cc9908503094097d902ce6b7bec5989343 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 29 Aug 2014 01:26:27 +0200
Subject: [PATCH 138/248] Use uvec2 instead of sampler2D

---
 data/shaders/instanced_shadow.geom      | 4 ++--
 data/shaders/instanced_shadowref.frag   | 4 ++--
 data/shaders/instanciedgrassshadow.vert | 6 +++---
 data/shaders/instanciedshadow.vert      | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/shaders/instanced_shadow.geom b/data/shaders/instanced_shadow.geom
index 1ecc55a46..a1a851e65 100644
--- a/data/shaders/instanced_shadow.geom
+++ b/data/shaders/instanced_shadow.geom
@@ -2,14 +2,14 @@ layout(triangles) in;
 layout(triangle_strip, max_vertices=3) out;
 
 #ifdef GL_ARB_bindless_texture
-flat in sampler2D hdle[3];
+flat in uvec2 hdle[3];
 #endif
 in vec2 tc[3];
 in int layerId[3];
 
 out vec2 uv;
 #ifdef GL_ARB_bindless_texture
-out flat sampler2D handle;
+out flat uvec2 handle;
 #endif
 
 void main(void)
diff --git a/data/shaders/instanced_shadowref.frag b/data/shaders/instanced_shadowref.frag
index 7ed4ab3ae..0706edb1d 100644
--- a/data/shaders/instanced_shadowref.frag
+++ b/data/shaders/instanced_shadowref.frag
@@ -3,7 +3,7 @@ uniform sampler2D tex;
 #endif
 
 #ifdef GL_ARB_bindless_texture
-flat in sampler2D handle;
+flat in uvec2 handle;
 #endif
 in vec2 uv;
 in vec4 color;
@@ -12,7 +12,7 @@ out vec4 FragColor;
 void main(void)
 {
 #ifdef GL_ARB_bindless_texture
-    vec4 col = texture(handle, uv);
+    vec4 col = texture(sampler2D(handle), uv);
 #else
     vec4 col = texture(tex, uv);
 #endif
diff --git a/data/shaders/instanciedgrassshadow.vert b/data/shaders/instanciedgrassshadow.vert
index 005bb7198..e78f020eb 100644
--- a/data/shaders/instanciedgrassshadow.vert
+++ b/data/shaders/instanciedgrassshadow.vert
@@ -10,7 +10,7 @@ layout(location = 7) in vec3 Origin;
 layout(location = 8) in vec3 Orientation;
 layout(location = 9) in vec3 Scale;
 #ifdef GL_ARB_bindless_texture
-layout(location = 10) in sampler2D Handle;
+layout(location = 10) in uvec2 Handle;
 #endif
 
 #else
@@ -26,13 +26,13 @@ in vec3 Scale;
 #ifdef VSLayer
 out vec2 uv;
 #ifdef GL_ARB_bindless_texture
-flat out sampler2D handle;
+flat out uvec2 handle;
 #endif
 #else
 out vec2 tc;
 out int layerId;
 #ifdef GL_ARB_bindless_texture
-flat out sampler2D hdle;
+flat out uvec2 hdle;
 #endif
 #endif
 
diff --git a/data/shaders/instanciedshadow.vert b/data/shaders/instanciedshadow.vert
index db027af72..20b9d87f1 100644
--- a/data/shaders/instanciedshadow.vert
+++ b/data/shaders/instanciedshadow.vert
@@ -8,7 +8,7 @@ layout(location = 7) in vec3 Origin;
 layout(location = 8) in vec3 Orientation;
 layout(location = 9) in vec3 Scale;
 #ifdef GL_ARB_bindless_texture
-layout(location = 10) in sampler2D Handle;
+layout(location = 10) in uvec2 Handle;
 #endif
 
 #else
@@ -23,13 +23,13 @@ in vec3 Scale;
 #ifdef VSLayer
 out vec2 uv;
 #ifdef GL_ARB_bindless_texture
-flat out sampler2D handle;
+flat out uvec2 handle;
 #endif
 #else
 out vec2 tc;
 out int layerId;
 #ifdef GL_ARB_bindless_texture
-flat out sampler2D hdle;
+flat out uvec2 hdle;
 #endif
 #endif
 

From 50319c7c58c73258c9ff932ae27955bd2a4f9700 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Fri, 29 Aug 2014 21:10:26 +0200
Subject: [PATCH 139/248] Check if user config dir exists

---
 src/io/file_manager.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/io/file_manager.cpp b/src/io/file_manager.cpp
index 29f36d7c2..71e9ab6ee 100644
--- a/src/io/file_manager.cpp
+++ b/src/io/file_manager.cpp
@@ -738,10 +738,10 @@ void FileManager::checkAndCreateConfigDir()
 
         // Try to use the APPDATA directory to store config files and highscore
         // lists. If not defined, used the current directory.
-        if(getenv("APPDATA")!=NULL)
+        if (getenv("APPDATA") != NULL)
         {
             m_user_config_dir  = getenv("APPDATA");
-            if(!checkAndCreateDirectory(m_user_config_dir))
+            if (!checkAndCreateDirectory(m_user_config_dir))
             {
                 Log::error("[FileManager]", "Can't create config dir '%s"
                             ", falling back to '.'.", m_user_config_dir.c_str());
@@ -755,7 +755,7 @@ void FileManager::checkAndCreateConfigDir()
 
 #elif defined(__APPLE__)
 
-        if (getenv("HOME")!=NULL)
+        if (getenv("HOME") != NULL)
         {
             m_user_config_dir = getenv("HOME");
         }
@@ -775,8 +775,10 @@ void FileManager::checkAndCreateConfigDir()
 
         // Remaining unix variants. Use the new standards for config directory
         // i.e. either XDG_CONFIG_HOME or $HOME/.config
-        if (getenv("XDG_CONFIG_HOME")!=NULL){
+        if (getenv("XDG_CONFIG_HOME") !=NULL)
+        {
             m_user_config_dir = getenv("XDG_CONFIG_HOME");
+            checkAndCreateDirectory(m_user_config_dir);
         }
         else if (!getenv("HOME"))
         {
@@ -788,6 +790,8 @@ void FileManager::checkAndCreateConfigDir()
         else
         {
             m_user_config_dir  = getenv("HOME");
+            checkAndCreateDirectory(m_user_config_dir);
+            
             m_user_config_dir += "/.config";
             if(!checkAndCreateDirectory(m_user_config_dir))
             {

From 537d435f7f095fbc33afce06158775bc9d8ce727 Mon Sep 17 00:00:00 2001
From: Vlj <vljn@ovi.com>
Date: Fri, 29 Aug 2014 21:16:31 +0200
Subject: [PATCH 140/248] Add some compile time check

---
 src/graphics/shaders.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index e3898a661..48bef7ad1 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -389,10 +389,12 @@ class TextureRead
 private:
     template<unsigned N, typename...Args>
     void AssignTextureNames_impl(GLuint)
-    {}
+    {
+        static_assert(N == sizeof...(tp), "Wrong number of texture name");
+    }
 
     template<unsigned N, typename...Args>
-    void AssignTextureNames_impl(GLuint Program, GLuint TexUnit, const char *name, Args...args...)
+    void AssignTextureNames_impl(GLuint Program, GLuint TexUnit, const char *name, Args...args)
     {
         GLuint location = glGetUniformLocation(Program, name);
         TextureLocation.push_back(location);

From 5a937d6f12d8deb27942158e035316ac5f101d48 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Fri, 29 Aug 2014 21:50:14 +0200
Subject: [PATCH 141/248] Fixed creating rain class

---
 src/tracks/track.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index c406783c7..9965f4f4d 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -2095,6 +2095,11 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
 
             if (weather_particles.size() > 0)
             {
+                if (weather_particles == "rain.xml")
+                {
+                    m_weather_type = WEATHER_RAIN;
+                }
+
                 m_sky_particles =
                     ParticleKindManager::get()->getParticles(weather_particles);
             }

From 61d70ea599351e6be52f38b1d954a4c16c22d378 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Fri, 29 Aug 2014 21:51:05 +0200
Subject: [PATCH 142/248] Add rain sound

---
 src/graphics/rain.cpp | 14 +++++++++++++-
 src/graphics/rain.hpp |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/graphics/rain.cpp b/src/graphics/rain.cpp
index 3c9a75bd2..f237772ce 100644
--- a/src/graphics/rain.cpp
+++ b/src/graphics/rain.cpp
@@ -48,6 +48,14 @@ Rain::Rain(Camera *camera, irr::scene::ISceneNode* parent) : m_thunder_sound(0)
 
     if (m_lightning)
         m_thunder_sound = sfx_manager->createSoundSource("thunder");
+        
+    m_rain_sound = sfx_manager->createSoundSource("rain");
+
+    if (m_rain_sound) 
+    {
+        m_rain_sound->setLoop(true);
+        m_rain_sound->play();
+    }
 
     Material* m = material_manager->getMaterial("rain.png");
     assert(m != NULL);
@@ -67,7 +75,11 @@ Rain::~Rain()
 //    m_node->drop();      // drop STK's reference
 //    m_node->remove();    // Then remove it from the scene graph.
 
-    if (m_lightning && m_thunder_sound != NULL) sfx_manager->deleteSFX(m_thunder_sound);
+    if (m_lightning && m_thunder_sound != NULL) 
+        sfx_manager->deleteSFX(m_thunder_sound);
+        
+    if (m_rain_sound != NULL) 
+        sfx_manager->deleteSFX(m_rain_sound);
 }
 
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/rain.hpp b/src/graphics/rain.hpp
index b8408c2a8..308a29de6 100644
--- a/src/graphics/rain.hpp
+++ b/src/graphics/rain.hpp
@@ -39,6 +39,7 @@ class Rain
     float m_next_lightning;
     bool m_lightning;
     SFXBase* m_thunder_sound;
+    SFXBase* m_rain_sound;
 
 public:
     Rain(Camera* camera, irr::scene::ISceneNode* parent);

From 1e1ba34f45f44b9880ade6a5540ac3e6a9e66f40 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Thu, 28 Aug 2014 21:32:04 +0200
Subject: [PATCH 143/248] Use a separate update() member

---
 src/graphics/stkanimatedmesh.cpp  | 54 +++++++++++++------------------
 src/graphics/stkanimatedmesh.hpp  |  1 +
 src/graphics/stkmeshscenenode.cpp | 28 +++++++++-------
 src/graphics/stkmeshscenenode.hpp |  1 +
 4 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stkanimatedmesh.cpp
index 6c9cf872c..257e97a49 100644
--- a/src/graphics/stkanimatedmesh.cpp
+++ b/src/graphics/stkanimatedmesh.cpp
@@ -54,21 +54,13 @@ void STKAnimatedMesh::setMesh(scene::IAnimatedMesh* mesh)
     CAnimatedMeshSceneNode::setMesh(mesh);
 }
 
-void STKAnimatedMesh::render()
+void STKAnimatedMesh::update()
 {
     video::IVideoDriver* driver = SceneManager->getVideoDriver();
-
-    bool isTransparentPass =
-        SceneManager->getSceneNodeRenderPass() == scene::ESNRP_TRANSPARENT;
-
-    ++PassCount;
-
     scene::IMesh* m = getMeshForCurrentFrame();
 
     if (m)
-    {
         Box = m->getBoundingBox();
-    }
     else
     {
         Log::error("animated mesh", "Animated Mesh returned no mesh to render.");
@@ -143,33 +135,33 @@ void STKAnimatedMesh::render()
         const video::SMaterial& material = ReadOnlyMaterials ? mb->getMaterial() : Materials[i];
         if (isObject(material.MaterialType))
         {
-            if (irr_driver->getPhase() == SOLID_NORMAL_AND_DEPTH_PASS || irr_driver->getPhase() == TRANSPARENT_PASS)
-            {
-                glBindVertexArray(0);
-                size_t size = mb->getVertexCount() * GLmeshes[i].Stride;
-                if (irr_driver->hasARB_base_instance())
-                    glBindBuffer(GL_ARRAY_BUFFER, VAOManager::getInstance()->getVBO(mb->getVertexType()));
-                else
-                    glBindBuffer(GL_ARRAY_BUFFER, GLmeshes[i].vertex_buffer);
-                GLbitfield bitfield = GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_UNSYNCHRONIZED_BIT;
-                void * buf = glMapBufferRange(GL_ARRAY_BUFFER, GLmeshes[i].vaoBaseVertex * GLmeshes[i].Stride, size, bitfield);
-                memcpy(buf, mb->getVertices(), size);
-                glUnmapBuffer(GL_ARRAY_BUFFER);
-                glBindBuffer(GL_ARRAY_BUFFER, 0);
-            }
+            glBindVertexArray(0);
+            size_t size = mb->getVertexCount() * GLmeshes[i].Stride;
+            if (irr_driver->hasARB_base_instance())
+                glBindBuffer(GL_ARRAY_BUFFER, VAOManager::getInstance()->getVBO(mb->getVertexType()));
+            else
+                glBindBuffer(GL_ARRAY_BUFFER, GLmeshes[i].vertex_buffer);
+            GLbitfield bitfield = GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_UNSYNCHRONIZED_BIT;
+            void * buf = glMapBufferRange(GL_ARRAY_BUFFER, GLmeshes[i].vaoBaseVertex * GLmeshes[i].Stride, size, bitfield);
+            memcpy(buf, mb->getVertices(), size);
+            glUnmapBuffer(GL_ARRAY_BUFFER);
+            glBindBuffer(GL_ARRAY_BUFFER, 0);
         }
         if (mb)
             GLmeshes[i].TextureMatrix = getMaterial(i).getTextureMatrix(0);
-
-        video::IMaterialRenderer* rnd = driver->getMaterialRenderer(Materials[i].MaterialType);
-        bool transparent = (rnd && rnd->isTransparent());
-
-       // only render transparent buffer if this is the transparent render pass
-       // and solid only in solid pass
-       if (transparent != isTransparentPass)
-          continue;
     }
 
+}
+
+void STKAnimatedMesh::render()
+{
+    bool isTransparentPass =
+        SceneManager->getSceneNodeRenderPass() == scene::ESNRP_TRANSPARENT;
+
+    ++PassCount;
+
+    update();
+
     if (irr_driver->getPhase() == SOLID_NORMAL_AND_DEPTH_PASS || irr_driver->getPhase() == SHADOW_PASS)
     {
         ModelViewProjectionMatrix = computeMVP(AbsoluteTransformation);
diff --git a/src/graphics/stkanimatedmesh.hpp b/src/graphics/stkanimatedmesh.hpp
index c5c113da0..333ed0495 100644
--- a/src/graphics/stkanimatedmesh.hpp
+++ b/src/graphics/stkanimatedmesh.hpp
@@ -17,6 +17,7 @@ protected:
     core::matrix4 ModelViewProjectionMatrix;
     void cleanGLMeshes();
 public:
+    void update();
   STKAnimatedMesh(irr::scene::IAnimatedMesh* mesh, irr::scene::ISceneNode* parent,
      irr::scene::ISceneManager* mgr, irr::s32 id,
      const irr::core::vector3df& position = irr::core::vector3df(0,0,0),
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 7d6b6fb78..6e5aad50d 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -183,6 +183,21 @@ void STKMeshSceneNode::updatevbo()
 
 static video::ITexture *spareWhiteTex = 0;
 
+void STKMeshSceneNode::update()
+{
+    Box = Mesh->getBoundingBox();
+
+    setFirstTimeMaterial();
+
+    for (u32 i = 0; i < Mesh->getMeshBufferCount(); ++i)
+    {
+        scene::IMeshBuffer* mb = Mesh->getMeshBuffer(i);
+        if (!mb)
+            continue;
+        GLmeshes[i].TextureMatrix = getMaterial(i).getTextureMatrix(0);
+    }
+}
+
 
 void STKMeshSceneNode::OnRegisterSceneNode()
 {
@@ -201,24 +216,13 @@ void STKMeshSceneNode::render()
 
     ++PassCount;
 
-    Box = Mesh->getBoundingBox();
-
-    setFirstTimeMaterial();
-
-    for (u32 i = 0; i < Mesh->getMeshBufferCount(); ++i)
-    {
-        scene::IMeshBuffer* mb = Mesh->getMeshBuffer(i);
-        if (!mb)
-            continue;
-        GLmeshes[i].TextureMatrix = getMaterial(i).getTextureMatrix(0);
-    }
+    update();
 
     if (irr_driver->getPhase() == SOLID_NORMAL_AND_DEPTH_PASS && immediate_draw)
     {
         core::matrix4 invmodel;
         AbsoluteTransformation.getInverse(invmodel);
 
-
         glDisable(GL_CULL_FACE);
         if (update_each_frame)
             updatevbo();
diff --git a/src/graphics/stkmeshscenenode.hpp b/src/graphics/stkmeshscenenode.hpp
index d9e16283b..21fb62249 100644
--- a/src/graphics/stkmeshscenenode.hpp
+++ b/src/graphics/stkmeshscenenode.hpp
@@ -32,6 +32,7 @@ public:
         const irr::core::vector3df& scale = irr::core::vector3df(1.0f, 1.0f, 1.0f),
         bool createGLMeshes = true);
     virtual void render();
+    void update();
     virtual void setMesh(irr::scene::IMesh* mesh);
     virtual void OnRegisterSceneNode();
     virtual ~STKMeshSceneNode();

From fc80ebbbcb73b04d65cb1aa43aa77a2237625f6a Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Fri, 29 Aug 2014 02:39:55 +0200
Subject: [PATCH 144/248] Use storage buffer for vao manager

---
 src/graphics/glwrap.cpp          | 11 ++++++++++-
 src/graphics/glwrap.hpp          |  2 ++
 src/graphics/irr_driver.cpp      |  7 +++++++
 src/graphics/irr_driver.hpp      |  6 ++++++
 src/graphics/stkanimatedmesh.cpp | 31 ++++++++++++++++++++++---------
 5 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 15c674841..dabd4a83c 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -645,7 +645,16 @@ void VAOManager::regenerateBuffer(enum VTXTYPE tp)
         glDeleteBuffers(1, &vbo[tp]);
     glGenBuffers(1, &vbo[tp]);
     glBindBuffer(GL_ARRAY_BUFFER, vbo[tp]);
-    glBufferData(GL_ARRAY_BUFFER, vtx_cnt[tp] * getVertexPitch(tp), vtx_mirror[tp], GL_DYNAMIC_DRAW);
+#ifdef Buffer_Storage
+    if (irr_driver->hasBufferStorageExtension())
+    {
+        glBufferStorage(GL_ARRAY_BUFFER, vtx_cnt[tp] * getVertexPitch(tp), vtx_mirror[tp], GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT);
+        VBOPtr[tp] = glMapBufferRange(GL_ARRAY_BUFFER, 0, vtx_cnt[tp] * getVertexPitch(tp), GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT);
+    }
+    else
+#endif
+        glBufferData(GL_ARRAY_BUFFER, vtx_cnt[tp] * getVertexPitch(tp), vtx_mirror[tp], GL_DYNAMIC_DRAW);
+
 
     if (ibo[tp])
         glDeleteBuffers(1, &ibo[tp]);
diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index 62f192864..d973321d3 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -183,6 +183,7 @@ class VAOManager : public Singleton<VAOManager>
     GLuint vbo[VTXTYPE_COUNT], ibo[VTXTYPE_COUNT], vao[VTXTYPE_COUNT];
     GLuint instance_vbo[1];
     size_t instance_count[1];
+    void *VBOPtr[VTXTYPE_COUNT];
     std::vector<scene::IMeshBuffer *> storedCPUBuffer[VTXTYPE_COUNT];
     void *vtx_mirror[VTXTYPE_COUNT], *idx_mirror[VTXTYPE_COUNT];
     size_t vtx_cnt[VTXTYPE_COUNT], idx_cnt[VTXTYPE_COUNT];
@@ -201,6 +202,7 @@ public:
     std::pair<unsigned, unsigned> getBase(scene::IMeshBuffer *);
     size_t appendInstance(enum InstanceType, const std::vector<InstanceData> &instance_data);
     unsigned getVBO(video::E_VERTEX_TYPE type) { return vbo[getVTXTYPE(type)]; }
+    void *getVBOPtr(video::E_VERTEX_TYPE type) { return VBOPtr[getVTXTYPE(type)]; }
     unsigned getVAO(video::E_VERTEX_TYPE type) { return vao[getVTXTYPE(type)]; }
     unsigned getInstanceVAO(video::E_VERTEX_TYPE vt, enum InstanceType it) { return InstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(vt, it)]; }
     unsigned getShadowInstanceVAO(video::E_VERTEX_TYPE vt, enum InstanceType it) { return ShadowInstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(vt, it)]; }
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index ad1a834c1..b20cc1cc0 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -489,6 +489,7 @@ void IrrDriver::initDevice()
     // Parse extensions
     hasVSLayer = false;
     hasBaseInstance = false;
+    hasBuffserStorage = false;
     // Default false value for hasVSLayer if --no-graphics argument is used
     if (!ProfileWorld::isNoGraphics())
     {
@@ -496,6 +497,12 @@ void IrrDriver::initDevice()
             hasVSLayer = true;
             Log::info("GLDriver", "AMD Vertex Shader Layer enabled");
         }
+#ifdef Buffer_Storage
+        if (hasGLExtension("GL_ARB_buffer_storage")) {
+            hasBuffserStorage = true;
+            Log::info("GLDriver", "ARB Buffer Storage enabled");
+        }
+#endif
 #ifdef Base_Instance_Support
         if (hasGLExtension("GL_ARB_base_instance")) {
             hasBaseInstance = true;
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 5dceba6c2..76a6e86e7 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -200,6 +200,7 @@ private:
     int GLMajorVersion, GLMinorVersion;
     bool hasVSLayer;
     bool hasBaseInstance;
+    bool hasBuffserStorage;
     bool m_need_ubo_workaround;
     bool m_need_rh_workaround;
     bool m_need_srgb_workaround;
@@ -310,6 +311,11 @@ public:
         return hasVSLayer;
     }
 
+    bool hasBufferStorageExtension() const
+    {
+        return hasBuffserStorage;
+    }
+
     video::SColorf getAmbientLight() const;
 
     struct GlowData {
diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stkanimatedmesh.cpp
index 257e97a49..ba5d15c17 100644
--- a/src/graphics/stkanimatedmesh.cpp
+++ b/src/graphics/stkanimatedmesh.cpp
@@ -135,17 +135,30 @@ void STKAnimatedMesh::update()
         const video::SMaterial& material = ReadOnlyMaterials ? mb->getMaterial() : Materials[i];
         if (isObject(material.MaterialType))
         {
-            glBindVertexArray(0);
-            size_t size = mb->getVertexCount() * GLmeshes[i].Stride;
-            if (irr_driver->hasARB_base_instance())
-                glBindBuffer(GL_ARRAY_BUFFER, VAOManager::getInstance()->getVBO(mb->getVertexType()));
+
+            size_t size = mb->getVertexCount() * GLmeshes[i].Stride, offset = GLmeshes[i].vaoBaseVertex * GLmeshes[i].Stride;
+            void *buf;
+            if (irr_driver->hasBufferStorageExtension())
+            {
+                buf = VAOManager::getInstance()->getVBOPtr(mb->getVertexType());
+                buf = (char *)buf + offset;
+            }
             else
-                glBindBuffer(GL_ARRAY_BUFFER, GLmeshes[i].vertex_buffer);
-            GLbitfield bitfield = GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_UNSYNCHRONIZED_BIT;
-            void * buf = glMapBufferRange(GL_ARRAY_BUFFER, GLmeshes[i].vaoBaseVertex * GLmeshes[i].Stride, size, bitfield);
+            {
+                glBindVertexArray(0);
+                if (irr_driver->hasARB_base_instance())
+                    glBindBuffer(GL_ARRAY_BUFFER, VAOManager::getInstance()->getVBO(mb->getVertexType()));
+                else
+                    glBindBuffer(GL_ARRAY_BUFFER, GLmeshes[i].vertex_buffer);
+                GLbitfield bitfield = GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_UNSYNCHRONIZED_BIT;
+                buf = glMapBufferRange(GL_ARRAY_BUFFER, offset, size, bitfield);
+            }
             memcpy(buf, mb->getVertices(), size);
-            glUnmapBuffer(GL_ARRAY_BUFFER);
-            glBindBuffer(GL_ARRAY_BUFFER, 0);
+            if (!irr_driver->hasBufferStorageExtension())
+            {
+                glUnmapBuffer(GL_ARRAY_BUFFER);
+                glBindBuffer(GL_ARRAY_BUFFER, 0);
+            }
         }
         if (mb)
             GLmeshes[i].TextureMatrix = getMaterial(i).getTextureMatrix(0);

From af4575f6db5f8835b0370d89f2e2f130e48acd2a Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Sat, 30 Aug 2014 01:03:01 +0200
Subject: [PATCH 145/248] Fix crash on nvidia linux

---
 src/graphics/stkanimatedmesh.cpp  | 12 +-----------
 src/graphics/stkmeshscenenode.cpp | 11 -----------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stkanimatedmesh.cpp
index ba5d15c17..04d3128bd 100644
--- a/src/graphics/stkanimatedmesh.cpp
+++ b/src/graphics/stkanimatedmesh.cpp
@@ -113,17 +113,7 @@ void STKAnimatedMesh::update()
             {
                 fillLocalBuffer(mesh, mb);
                 mesh.vao = createVAO(mesh.vertex_buffer, mesh.index_buffer, mb->getVertexType());
-                glGenBuffers(1, &(mesh.instance_buffer));
-                glBindBuffer(GL_ARRAY_BUFFER, mesh.instance_buffer);
-                glEnableVertexAttribArray(7);
-                glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
-                glVertexAttribDivisor(7, 1);
-                glEnableVertexAttribArray(8);
-                glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(3 * sizeof(float)));
-                glVertexAttribDivisor(8, 1);
-                glEnableVertexAttribArray(9);
-                glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
-                glVertexAttribDivisor(9, 1);
+                glBindVertexArray(0);
             }
         }
     }
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 6e5aad50d..139efb912 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -94,17 +94,6 @@ void STKMeshSceneNode::setFirstTimeMaterial()
       {
           fillLocalBuffer(mesh, mb);
           mesh.vao = createVAO(mesh.vertex_buffer, mesh.index_buffer, mb->getVertexType());
-          glGenBuffers(1, &(mesh.instance_buffer));
-          glBindBuffer(GL_ARRAY_BUFFER, mesh.instance_buffer);
-          glEnableVertexAttribArray(7);
-          glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
-          glVertexAttribDivisor(7, 1);
-          glEnableVertexAttribArray(8);
-          glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(3 * sizeof(float)));
-          glVertexAttribDivisor(8, 1);
-          glEnableVertexAttribArray(9);
-          glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
-          glVertexAttribDivisor(9, 1);
           glBindVertexArray(0);
       }
   }

From 90396678b7b032317560b406f0a1a81f2a246baf Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Fri, 29 Aug 2014 20:28:19 -0400
Subject: [PATCH 146/248] Separate lightshaft from sun

---
 src/graphics/irr_driver.cpp      |  4 ++--
 src/graphics/post_processing.cpp |  8 ++++++--
 src/tracks/track.cpp             | 14 +++++++++++++-
 src/tracks/track.hpp             |  8 ++++++++
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index b20cc1cc0..3bc9c5b97 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -2437,8 +2437,8 @@ scene::ISceneNode *IrrDriver::addLight(const core::vector3df &pos, float energy,
 
         if (sun)
         {
-            m_sun_interposer->setPosition(pos);
-            m_sun_interposer->updateAbsolutePosition();
+            //m_sun_interposer->setPosition(pos);
+            //m_sun_interposer->updateAbsolutePosition();
 
             m_lensflare->setPosition(pos);
             m_lensflare->updateAbsolutePosition();
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 14e39eaf3..b5b081b61 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -610,6 +610,8 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
 
         if (isRace && UserConfigParams::m_light_shaft && m_sunpixels > 30 && hasgodrays)
         {
+            Track* track = World::getWorld()->getTrack();
+
             glEnable(GL_DEPTH_TEST);
             // Grab the sky
             out_fbo->Bind();
@@ -617,12 +619,14 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
             irr_driver->renderSkybox(camnode);
 
             // Set the sun's color
-            const SColor col = World::getWorld()->getTrack()->getSunColor();
+            const SColor col = track->getGodRaysColor();
             ColorizeProvider * const colcb = (ColorizeProvider *)irr_driver->getCallback(ES_COLORIZE);
             colcb->setColor(col.getRed() / 255.0f, col.getGreen() / 255.0f, col.getBlue() / 255.0f);
 
             // The sun interposer
             STKMeshSceneNode *sun = irr_driver->getSunInterposer();
+            sun->setPosition(track->getGodRaysPosition());
+            sun->updateAbsolutePosition();
             irr_driver->getSceneManager()->drawAll(ESNRP_CAMERA);
             irr_driver->setPhase(GLOW_PASS);
             sun->render();
@@ -637,7 +641,7 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
             renderGaussian3Blur(irr_driver->getFBO(FBO_QUARTER1), irr_driver->getFBO(FBO_QUARTER2));
 
             // Calculate the sun's position in texcoords
-            const core::vector3df pos = sun->getPosition();
+            const core::vector3df pos = track->getGodRaysPosition();
             float ndc[4];
             core::matrix4 trans = camnode->getProjectionMatrix();
             trans *= camnode->getViewMatrix();
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 9965f4f4d..e352999ae 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -132,6 +132,8 @@ Track::Track(const std::string &filename)
     m_sky_particles         = NULL;
     m_sky_dx                = 0.05f;
     m_sky_dy                = 0.0f;
+    m_godrays_energy        = 1.0f;
+    m_godrays_color         = video::SColor(255, 255, 255, 255);
     m_weather_type          = WEATHER_NONE;
     m_cache_track           = UserConfigParams::m_cache_overworld &&
                               m_ident=="overworld";
@@ -439,6 +441,9 @@ void Track::loadTrackInfo()
     m_fog_height_end        = 100.0f;
     m_gravity               = 9.80665f;
     m_smooth_normals        = false;
+    m_godrays               = false;
+    m_godrays_energy        = 1.0f;
+    m_godrays_color         = video::SColor(255, 255, 255, 255);
                               /* ARGB */
     m_fog_color             = video::SColor(255, 77, 179, 230);
     m_default_ambient_color = video::SColor(255, 120, 120, 120);
@@ -481,7 +486,6 @@ void Track::loadTrackInfo()
     root->get("bloom-threshold",       &m_bloom_threshold);
     root->get("lens-flare",            &m_lensflare);
     root->get("shadows",               &m_shadows);
-    root->get("god-rays",              &m_godrays);
     root->get("displacement-speed",    &m_displacement_speed);
     root->get("caustics-speed",        &m_caustics_speed);
     root->get("color-level-in",        &m_color_inlevel);
@@ -1724,6 +1728,14 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
         node->get("fog-end-height",   &m_fog_height_end);
     }
 
+    if (const XMLNode *node = root->getNode("lightshaft"))
+    {
+        m_godrays = true;
+        node->get("energy", &m_godrays_energy);
+        node->get("color", &m_godrays_color);
+        node->get("xyz", &m_godrays_position);
+    }
+
     loadMainTrack(*root);
     unsigned int main_track_count = m_all_nodes.size();
 
diff --git a/src/tracks/track.hpp b/src/tracks/track.hpp
index f3249be23..b4396cc35 100644
--- a/src/tracks/track.hpp
+++ b/src/tracks/track.hpp
@@ -383,7 +383,12 @@ private:
     float m_bloom_threshold;
 
     bool m_lensflare;
+
     bool m_godrays;
+    core::vector3df m_godrays_position;
+    float m_godrays_energy;
+    video::SColor m_godrays_color;
+
     bool m_shadows;
 
     float m_displacement_speed;
@@ -613,6 +618,9 @@ public:
 
     bool hasLensFlare() const { return m_lensflare; }
     bool hasGodRays() const { return m_godrays; }
+    core::vector3df getGodRaysPosition() const { return m_godrays_position; }
+    float getGodRaysOpacity() const { return m_godrays_energy; }
+    video::SColor getGodRaysColor() const { return m_godrays_color; }
     bool hasShadows() const { return m_shadows; }
 
     void addNode(scene::ISceneNode* node) { m_all_nodes.push_back(node); }

From a8c5ab43d3dc3a002383bc5761700acb282179d7 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Fri, 29 Aug 2014 21:09:12 -0400
Subject: [PATCH 147/248] Rename variable + bugfix

---
 src/graphics/post_processing.cpp | 2 +-
 src/tracks/track.cpp             | 6 +++---
 src/tracks/track.hpp             | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index b5b081b61..fc0e99044 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -608,7 +608,7 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
         if (World::getWorld() != NULL)
             hasgodrays = World::getWorld()->getTrack()->hasGodRays();
 
-        if (isRace && UserConfigParams::m_light_shaft && m_sunpixels > 30 && hasgodrays)
+        if (isRace && UserConfigParams::m_light_shaft && hasgodrays)
         {
             Track* track = World::getWorld()->getTrack();
 
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index e352999ae..16064b4d5 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -132,7 +132,7 @@ Track::Track(const std::string &filename)
     m_sky_particles         = NULL;
     m_sky_dx                = 0.05f;
     m_sky_dy                = 0.0f;
-    m_godrays_energy        = 1.0f;
+    m_godrays_opacity       = 1.0f;
     m_godrays_color         = video::SColor(255, 255, 255, 255);
     m_weather_type          = WEATHER_NONE;
     m_cache_track           = UserConfigParams::m_cache_overworld &&
@@ -442,7 +442,7 @@ void Track::loadTrackInfo()
     m_gravity               = 9.80665f;
     m_smooth_normals        = false;
     m_godrays               = false;
-    m_godrays_energy        = 1.0f;
+    m_godrays_opacity       = 1.0f;
     m_godrays_color         = video::SColor(255, 255, 255, 255);
                               /* ARGB */
     m_fog_color             = video::SColor(255, 77, 179, 230);
@@ -1731,7 +1731,7 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
     if (const XMLNode *node = root->getNode("lightshaft"))
     {
         m_godrays = true;
-        node->get("energy", &m_godrays_energy);
+        node->get("opacity", &m_godrays_opacity);
         node->get("color", &m_godrays_color);
         node->get("xyz", &m_godrays_position);
     }
diff --git a/src/tracks/track.hpp b/src/tracks/track.hpp
index b4396cc35..a39e0810e 100644
--- a/src/tracks/track.hpp
+++ b/src/tracks/track.hpp
@@ -386,7 +386,7 @@ private:
 
     bool m_godrays;
     core::vector3df m_godrays_position;
-    float m_godrays_energy;
+    float m_godrays_opacity;
     video::SColor m_godrays_color;
 
     bool m_shadows;
@@ -619,7 +619,7 @@ public:
     bool hasLensFlare() const { return m_lensflare; }
     bool hasGodRays() const { return m_godrays; }
     core::vector3df getGodRaysPosition() const { return m_godrays_position; }
-    float getGodRaysOpacity() const { return m_godrays_energy; }
+    float getGodRaysOpacity() const { return m_godrays_opacity; }
     video::SColor getGodRaysColor() const { return m_godrays_color; }
     bool hasShadows() const { return m_shadows; }
 

From e791ca82f18f44c990e5c765a892cbfde2bba236 Mon Sep 17 00:00:00 2001
From: Christian Kakesa <christian.kakesa@gmail.com>
Date: Sat, 30 Aug 2014 12:16:42 +0200
Subject: [PATCH 148/248] Add libxrandr-dev in Ubuntu dependencies command
 example.

---
 INSTALL.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL.md b/INSTALL.md
index 9e1a4f976..47ce60feb 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -23,7 +23,7 @@ Ubuntu command:
 
 ```
 sudo apt-get install autoconf automake build-essential cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev \
-libgl1-mesa-dev libglu1-mesa-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev
+libgl1-mesa-dev libglu1-mesa-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev libxrandr-dev
 ```
   
 Unpack the files from the tarball like this:

From d8f61e336e2da94add5e3491ed4331aebb5baf4e Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sat, 30 Aug 2014 18:08:23 +0200
Subject: [PATCH 149/248] Move creating rain to world class because now it
 doesn't depend on cameras.

---
 src/graphics/camera.cpp | 16 ---------
 src/graphics/camera.hpp |  5 ---
 src/graphics/rain.cpp   | 74 ++++++++---------------------------------
 src/graphics/rain.hpp   | 19 +----------
 src/modes/world.cpp     | 16 ++++++++-
 src/modes/world.hpp     |  5 +++
 6 files changed, 34 insertions(+), 101 deletions(-)

diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp
index 547add4f9..9648c0372 100644
--- a/src/graphics/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -24,7 +24,6 @@
 #include "audio/music_manager.hpp"
 #include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
-#include "graphics/rain.hpp"
 #include "io/xml_node.hpp"
 #include "karts/abstract_kart.hpp"
 #include "karts/explosion_animation.hpp"
@@ -52,7 +51,6 @@ Camera::Camera(int camera_index, AbstractKart* kart) : m_kart(NULL)
 {
     m_mode          = CM_NORMAL;
     m_index         = camera_index;
-    m_rain          = NULL;
     m_original_kart = kart;
     m_camera        = irr_driver->addCameraSceneNode();
 
@@ -92,7 +90,6 @@ Camera::Camera(int camera_index, AbstractKart* kart) : m_kart(NULL)
  */
 Camera::~Camera()
 {
-    if(m_rain) delete m_rain;
     irr_driver->removeCameraSceneNode(m_camera);
 
     if (s_active_camera == this)
@@ -222,13 +219,6 @@ void Camera::setupCamera()
     m_camera->setFOV(m_fov);
     m_camera->setAspectRatio(m_aspect);
     m_camera->setFarValue(World::getWorld()->getTrack()->getCameraFar());
-
-    if (UserConfigParams::m_weather_effects &&
-        World::getWorld()->getTrack()->getWeatherType() == WEATHER_RAIN)
-    {
-        m_rain = new Rain(this, NULL);
-    }
-
 }   // setupCamera
 
 // ----------------------------------------------------------------------------
@@ -530,12 +520,6 @@ void Camera::update(float dt)
         getCameraSettings(&above_kart, &cam_angle, &side_way, &distance, &smoothing);
         positionCamera(dt, above_kart, cam_angle, side_way, distance, smoothing);
     }
-
-    if (UserConfigParams::m_graphical_effects && m_rain)
-    {
-        m_rain->setPosition( getCameraSceneNode()->getPosition() );
-        m_rain->update(dt);
-    }  // UserConfigParams::m_graphical_effects
 }   // update
 
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/camera.hpp b/src/graphics/camera.hpp
index 7cf5b15a9..db5937a89 100644
--- a/src/graphics/camera.hpp
+++ b/src/graphics/camera.hpp
@@ -41,7 +41,6 @@ namespace irr
 using namespace irr;
 
 class AbstractKart;
-class Rain;
 
 /**
   * \brief Handles the game camera
@@ -120,10 +119,6 @@ private:
     /** List of all cameras. */
     static std::vector<Camera*> m_all_cameras;
 
-    /** Used to show rain graphical effects. */
-    Rain *m_rain;
-
-
     /** A class that stores information about the different end cameras
      *  which can be specified in the scene.xml file. */
     class EndCameraInformation
diff --git a/src/graphics/rain.cpp b/src/graphics/rain.cpp
index f237772ce..490ee420e 100644
--- a/src/graphics/rain.cpp
+++ b/src/graphics/rain.cpp
@@ -18,37 +18,17 @@
 
 #include "audio/sfx_base.hpp"
 #include "audio/sfx_manager.hpp"
-#include "graphics/camera.hpp"
-#include "graphics/glwrap.hpp"
-#include "graphics/gpuparticles.hpp"
-#include "graphics/irr_driver.hpp"
-#include "graphics/material_manager.hpp"
-#include "graphics/material.hpp"
-#include "graphics/per_camera_node.hpp"
 #include "graphics/rain.hpp"
-#include "graphics/shaders.hpp"
 #include "modes/world.hpp"
 #include "states_screens/race_gui.hpp"
-#include "utils/constants.hpp"
 #include "utils/random_generator.hpp"
 
 
-#include <ISceneManager.h>
-#include <SMeshBuffer.h>
-
-using namespace video;
-using namespace scene;
-using namespace core;
-
 // The rain manager
 
-Rain::Rain(Camera *camera, irr::scene::ISceneNode* parent) : m_thunder_sound(0)
+Rain::Rain()
 {
-    m_lightning = camera->getIndex()==0;
-
-    if (m_lightning)
-        m_thunder_sound = sfx_manager->createSoundSource("thunder");
-        
+    m_thunder_sound = sfx_manager->createSoundSource("thunder");        
     m_rain_sound = sfx_manager->createSoundSource("rain");
 
     if (m_rain_sound) 
@@ -57,25 +37,15 @@ Rain::Rain(Camera *camera, irr::scene::ISceneNode* parent) : m_thunder_sound(0)
         m_rain_sound->play();
     }
 
-    Material* m = material_manager->getMaterial("rain.png");
-    assert(m != NULL);
-
     RandomGenerator g;
     m_next_lightning = (float)g.get(35);
-
-//    RainNode *node = new RainNode(irr_driver->getSceneManager(), m->getTexture());
-//    m_node = irr_driver->addPerCameraNode(node, camera->getCameraSceneNode(), parent);
-//    m_node->setAutomaticCulling(0);
 }   // Rain
 
 // ----------------------------------------------------------------------------
 
 Rain::~Rain()
 {
-//    m_node->drop();      // drop STK's reference
-//    m_node->remove();    // Then remove it from the scene graph.
-
-    if (m_lightning && m_thunder_sound != NULL) 
+    if (m_thunder_sound != NULL) 
         sfx_manager->deleteSFX(m_thunder_sound);
         
     if (m_rain_sound != NULL) 
@@ -86,36 +56,18 @@ Rain::~Rain()
 
 void Rain::update(float dt)
 {
-    if (m_lightning)
+    m_next_lightning -= dt;
+
+    if (m_next_lightning < 0.0f)
     {
-        m_next_lightning -= dt;
-
-        if (m_next_lightning < 0.0f)
+        RaceGUIBase* gui_base = World::getWorld()->getRaceGUI();
+        if (gui_base != NULL)
         {
-            RaceGUIBase* gui_base = World::getWorld()->getRaceGUI();
-            if (gui_base != NULL)
-            {
-                gui_base->doLightning();
-                if (m_thunder_sound) m_thunder_sound->play();
-            }
-
-            RandomGenerator g;
-            m_next_lightning = 35 + (float)g.get(35);
+            gui_base->doLightning();
+            if (m_thunder_sound) m_thunder_sound->play();
         }
+
+        RandomGenerator g;
+        m_next_lightning = 35 + (float)g.get(35);
     }
-
 }   // update
-
-// ----------------------------------------------------------------------------
-
-void Rain::setPosition(const core::vector3df& position)
-{
-//    m_node->getChild()->setPosition(position);
-}   // setPosition
-
-// ----------------------------------------------------------------------------
-
-void Rain::setCamera(scene::ICameraSceneNode* camera)
-{
-//    m_node->setCamera(camera);
-}
diff --git a/src/graphics/rain.hpp b/src/graphics/rain.hpp
index 308a29de6..0c38d2bb2 100644
--- a/src/graphics/rain.hpp
+++ b/src/graphics/rain.hpp
@@ -19,36 +19,19 @@
 #ifndef HEADER_RAIN_HPP
 #define HEADER_RAIN_HPP
 
-class Camera;
-class PerCameraNode;
-
-#include <vector3d.h>
-namespace irr
-{
-    namespace video { class SMaterial; class ITexture; }
-    namespace scene { class ICameraSceneNode; class ISceneNode; }
-}
-using namespace irr;
-
 class SFXBase;
 
 class Rain
 {
-    PerCameraNode* m_node;
-
     float m_next_lightning;
-    bool m_lightning;
     SFXBase* m_thunder_sound;
     SFXBase* m_rain_sound;
 
 public:
-    Rain(Camera* camera, irr::scene::ISceneNode* parent);
+    Rain();
     virtual ~Rain();
 
     void update(float dt);
-    void setPosition(const irr::core::vector3df& position);
-
-    void setCamera(scene::ICameraSceneNode* camera);
 };
 
 #endif
diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index 0b201c490..8546b3151 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -121,6 +121,7 @@ World::World() : WorldStatus(), m_clear_color(255,100,101,140)
     m_self_destruct      = false;
     m_schedule_tutorial  = false;
     m_is_network_world   = false;
+    m_rain               = NULL;
 
     m_stop_music_when_dialog_open = true;
 
@@ -195,6 +196,12 @@ void World::init()
         ReplayPlay::get()->Load();
 
     powerup_manager->updateWeightsForRace(num_karts);
+    
+    if (UserConfigParams::m_weather_effects && 
+        m_track->getWeatherType() == WEATHER_RAIN)
+    {
+        m_rain = new Rain();
+    }
 }   // init
 
 //-----------------------------------------------------------------------------
@@ -262,7 +269,6 @@ void World::reset()
 
     //Reset the Rubber Ball Collect Time to some negative value.
     powerup_manager->setBallCollectTime(-100);
-
 }   // reset
 
 //-----------------------------------------------------------------------------
@@ -376,6 +382,9 @@ World::~World()
         // gui and this must be deleted.
         delete m_race_gui;
     }
+    
+    if (m_rain != NULL)
+        delete m_rain;
 
     for ( unsigned int i = 0 ; i < m_karts.size() ; i++ )
         delete m_karts[i];
@@ -925,6 +934,11 @@ void World::update(float dt)
     {
         Camera::getCamera(i)->update(dt);
     }
+    
+    if (UserConfigParams::m_graphical_effects && m_rain)
+    {
+        m_rain->update(dt);
+    }
 
     projectile_manager->update(dt);
 
diff --git a/src/modes/world.hpp b/src/modes/world.hpp
index 462258477..2ffdfad38 100644
--- a/src/modes/world.hpp
+++ b/src/modes/world.hpp
@@ -28,6 +28,7 @@
 #include <vector>
 #include <stdexcept>
 
+#include "graphics/rain.hpp"
 #include "modes/world_status.hpp"
 #include "race/highscores.hpp"
 #include "states_screens/race_gui_base.hpp"
@@ -161,6 +162,10 @@ protected:
 
     /** Set when the world is online and counts network players. */
     bool m_is_network_world;
+    
+    /** Used to show rain graphical effects. */
+    Rain* m_rain;
+
 
     virtual void  onGo();
     /** Returns true if the race is over. Must be defined by all modes. */

From 507d9566a009150ddbe5f343a102264d333615b9 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sat, 30 Aug 2014 18:23:59 +0200
Subject: [PATCH 150/248] Don't start rain sound too early

---
 src/graphics/rain.cpp      | 17 +++++++++++------
 src/graphics/rain.hpp      |  1 +
 src/modes/world.hpp        |  3 +++
 src/modes/world_status.cpp |  7 +++++++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/graphics/rain.cpp b/src/graphics/rain.cpp
index 490ee420e..a5fd7a2f8 100644
--- a/src/graphics/rain.cpp
+++ b/src/graphics/rain.cpp
@@ -31,12 +31,6 @@ Rain::Rain()
     m_thunder_sound = sfx_manager->createSoundSource("thunder");        
     m_rain_sound = sfx_manager->createSoundSource("rain");
 
-    if (m_rain_sound) 
-    {
-        m_rain_sound->setLoop(true);
-        m_rain_sound->play();
-    }
-
     RandomGenerator g;
     m_next_lightning = (float)g.get(35);
 }   // Rain
@@ -71,3 +65,14 @@ void Rain::update(float dt)
         m_next_lightning = 35 + (float)g.get(35);
     }
 }   // update
+
+// ----------------------------------------------------------------------------
+
+void Rain::playSound()
+{
+     if (m_rain_sound) 
+    {
+        m_rain_sound->setLoop(true);
+        m_rain_sound->play();
+    }   
+}
diff --git a/src/graphics/rain.hpp b/src/graphics/rain.hpp
index 0c38d2bb2..437af9b6d 100644
--- a/src/graphics/rain.hpp
+++ b/src/graphics/rain.hpp
@@ -32,6 +32,7 @@ public:
     virtual ~Rain();
 
     void update(float dt);
+    void playSound();
 };
 
 #endif
diff --git a/src/modes/world.hpp b/src/modes/world.hpp
index 2ffdfad38..ee2dc9077 100644
--- a/src/modes/world.hpp
+++ b/src/modes/world.hpp
@@ -348,6 +348,9 @@ public:
     void setNetworkWorld(bool is_networked) { m_is_network_world = is_networked; }
 
     bool isNetworkWorld() const { return m_is_network_world; }
+    
+    /** Returns a pointer to the rain. */
+    Rain* getRain() {return m_rain;}
 };   // World
 
 #endif
diff --git a/src/modes/world_status.cpp b/src/modes/world_status.cpp
index 29775834e..27ca3a451 100644
--- a/src/modes/world_status.cpp
+++ b/src/modes/world_status.cpp
@@ -130,10 +130,17 @@ void WorldStatus::update(const float dt)
         case SETUP_PHASE:
             m_auxiliary_timer = 0.0f;
             m_phase = TRACK_INTRO_PHASE;
+            
             if (m_play_racestart_sounds)
             {
                 m_track_intro_sound->play();
             }
+
+            if (World::getWorld()->getRain() != NULL)
+            {
+                 World::getWorld()->getRain()->playSound();
+            }
+
             return;
         case TRACK_INTRO_PHASE:
             m_auxiliary_timer += dt;

From 47b46558f2a57cb74ad0df7da3c2dad5c56425a4 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sat, 30 Aug 2014 18:34:44 +0200
Subject: [PATCH 151/248] A bit better formatting in world status

---
 src/modes/world_status.cpp | 111 +++++++++++++++++++++++++------------
 1 file changed, 77 insertions(+), 34 deletions(-)

diff --git a/src/modes/world_status.cpp b/src/modes/world_status.cpp
index 27ca3a451..1bbee9b31 100644
--- a/src/modes/world_status.cpp
+++ b/src/modes/world_status.cpp
@@ -44,7 +44,9 @@ WorldStatus::WorldStatus()
     m_play_racestart_sounds = true;
 
     IrrlichtDevice *device = irr_driver->getDevice();
-    if (device->getTimer()->isStopped()) device->getTimer()->start();
+
+    if (device->getTimer()->isStopped())
+        device->getTimer()->start();
 }   // WorldStatus
 
 //-----------------------------------------------------------------------------
@@ -56,13 +58,15 @@ void WorldStatus::reset()
     m_auxiliary_timer = 0.0f;
     // Using SETUP_PHASE will play the track into sfx first, and has no
     // other side effects.
-    m_phase          = UserConfigParams::m_race_now ? RACE_PHASE : SETUP_PHASE;
+    m_phase           = UserConfigParams::m_race_now ? RACE_PHASE : SETUP_PHASE;
     m_previous_phase  = UNDEFINED_PHASE;
     // Just in case that the game is reset during the intro phase
     m_track_intro_sound->stop();
 
     IrrlichtDevice *device = irr_driver->getDevice();
-    if (device->getTimer()->isStopped()) device->getTimer()->start();
+
+    if (device->getTimer()->isStopped()) 
+        device->getTimer()->start();
 }   // reset
 
 //-----------------------------------------------------------------------------
@@ -74,7 +78,9 @@ WorldStatus::~WorldStatus()
     sfx_manager->deleteSFX(m_start_sound);
     sfx_manager->deleteSFX(m_track_intro_sound);
     IrrlichtDevice *device = irr_driver->getDevice();
-    if (device->getTimer()->isStopped())  device->getTimer()->start();
+
+    if (device->getTimer()->isStopped())  
+        device->getTimer()->start();
 }   // ~WorldStatus
 
 //-----------------------------------------------------------------------------
@@ -96,14 +102,12 @@ void WorldStatus::setClockMode(const ClockType mode, const float initial_time)
 void WorldStatus::enterRaceOverState()
 {
     // Don't enter race over if it's already race over
-    if(    m_phase == DELAY_FINISH_PHASE
-        || m_phase == RESULT_DISPLAY_PHASE
-        || m_phase == FINISH_PHASE          )
+    if (m_phase == DELAY_FINISH_PHASE || m_phase == RESULT_DISPLAY_PHASE ||
+        m_phase == FINISH_PHASE)
         return;
 
     m_phase = DELAY_FINISH_PHASE;
     m_auxiliary_timer = 0.0f;
-
 }   // enterRaceOverState
 
 //-----------------------------------------------------------------------------
@@ -120,7 +124,7 @@ void WorldStatus::terminateRace()
  */
 void WorldStatus::update(const float dt)
 {
-    switch(m_phase)
+    switch (m_phase)
     {
         // Note: setup phase must be a separate phase, since the race_manager
         // checks the phase when updating the camera: in the very first time
@@ -148,7 +152,9 @@ void WorldStatus::update(const float dt)
             if (UserConfigParams::m_artist_debug_mode &&
                 race_manager->getNumberOfKarts() == 1 &&
                 race_manager->getTrackName() != "tutorial")
+            {
                 m_auxiliary_timer += dt * 6;
+            }
 
             // Work around a bug that occurred on linux once:
             // the sfx_manager kept on reporting that it is playing,
@@ -156,61 +162,86 @@ void WorldStatus::update(const float dt)
             // ... phase. Since the sound effect is about 3 seconds
             // long, we use the aux timer to force the next phase
             // after 3.5 seconds.
-            if(m_track_intro_sound->getStatus()==SFXManager::SFX_PLAYING
-                && m_auxiliary_timer<3.5f)
+            if (m_track_intro_sound->getStatus() == SFXManager::SFX_PLAYING &&
+                m_auxiliary_timer < 3.5f)
                 return;
+
             // Wait before ready phase if sounds are disabled
-            if(!UserConfigParams::m_sfx && m_auxiliary_timer<3.0f)
+            if (!UserConfigParams::m_sfx && m_auxiliary_timer < 3.0f)
                 return;
+
             m_auxiliary_timer = 0.0f;
-            if (m_play_racestart_sounds) m_prestart_sound->play();
+
+            if (m_play_racestart_sounds) 
+                m_prestart_sound->play();
+
             m_phase = READY_PHASE;
-            for(unsigned int i=0; i<World::getWorld()->getNumKarts(); i++)
+            
+            for (unsigned int i = 0; i < World::getWorld()->getNumKarts(); i++)
+            {
                 World::getWorld()->getKart(i)->startEngineSFX();
+            }
 
             break;
         case READY_PHASE:
-            if(m_auxiliary_timer>1.0)
+            if (m_auxiliary_timer > 1.0)
             {
-                if (m_play_racestart_sounds) m_prestart_sound->play();
-                m_phase=SET_PHASE;
+                if (m_play_racestart_sounds)
+                {
+                    m_prestart_sound->play();
+                }
+
+                m_phase = SET_PHASE;
             }
+
             m_auxiliary_timer += dt;
 
             // In artist debug mode, when without opponents, skip the ready/set/go counter faster
             if (UserConfigParams::m_artist_debug_mode &&
                 race_manager->getNumberOfKarts() == 1 &&
                 race_manager->getTrackName() != "tutorial")
+            {
                 m_auxiliary_timer += dt*6;
+            }
+
             return;
-        case SET_PHASE  :
-            if(m_auxiliary_timer>2.0)
+        case SET_PHASE:
+            if (m_auxiliary_timer > 2.0)
             {
                 // set phase is over, go to the next one
-                m_phase=GO_PHASE;
-                if (m_play_racestart_sounds) m_start_sound->play();
+                m_phase = GO_PHASE;
+                if (m_play_racestart_sounds)
+                {
+                    m_start_sound->play();
+                }
 
                 World::getWorld()->getTrack()->startMusic();
 
                 // event
                 onGo();
             }
+
             m_auxiliary_timer += dt;
 
             // In artist debug mode, when without opponents, skip the ready/set/go counter faster
             if (UserConfigParams::m_artist_debug_mode &&
                 race_manager->getNumberOfKarts() == 1  &&
                 race_manager->getTrackName() != "tutorial")
+            {
                 m_auxiliary_timer += dt*6;
+            }
+
             return;
         case GO_PHASE  :
 
             if (m_auxiliary_timer>2.5f && music_manager->getCurrentMusic())
-                music_manager->startMusic(music_manager->getCurrentMusic());
-
-            if(m_auxiliary_timer>3.0f)    // how long to display the 'go' message
             {
-                m_phase=MUSIC_PHASE;
+                music_manager->startMusic(music_manager->getCurrentMusic());
+            }
+
+            if (m_auxiliary_timer > 3.0f)    // how long to display the 'go' message
+            {
+                m_phase = MUSIC_PHASE;
             }
 
             m_auxiliary_timer += dt;
@@ -219,31 +250,38 @@ void WorldStatus::update(const float dt)
             if (UserConfigParams::m_artist_debug_mode &&
                 race_manager->getNumberOfKarts() == 1  &&
                 race_manager->getTrackName() != "tutorial")
+            {
                 m_auxiliary_timer += dt*6;
+            }
+
             break;
         case MUSIC_PHASE:
             // how long to display the 'music' message
-            if(m_auxiliary_timer>stk_config->m_music_credit_time)
-                m_phase=RACE_PHASE;
+            if (m_auxiliary_timer>stk_config->m_music_credit_time)
+            {
+                m_phase = RACE_PHASE;
+            }
+
             m_auxiliary_timer += dt;
             break;
         case RACE_PHASE:
             // Nothing to do for race phase, switch to delay finish phase
             // happens when
             break;
-        case DELAY_FINISH_PHASE :
+        case DELAY_FINISH_PHASE:
         {
             m_auxiliary_timer += dt;
 
             // Change to next phase if delay is over
-            if(m_auxiliary_timer > stk_config->m_delay_finish_time)
+            if (m_auxiliary_timer > stk_config->m_delay_finish_time)
             {
                 m_phase = RESULT_DISPLAY_PHASE;
                 terminateRace();
             }
+
             break;
         }
-        case RESULT_DISPLAY_PHASE :
+        case RESULT_DISPLAY_PHASE:
         {
             break;
         }
@@ -256,7 +294,7 @@ void WorldStatus::update(const float dt)
         default: break;
     }
 
-    switch(m_clock_mode)
+    switch (m_clock_mode)
     {
         case CLOCK_CHRONO:
             m_time += dt;
@@ -297,11 +335,14 @@ void WorldStatus::setTime(const float time)
  */
 void WorldStatus::pause(Phase phase)
 {
-    assert(m_previous_phase==UNDEFINED_PHASE);
+    assert(m_previous_phase == UNDEFINED_PHASE);
+
     m_previous_phase = m_phase;
     m_phase          = phase;
     IrrlichtDevice *device = irr_driver->getDevice();
-    if (!device->getTimer()->isStopped())  device->getTimer()->stop();
+
+    if (!device->getTimer()->isStopped())  
+        device->getTimer()->stop();
 }   // pause
 
 //-----------------------------------------------------------------------------
@@ -314,5 +355,7 @@ void WorldStatus::unpause()
     // in pause to detect incorrect pause/unpause sequences.
     m_previous_phase = UNDEFINED_PHASE;
     IrrlichtDevice *device = irr_driver->getDevice();
-    if (device->getTimer()->isStopped()) device->getTimer()->start();
+
+    if (device->getTimer()->isStopped()) 
+        device->getTimer()->start();
 }   // unpause

From 5c1b24b4e4028bc6433550b99f61f202600a7abc Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Sun, 31 Aug 2014 01:18:54 +0200
Subject: [PATCH 152/248] Factorise a common interface to
 stkmeshscenenode/animatedmesh

---
 src/graphics/stkanimatedmesh.hpp  |  4 ++--
 src/graphics/stkmesh.hpp          | 12 ++++++++++++
 src/graphics/stkmeshscenenode.cpp | 20 ++++++++++----------
 src/graphics/stkmeshscenenode.hpp |  7 +++----
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/graphics/stkanimatedmesh.hpp b/src/graphics/stkanimatedmesh.hpp
index 333ed0495..0ca233ac3 100644
--- a/src/graphics/stkanimatedmesh.hpp
+++ b/src/graphics/stkanimatedmesh.hpp
@@ -7,7 +7,7 @@
 #include "graphics/stkmesh.hpp"
 #include "utils/ptr_vector.hpp"
 
-class STKAnimatedMesh : public irr::scene::CAnimatedMeshSceneNode
+class STKAnimatedMesh : public irr::scene::CAnimatedMeshSceneNode, public STKMeshCommon
 {
 protected:
     bool firstTime;
@@ -17,7 +17,7 @@ protected:
     core::matrix4 ModelViewProjectionMatrix;
     void cleanGLMeshes();
 public:
-    void update();
+    virtual void update();
   STKAnimatedMesh(irr::scene::IAnimatedMesh* mesh, irr::scene::ISceneNode* parent,
      irr::scene::ISceneManager* mgr, irr::s32 id,
      const irr::core::vector3df& position = irr::core::vector3df(0,0,0),
diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stkmesh.hpp
index 5df7f83ab..d5d57c596 100644
--- a/src/graphics/stkmesh.hpp
+++ b/src/graphics/stkmesh.hpp
@@ -60,6 +60,18 @@ bool isObject(video::E_MATERIAL_TYPE type);
 
 core::vector3df getWind();
 
+
+class STKMeshCommon
+{
+protected:
+    PtrVector<GLMesh, REF> MeshSolidMaterial[MAT_COUNT];
+    PtrVector<GLMesh, REF> TransparentMesh[TM_COUNT];
+public:
+    virtual void update() = 0;
+    virtual bool isImmediateDraw() const { return false; }
+};
+
+
 template<typename T, typename... Args>
 class MeshList : public Singleton<T>, public std::vector<STK::Tuple<Args...> >
 {};
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 139efb912..3d1ce92f0 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -80,7 +80,7 @@ void STKMeshSceneNode::setFirstTimeMaterial()
           if (!immediate_draw)
           {
               InitTextures(mesh, MatType);
-              MeshSolidMaterials[MatType].push_back(&mesh);
+              MeshSolidMaterial[MatType].push_back(&mesh);
           }
       }
 
@@ -125,7 +125,7 @@ void STKMeshSceneNode::cleanGLMeshes()
     }
     GLmeshes.clear();
     for (unsigned i = 0; i < MAT_COUNT; i++)
-        MeshSolidMaterials[i].clearWithoutDeleting();
+        MeshSolidMaterial[i].clearWithoutDeleting();
 }
 
 void STKMeshSceneNode::setMesh(irr::scene::IMesh* mesh)
@@ -241,29 +241,29 @@ void STKMeshSceneNode::render()
         AbsoluteTransformation.getInverse(invmodel);
 
         GLMesh* mesh;
-        for_in(mesh, MeshSolidMaterials[MAT_DEFAULT])
+        for_in(mesh, MeshSolidMaterial[MAT_DEFAULT])
             pushVector(ListMatDefault::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
 
-        for_in(mesh, MeshSolidMaterials[MAT_ALPHA_REF])
+        for_in(mesh, MeshSolidMaterial[MAT_ALPHA_REF])
             pushVector(ListMatAlphaRef::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
 
-        for_in(mesh, MeshSolidMaterials[MAT_SPHEREMAP])
+        for_in(mesh, MeshSolidMaterial[MAT_SPHEREMAP])
             pushVector(ListMatSphereMap::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
 
-        for_in(mesh, MeshSolidMaterials[MAT_DETAIL])
+        for_in(mesh, MeshSolidMaterial[MAT_DETAIL])
             pushVector(ListMatDetails::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
 
         windDir = getWind();
-        for_in(mesh, MeshSolidMaterials[MAT_GRASS])
+        for_in(mesh, MeshSolidMaterial[MAT_GRASS])
             pushVector(ListMatGrass::getInstance(), mesh, AbsoluteTransformation, invmodel, windDir);
 
-        for_in(mesh, MeshSolidMaterials[MAT_UNLIT])
+        for_in(mesh, MeshSolidMaterial[MAT_UNLIT])
             pushVector(ListMatUnlit::getInstance(), mesh, AbsoluteTransformation, core::matrix4::EM4CONST_IDENTITY, mesh->TextureMatrix);
 
-        for_in(mesh, MeshSolidMaterials[MAT_SPLATTING])
+        for_in(mesh, MeshSolidMaterial[MAT_SPLATTING])
             pushVector(ListMatSplatting::getInstance(), mesh, AbsoluteTransformation, invmodel);
 
-        for_in(mesh, MeshSolidMaterials[MAT_NORMAL_MAP])
+        for_in(mesh, MeshSolidMaterial[MAT_NORMAL_MAP])
             pushVector(ListMatNormalMap::getInstance(), mesh, AbsoluteTransformation, invmodel, core::matrix4::EM4CONST_IDENTITY);
 
         return;
diff --git a/src/graphics/stkmeshscenenode.hpp b/src/graphics/stkmeshscenenode.hpp
index 21fb62249..90f12007b 100644
--- a/src/graphics/stkmeshscenenode.hpp
+++ b/src/graphics/stkmeshscenenode.hpp
@@ -4,11 +4,9 @@
 #include "stkmesh.hpp"
 #include "utils/ptr_vector.hpp"
 
-class STKMeshSceneNode : public irr::scene::CMeshSceneNode
+class STKMeshSceneNode : public irr::scene::CMeshSceneNode, public STKMeshCommon
 {
 protected:
-    PtrVector<GLMesh, REF> MeshSolidMaterials[MAT_COUNT];
-    PtrVector<GLMesh, REF> TransparentMesh[TM_COUNT];
     std::vector<GLMesh> GLmeshes;
     core::matrix4 ModelViewProjectionMatrix;
     core::vector3df windDir;
@@ -25,6 +23,7 @@ protected:
     bool update_each_frame;
     bool isDisplacement;
 public:
+    virtual void update();
     void setReloadEachFrame(bool);
     STKMeshSceneNode(irr::scene::IMesh* mesh, ISceneNode* parent, irr::scene::ISceneManager* mgr, irr::s32 id,
         const irr::core::vector3df& position = irr::core::vector3df(0, 0, 0),
@@ -32,10 +31,10 @@ public:
         const irr::core::vector3df& scale = irr::core::vector3df(1.0f, 1.0f, 1.0f),
         bool createGLMeshes = true);
     virtual void render();
-    void update();
     virtual void setMesh(irr::scene::IMesh* mesh);
     virtual void OnRegisterSceneNode();
     virtual ~STKMeshSceneNode();
+    virtual bool isImmediateDraw() const { return immediate_draw; }
     void setIsDisplacement(bool v) {
         isDisplacement = v;
         for (u32 i = 0; i < Mesh->getMeshBufferCount(); ++i)

From fd1f2537d4ed5170a2699a675992f041e995db1c Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sat, 30 Aug 2014 21:24:16 -0400
Subject: [PATCH 153/248] Modify LOD node to use cleaner technique

---
 src/graphics/lod_node.cpp | 33 +++++++++++++--------------------
 src/graphics/lod_node.hpp |  2 ++
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/graphics/lod_node.cpp b/src/graphics/lod_node.cpp
index dcf165d70..27f1f3e97 100644
--- a/src/graphics/lod_node.cpp
+++ b/src/graphics/lod_node.cpp
@@ -137,19 +137,24 @@ void LODNode::OnAnimate(u32 timeMs)
     }
 }
 
-void LODNode::OnRegisterSceneNode()
+void LODNode::updateVisibility(bool* shown)
 {
     if (!isVisible()) return;
     if (m_nodes.size() == 0) return;
 
-    bool shown = false;
     int level = getLevel();
-    if (level>=0)
+    for (int i = 0; i < m_nodes.size(); i++)
     {
-        m_nodes[level]->updateAbsolutePosition();
-        m_nodes[level]->OnRegisterSceneNode();
-        shown = true;
+        m_nodes[i]->setVisible(i == level);
+        if (i == level && shown != NULL)
+            *shown = level;
     }
+}
+
+void LODNode::OnRegisterSceneNode()
+{
+    bool shown;
+    updateVisibility(&shown);
 
     const u32 now = irr_driver->getDevice()->getTimer()->getTime();
 
@@ -158,6 +163,7 @@ void LODNode::OnRegisterSceneNode()
                                 m_nodes[0]->getType() == scene::ESNT_ANIMATED_MESH) &&
         now > m_last_tick)
     {
+        int level = getLevel();
         if (m_previous_visibility == WAS_HIDDEN && shown)
         {
             scene::IMesh* mesh;
@@ -254,20 +260,7 @@ void LODNode::OnRegisterSceneNode()
     m_previous_visibility = (shown ? WAS_SHOWN : WAS_HIDDEN);
     m_last_tick = now;
 
-    // If this node has children other than the LOD nodes, draw them
-    core::list<ISceneNode*>::Iterator it;
-
-    for (it = Children.begin(); it != Children.end(); it++)
-    {
-        if (m_nodes_set.find(*it) == m_nodes_set.end())
-        {
-            assert(*it != NULL);
-            if ((*it)->isVisible())
-            {
-                (*it)->OnRegisterSceneNode();
-            }
-        }
-    }
+    scene::ISceneNode::OnRegisterSceneNode();
 }
 
 void LODNode::add(int level, scene::ISceneNode* node, bool reparent)
diff --git a/src/graphics/lod_node.hpp b/src/graphics/lod_node.hpp
index 3cca1bc28..8c349eb67 100644
--- a/src/graphics/lod_node.hpp
+++ b/src/graphics/lod_node.hpp
@@ -83,6 +83,8 @@ public:
 
     int getLevel();
 
+    void updateVisibility(bool* shown = NULL);
+
     /*
     //! Returns a reference to the current relative transformation matrix.
     //! This is the matrix, this scene node uses instead of scale, translation

From 76b4f929df08b39e759e1b8c5b2654f2db6faa63 Mon Sep 17 00:00:00 2001
From: Marc Coll Carrillo <marcoll@ya.com>
Date: Sun, 31 Aug 2014 17:54:40 +0200
Subject: [PATCH 154/248] Reset the scroll offset when clearing a dynamic
 ribbon widget

---
 src/guiengine/widgets/dynamic_ribbon_widget.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/guiengine/widgets/dynamic_ribbon_widget.cpp b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
index 0a3040068..c1d2c12d2 100644
--- a/src/guiengine/widgets/dynamic_ribbon_widget.cpp
+++ b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
@@ -491,6 +491,7 @@ void DynamicRibbonWidget::clearItems()
 {
     m_items.clear();
     m_animated_contents = false;
+    m_scroll_offset = 0;
 }
 // -----------------------------------------------------------------------------
 void DynamicRibbonWidget::elementRemoved()

From 7d0dec5c49c3cb459f59c0040edc1d1fbb988685 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 1 Sep 2014 19:57:32 +0200
Subject: [PATCH 155/248] Handle lightning and sound in weather property

---
 src/graphics/rain.cpp | 55 +++++++++++++++++++++++++++++--------------
 src/graphics/rain.hpp |  6 +++--
 src/modes/world.cpp   |  6 ++---
 src/tracks/track.cpp  | 25 ++++----------------
 src/tracks/track.hpp  | 13 ++++------
 5 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/src/graphics/rain.cpp b/src/graphics/rain.cpp
index a5fd7a2f8..19951312d 100644
--- a/src/graphics/rain.cpp
+++ b/src/graphics/rain.cpp
@@ -26,10 +26,21 @@
 
 // The rain manager
 
-Rain::Rain()
+Rain::Rain(bool lightning, std::string sound)
 {
-    m_thunder_sound = sfx_manager->createSoundSource("thunder");        
-    m_rain_sound = sfx_manager->createSoundSource("rain");
+    m_lightning = lightning;
+    m_thunder_sound = NULL;
+    m_weather_sound = NULL;
+    
+    if (m_lightning)
+    {
+        m_thunder_sound = sfx_manager->createSoundSource("thunder");        
+    }
+
+    if (sound != "")
+    {
+        m_weather_sound = sfx_manager->createSoundSource(sound);
+    }
 
     RandomGenerator g;
     m_next_lightning = (float)g.get(35);
@@ -42,27 +53,35 @@ Rain::~Rain()
     if (m_thunder_sound != NULL) 
         sfx_manager->deleteSFX(m_thunder_sound);
         
-    if (m_rain_sound != NULL) 
-        sfx_manager->deleteSFX(m_rain_sound);
+    if (m_weather_sound != NULL) 
+        sfx_manager->deleteSFX(m_weather_sound);
 }
 
 // ----------------------------------------------------------------------------
 
 void Rain::update(float dt)
 {
-    m_next_lightning -= dt;
-
-    if (m_next_lightning < 0.0f)
+    if (m_lightning)
     {
-        RaceGUIBase* gui_base = World::getWorld()->getRaceGUI();
-        if (gui_base != NULL)
+        m_next_lightning -= dt;
+    
+        if (m_next_lightning < 0.0f)
         {
-            gui_base->doLightning();
-            if (m_thunder_sound) m_thunder_sound->play();
-        }
+            RaceGUIBase* gui_base = World::getWorld()->getRaceGUI();
 
-        RandomGenerator g;
-        m_next_lightning = 35 + (float)g.get(35);
+            if (gui_base != NULL)
+            {
+                gui_base->doLightning();
+
+                if (m_thunder_sound) 
+                {
+                    m_thunder_sound->play();
+                }
+            }
+    
+            RandomGenerator g;
+            m_next_lightning = 35 + (float)g.get(35);
+        }
     }
 }   // update
 
@@ -70,9 +89,9 @@ void Rain::update(float dt)
 
 void Rain::playSound()
 {
-     if (m_rain_sound) 
+    if (m_weather_sound) 
     {
-        m_rain_sound->setLoop(true);
-        m_rain_sound->play();
+        m_weather_sound->setLoop(true);
+        m_weather_sound->play();
     }   
 }
diff --git a/src/graphics/rain.hpp b/src/graphics/rain.hpp
index 437af9b6d..cd874fa52 100644
--- a/src/graphics/rain.hpp
+++ b/src/graphics/rain.hpp
@@ -23,12 +23,14 @@ class SFXBase;
 
 class Rain
 {
+    bool m_lightning;
     float m_next_lightning;
+
     SFXBase* m_thunder_sound;
-    SFXBase* m_rain_sound;
+    SFXBase* m_weather_sound;
 
 public:
-    Rain();
+    Rain(bool lightning, std::string sound);
     virtual ~Rain();
 
     void update(float dt);
diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index 8546b3151..e9d579f48 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -197,10 +197,10 @@ void World::init()
 
     powerup_manager->updateWeightsForRace(num_karts);
     
-    if (UserConfigParams::m_weather_effects && 
-        m_track->getWeatherType() == WEATHER_RAIN)
+    if (UserConfigParams::m_weather_effects)
     {
-        m_rain = new Rain();
+        m_rain = new Rain(m_track->getWeatherLightning(), 
+                          m_track->getWeatherSound());
     }
 }   // init
 
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 16064b4d5..9c4ecdf9a 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -134,7 +134,8 @@ Track::Track(const std::string &filename)
     m_sky_dy                = 0.0f;
     m_godrays_opacity       = 1.0f;
     m_godrays_color         = video::SColor(255, 255, 255, 255);
-    m_weather_type          = WEATHER_NONE;
+    m_weather_lightning      = false;
+    m_weather_sound         = "";
     m_cache_track           = UserConfigParams::m_cache_overworld &&
                               m_ident=="overworld";
     m_minimap_x_scale       = 1.0f;
@@ -2101,32 +2102,16 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
         else if (name == "weather")
         {
             std::string weather_particles;
-            std::string weather_type;
+
             node->get("particles", &weather_particles);
-            node->get("type", &weather_type);
+            node->get("lightning", &m_weather_lightning);
+            node->get("sound", &m_weather_sound);
 
             if (weather_particles.size() > 0)
             {
-                if (weather_particles == "rain.xml")
-                {
-                    m_weather_type = WEATHER_RAIN;
-                }
-
                 m_sky_particles =
                     ParticleKindManager::get()->getParticles(weather_particles);
             }
-            else if (weather_type.size() > 0)
-            {
-                if (weather_type == "rain")
-                {
-                    m_weather_type = WEATHER_RAIN;
-                }
-                else
-                {
-                    Log::error("track", "Unknown weather type : '%s'",
-                               weather_type.c_str());
-                }
-            }
             else
             {
                 Log::error("track", "Bad weather node found - ignored.\n");
diff --git a/src/tracks/track.hpp b/src/tracks/track.hpp
index a39e0810e..8a31e1fbb 100644
--- a/src/tracks/track.hpp
+++ b/src/tracks/track.hpp
@@ -62,12 +62,6 @@ class XMLNode;
 
 const int HEIGHT_MAP_RESOLUTION = 256;
 
-enum WeatherType
-{
-    WEATHER_NONE,
-    WEATHER_RAIN
-};
-
 struct OverworldForceField
 {
     core::vector3df m_position;
@@ -310,7 +304,8 @@ private:
     ParticleKind*            m_sky_particles;
 
     /** Use a special built-in wheather */
-    WeatherType              m_weather_type;
+    bool                     m_weather_lightning;
+    std::string              m_weather_sound;
 
     /** A simple class to keep information about a track mode. */
     class TrackMode
@@ -566,7 +561,9 @@ public:
     unsigned int getNumberOfStartPositions() const
                                           { return m_start_transforms.size(); }
     // ------------------------------------------------------------------------
-    WeatherType   getWeatherType          () const { return m_weather_type; }
+    bool getWeatherLightning() {return m_weather_lightning;}
+    // ------------------------------------------------------------------------
+    std::string getWeatherSound() {return m_weather_sound;}
     // ------------------------------------------------------------------------
     ParticleKind* getSkyParticles         () { return m_sky_particles; }
     // ------------------------------------------------------------------------

From 57240124baf80c783a57ce831e4bff94f9f865cf Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 1 Sep 2014 20:17:38 +0200
Subject: [PATCH 156/248] Rename rain class to weather

---
 src/graphics/{rain.cpp => weather.cpp} | 14 +++++++-------
 src/graphics/{rain.hpp => weather.hpp} | 10 +++++-----
 src/modes/world.cpp                    | 12 ++++++------
 src/modes/world.hpp                    | 10 +++++-----
 src/modes/world_status.cpp             |  4 ++--
 5 files changed, 25 insertions(+), 25 deletions(-)
 rename src/graphics/{rain.cpp => weather.cpp} (92%)
 rename src/graphics/{rain.hpp => weather.hpp} (88%)

diff --git a/src/graphics/rain.cpp b/src/graphics/weather.cpp
similarity index 92%
rename from src/graphics/rain.cpp
rename to src/graphics/weather.cpp
index 19951312d..2f62e4f06 100644
--- a/src/graphics/rain.cpp
+++ b/src/graphics/weather.cpp
@@ -18,15 +18,15 @@
 
 #include "audio/sfx_base.hpp"
 #include "audio/sfx_manager.hpp"
-#include "graphics/rain.hpp"
+#include "graphics/weather.hpp"
 #include "modes/world.hpp"
 #include "states_screens/race_gui.hpp"
 #include "utils/random_generator.hpp"
 
 
-// The rain manager
+// The weather manager
 
-Rain::Rain(bool lightning, std::string sound)
+Weather::Weather(bool lightning, std::string sound)
 {
     m_lightning = lightning;
     m_thunder_sound = NULL;
@@ -44,11 +44,11 @@ Rain::Rain(bool lightning, std::string sound)
 
     RandomGenerator g;
     m_next_lightning = (float)g.get(35);
-}   // Rain
+}   // Weather
 
 // ----------------------------------------------------------------------------
 
-Rain::~Rain()
+Weather::~Weather()
 {
     if (m_thunder_sound != NULL) 
         sfx_manager->deleteSFX(m_thunder_sound);
@@ -59,7 +59,7 @@ Rain::~Rain()
 
 // ----------------------------------------------------------------------------
 
-void Rain::update(float dt)
+void Weather::update(float dt)
 {
     if (m_lightning)
     {
@@ -87,7 +87,7 @@ void Rain::update(float dt)
 
 // ----------------------------------------------------------------------------
 
-void Rain::playSound()
+void Weather::playSound()
 {
     if (m_weather_sound) 
     {
diff --git a/src/graphics/rain.hpp b/src/graphics/weather.hpp
similarity index 88%
rename from src/graphics/rain.hpp
rename to src/graphics/weather.hpp
index cd874fa52..d6fb1b135 100644
--- a/src/graphics/rain.hpp
+++ b/src/graphics/weather.hpp
@@ -16,12 +16,12 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_RAIN_HPP
-#define HEADER_RAIN_HPP
+#ifndef HEADER_WEATHER_HPP
+#define HEADER_WEATHER_HPP
 
 class SFXBase;
 
-class Rain
+class Weather
 {
     bool m_lightning;
     float m_next_lightning;
@@ -30,8 +30,8 @@ class Rain
     SFXBase* m_weather_sound;
 
 public:
-    Rain(bool lightning, std::string sound);
-    virtual ~Rain();
+    Weather(bool lightning, std::string sound);
+    virtual ~Weather();
 
     void update(float dt);
     void playSound();
diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index e9d579f48..8f9214593 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -121,7 +121,7 @@ World::World() : WorldStatus(), m_clear_color(255,100,101,140)
     m_self_destruct      = false;
     m_schedule_tutorial  = false;
     m_is_network_world   = false;
-    m_rain               = NULL;
+    m_weather            = NULL;
 
     m_stop_music_when_dialog_open = true;
 
@@ -199,7 +199,7 @@ void World::init()
     
     if (UserConfigParams::m_weather_effects)
     {
-        m_rain = new Rain(m_track->getWeatherLightning(), 
+        m_weather = new Weather(m_track->getWeatherLightning(), 
                           m_track->getWeatherSound());
     }
 }   // init
@@ -383,8 +383,8 @@ World::~World()
         delete m_race_gui;
     }
     
-    if (m_rain != NULL)
-        delete m_rain;
+    if (m_weather != NULL)
+        delete m_weather;
 
     for ( unsigned int i = 0 ; i < m_karts.size() ; i++ )
         delete m_karts[i];
@@ -935,9 +935,9 @@ void World::update(float dt)
         Camera::getCamera(i)->update(dt);
     }
     
-    if (UserConfigParams::m_graphical_effects && m_rain)
+    if (UserConfigParams::m_graphical_effects && m_weather)
     {
-        m_rain->update(dt);
+        m_weather->update(dt);
     }
 
     projectile_manager->update(dt);
diff --git a/src/modes/world.hpp b/src/modes/world.hpp
index ee2dc9077..2c26c3268 100644
--- a/src/modes/world.hpp
+++ b/src/modes/world.hpp
@@ -28,7 +28,7 @@
 #include <vector>
 #include <stdexcept>
 
-#include "graphics/rain.hpp"
+#include "graphics/weather.hpp"
 #include "modes/world_status.hpp"
 #include "race/highscores.hpp"
 #include "states_screens/race_gui_base.hpp"
@@ -163,8 +163,8 @@ protected:
     /** Set when the world is online and counts network players. */
     bool m_is_network_world;
     
-    /** Used to show rain graphical effects. */
-    Rain* m_rain;
+    /** Used to show weather graphical effects. */
+    Weather* m_weather;
 
 
     virtual void  onGo();
@@ -349,8 +349,8 @@ public:
 
     bool isNetworkWorld() const { return m_is_network_world; }
     
-    /** Returns a pointer to the rain. */
-    Rain* getRain() {return m_rain;}
+    /** Returns a pointer to the weather. */
+    Weather* getWeather() {return m_weather;}
 };   // World
 
 #endif
diff --git a/src/modes/world_status.cpp b/src/modes/world_status.cpp
index 1bbee9b31..c7a841f89 100644
--- a/src/modes/world_status.cpp
+++ b/src/modes/world_status.cpp
@@ -140,9 +140,9 @@ void WorldStatus::update(const float dt)
                 m_track_intro_sound->play();
             }
 
-            if (World::getWorld()->getRain() != NULL)
+            if (World::getWorld()->getWeather() != NULL)
             {
-                 World::getWorld()->getRain()->playSound();
+                 World::getWorld()->getWeather()->playSound();
             }
 
             return;

From 0b0cf09dd639c26ef87070b01b98ff87bd149f4b Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 2 Sep 2014 01:08:08 +0200
Subject: [PATCH 157/248] Try to fix build

---
 src/graphics/render_geometry.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index a46f59331..77122a46a 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -210,6 +210,8 @@ void renderInstancedMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vec
 }
 
 static GLsync m_sync;
+
+#ifdef Multi_Draw_Indirect
 template<typename Shader, MeshMaterial Mat, video::E_VERTEX_TYPE VT, typename...Args>
 void multidraw1stPass(Args...args)
 {
@@ -224,6 +226,7 @@ void multidraw1stPass(Args...args)
             sizeof(DrawElementsIndirectCommand));
     }
 }
+#endif
 
 
 void IrrDriver::renderSolidFirstPass()
@@ -442,6 +445,7 @@ void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vec
     }
 }
 
+#ifdef Multi_Draw_Indirect
 template<typename Shader, MeshMaterial Mat, video::E_VERTEX_TYPE VT, typename...Args>
 void multidraw2ndPass(const std::vector<uint64_t> &Handles, Args... args)
 {
@@ -457,6 +461,7 @@ void multidraw2ndPass(const std::vector<uint64_t> &Handles, Args... args)
             sizeof(DrawElementsIndirectCommand));
     }
 }
+#endif
 
 
 void IrrDriver::renderSolidSecondPass()
@@ -910,6 +915,8 @@ void renderInstancedShadow(const std::vector<GLuint> TextureUnits, unsigned casc
     }
 }
 
+
+#ifdef Multi_Draw_Indirect
 template<typename Shader, MeshMaterial Mat, video::E_VERTEX_TYPE VT, typename...Args>
 static void multidrawShadow(unsigned i, Args ...args)
 {
@@ -921,6 +928,7 @@ static void multidrawShadow(unsigned i, Args ...args)
         glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)(ShadowPassCmd::getInstance()->Offset[i][Mat] * sizeof(DrawElementsIndirectCommand)), ShadowPassCmd::getInstance()->Size[i][Mat], sizeof(DrawElementsIndirectCommand));
     }
 }
+#endif
 
 void IrrDriver::renderShadows()
 {

From 480d281f528c5999c641fcf813f15e48e696e45f Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 2 Sep 2014 01:19:34 +0200
Subject: [PATCH 158/248] Fix crash reported when using plunger.

---
 src/graphics/stkmeshscenenode.cpp | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 3d1ce92f0..047552b8a 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -289,7 +289,35 @@ void STKMeshSceneNode::render()
                 GLenum itype = mesh.IndexType;
                 size_t count = mesh.IndexCount;
 
-                MeshShader::ObjectPass2Shader::getInstance()->SetTextureUnits(std::vector<GLuint>{ getTextureGLuint(spareWhiteTex) });
+                if (UserConfigParams::m_azdo)
+                {
+#ifdef Bindless_Texture_Support
+                    GLuint DiffuseHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_DIFFUSE), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[0]);
+                    if (!glIsTextureHandleResidentARB(DiffuseHandle))
+                        glMakeTextureHandleResidentARB(DiffuseHandle);
+
+                    GLuint SpecularHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_SPECULAR), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[1]);
+                    if (!glIsTextureHandleResidentARB(SpecularHandle))
+                        glMakeTextureHandleResidentARB(SpecularHandle);
+
+                    GLuint SSAOHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_HALF1_R), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[2]);
+                    if (!glIsTextureHandleResidentARB(SSAOHandle))
+                        glMakeTextureHandleResidentARB(SSAOHandle);
+
+                    if (!mesh.TextureHandles[0])
+                        mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(spareWhiteTex), MeshShader::TransparentFogShader::getInstance()->SamplersId[0]);
+                    if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
+                        glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
+                    MeshShader::ObjectPass2Shader::getInstance()->SetTextureHandles(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, mesh.TextureHandles[0]));
+#endif
+                }
+                else
+                    MeshShader::ObjectPass2Shader::getInstance()->SetTextureUnits(createVector<GLuint>(
+                    irr_driver->getRenderTargetTexture(RTT_DIFFUSE),
+                    irr_driver->getRenderTargetTexture(RTT_SPECULAR),
+                    irr_driver->getRenderTargetTexture(RTT_HALF1_R),
+                    getTextureGLuint(spareWhiteTex)));
+
                 MeshShader::ObjectPass2Shader::getInstance()->setUniforms(AbsoluteTransformation, mesh.TextureMatrix);
                 assert(mesh.vao);
                 glBindVertexArray(mesh.vao);

From 7dbfc151bf8379bea5b42307a1e03e3ce6d57fc9 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 2 Sep 2014 09:32:12 +1000
Subject: [PATCH 159/248] Added random GP functionality into gp_info screen.
 Changed GPData in GPInfoScreen from a pointer to be an object, while this
 adds some coping of this object, it removes potential memory leaks.

---
 data/gui/gp_info.stkgui                       |  40 +--
 data/gui/random_gp_info.stkgui                |  69 +++++
 src/challenges/challenge_data.cpp             |   2 +-
 src/main.cpp                                  |   2 +-
 src/race/race_manager.cpp                     |   5 +-
 src/race/race_manager.hpp                     |   6 +-
 src/states_screens/dialogs/gp_info_dialog.cpp |   6 +-
 .../dialogs/random_gp_dialog.cpp              |   2 +-
 src/states_screens/gp_info_screen.cpp         | 236 ++++++++++++++----
 src/states_screens/gp_info_screen.hpp         |  52 +++-
 src/states_screens/tracks_screen.cpp          |   6 +-
 11 files changed, 337 insertions(+), 89 deletions(-)
 create mode 100644 data/gui/random_gp_info.stkgui

diff --git a/data/gui/gp_info.stkgui b/data/gui/gp_info.stkgui
index c72841d35..23cfb5acf 100644
--- a/data/gui/gp_info.stkgui
+++ b/data/gui/gp_info.stkgui
@@ -25,23 +25,35 @@
 
         </box>
         <spacer width="1" height="3%"/>
-        <box width="95%" height="17%" padding="10" layout="vertical-row">
+        <box width="95%" height="17%" padding="10" layout="horizontal-row">
             <spacer width="1" height="5%"/>
+            <div width="50%" height="100%" layout="vertical-row">
 
-            <div width="75%" height="fit" layout="horizontal-row" >
-                <spacer width="40" height="2" />
-                <label id="ai-text" height="100%" width="40%" I18N="Number of AI karts" text="Number of AI karts"/>
-                <spacer with="40" height="2" />
-                <spinner id="ai-spinner" width="20%" min_value="1" max_value="20" align="center"
-                         wrap_around="true" />
-                <spacer proportion="1" height="2" />
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label id="ai-text" height="100%" width="40%" I18N="Number of AI karts" text="AI karts"/>
+                    <spinner id="ai-spinner" width="40%" min_value="1" max_value="20" align="center"
+                             wrap_around="true" />
+                    <spacer proportion="1" height="2" />
+                </div>
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label id="reverse-text" height="100%" width="40%" I18N="Drive the track reverse" text="Reverse"/>
+                    <spinner id="reverse-spinner" width="50%" align="center" wrap_around="true" />
+                    <spacer proportion="1" height="2" />
+                </div>
             </div>
-            <div width="75%" height="fit" layout="horizontal-row" >
-                <spacer width="40" height="2" />
-                <label id="reverse-text" height="100%" width="40%" I18N="Drive the track reverse" text="Drive in reverse"/>
-                <spacer width="40" height="2" />
-                <checkbox id="reverse"/>
-                <spacer proportion="1" height="2" />
+            <div width="50%" height="100%" layout="vertical-row">
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label id="track-text" height="100%" width="50%"  text="Tracks"
+                           I18N="Number of tracks to pick in a random Grand Prix."/>
+                    <spinner id="track-spinner" width="50%" min_value="1" max_value="20" align="center"
+                             wrap_around="true" />
+                    <spacer proportion="1" height="2" />
+                </div>
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label id="group-text" height="100%" width="50%" I18N="Number of AI karts" text="Track group"/>
+                    <spinner id="group-spinner" width="50%" align="center" wrap_around="true" />
+                    <spacer proportion="1" height="2" />
+                </div>
             </div>
             <spacer width="1" height="2%"/>
         </box>
diff --git a/data/gui/random_gp_info.stkgui b/data/gui/random_gp_info.stkgui
new file mode 100644
index 000000000..871a97546
--- /dev/null
+++ b/data/gui/random_gp_info.stkgui
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row">
+
+        <header id="name" width="100%" text_align="center"/>
+
+        <spacer width="1" height="5%"/>
+
+        <box width="95%" height="40%" padding="10" layout="horizontal-row">
+            <spacer width="10" height="100%"/>
+            <!-- Left pane -->
+            <div width="45%" height="95%" align="center" layout="vertical-row">
+                <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
+                </placeholder>
+            </div>
+
+            <spacer width="5%" height="100%"/>
+
+            <!-- Right pane -->
+            <div width="45%" height="95%" align="center" layout="vertical-row">
+                <list id="tracks" width="100%" height="100%"/>
+            </div>
+
+        </box>
+        <spacer width="1" height="3%"/>
+        <box width="95%" height="30%" padding="10" layout="horizontal-row">
+            <spacer width="1" height="5%"/>
+            <div width="50%" height="100%" layout="vertical-row">
+
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label id="ai-text" height="100%" width="50%" I18N="Number of AI karts" text="AI karts"/>
+                    <spinner id="ai-spinner" width="50%" min_value="1" max_value="20" align="center"
+                             wrap_around="true" />
+                </div>
+                <spacer height="5%" />
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label id="reverse-text"      width="50%" height="100%" I18N="Drive the track reverse" text="Reverse"/>
+                    <spinner id="reverse-spinner" width="50%" align="center" wrap_around="true" />
+                </div>
+                <spacer height="5%" />
+                <div width="100%" height="fit" layout="horizontal-row">
+                    <label id="track-text" width="50%" height="100%" text="Tracks"
+                           I18N="Number of tracks to pick in a random Grand Prix."/>
+                    <spinner id="track-spinner" width="50%" min_value="1" max_value="20" align="center"
+                             wrap_around="true" />
+                    <spacer height="1%" />
+                </div>
+                <spacer height="5%" />
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label   id="group-text"    width="50%" height="100%" I18N="Number of AI karts" text="Track group"/>
+                    <spinner id="group-spinner" width="50%" align="center" wrap_around="true" />
+                    <spacer proportion="1" height="2" />
+                </div>
+            </div>
+        </box>
+        <spacer width="1" height="2%"/>
+        <buttonbar id="buttons" height="15%" width="100%" align="center">
+
+            <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
+                    I18N="Start race" text="Start Race"/>
+
+            <icon-button id="continue" width="64" height="64" icon="gui/green_check.png"
+                    I18N="Continue race" text="Continue Race"/>
+        </buttonbar>
+
+    </div>
+</stkgui>
diff --git a/src/challenges/challenge_data.cpp b/src/challenges/challenge_data.cpp
index a65131611..6d0d0514a 100644
--- a/src/challenges/challenge_data.cpp
+++ b/src/challenges/challenge_data.cpp
@@ -376,7 +376,7 @@ void ChallengeData::setRace(RaceManager::Difficulty d) const
     else if(m_mode==CM_GRAND_PRIX)
     {
         race_manager->setMinorMode(m_minor);
-        race_manager->setGrandPrix(grand_prix_manager->getGrandPrix(m_gp_id));
+        race_manager->setGrandPrix(*grand_prix_manager->getGrandPrix(m_gp_id));
         race_manager->setDifficulty(d);
         race_manager->setNumKarts(m_num_karts[d]);
         race_manager->setNumLocalPlayers(1);
diff --git a/src/main.cpp b/src/main.cpp
index 924590261..05131c01b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -854,7 +854,7 @@ int handleCmdLine()
             Log::warn("main", "There is no GP named '%s'.", s.c_str());
             return 0;
         }
-        race_manager->setGrandPrix(gp);
+        race_manager->setGrandPrix(*gp);
     }   // --gp
 
     if(CommandLine::has("--numkarts", &n) ||CommandLine::has("-k", &n))
diff --git a/src/race/race_manager.cpp b/src/race/race_manager.cpp
index 92e4e29fc..07362e7c8 100644
--- a/src/race/race_manager.cpp
+++ b/src/race/race_manager.cpp
@@ -762,12 +762,9 @@ void RaceManager::rerunRace()
 
 //-----------------------------------------------------------------------------
 
-void RaceManager::startGP(const GrandPrixData* gp, bool from_overworld,
+void RaceManager::startGP(const GrandPrixData &gp, bool from_overworld,
                           bool continue_saved_gp)
 {
-    assert(gp != NULL);
-    //std::cout << gp->getId();
-
     StateManager::get()->enterGameState();
     setGrandPrix(gp);
     setCoinTarget( 0 ); // Might still be set from a previous challenge
diff --git a/src/race/race_manager.hpp b/src/race/race_manager.hpp
index 2a0f4b3cf..1dbb9a7ee 100644
--- a/src/race/race_manager.hpp
+++ b/src/race/race_manager.hpp
@@ -411,9 +411,9 @@ public:
     void setDifficulty(Difficulty diff);
 
     // ------------------------------------------------------------------------
-    void setGrandPrix(const GrandPrixData *gp)
+    void setGrandPrix(const GrandPrixData &gp)
     {
-        m_grand_prix = *gp;
+        m_grand_prix = gp;
         m_coin_target = 0;
     }
     // ------------------------------------------------------------------------
@@ -683,7 +683,7 @@ public:
       * \brief Higher-level method to start a GP without having to care about
       *  the exact startup sequence
       */
-    void  startGP(const GrandPrixData* gp, bool from_overworld,
+    void  startGP(const GrandPrixData &gp, bool from_overworld,
                   bool continue_saved_gp);
 
     /**
diff --git a/src/states_screens/dialogs/gp_info_dialog.cpp b/src/states_screens/dialogs/gp_info_dialog.cpp
index 79ad221ca..dc411c69c 100644
--- a/src/states_screens/dialogs/gp_info_dialog.cpp
+++ b/src/states_screens/dialogs/gp_info_dialog.cpp
@@ -254,7 +254,7 @@ void GPInfoDialog::onEnterPressedInternal()
     ModalDialog::dismiss();
     // Disable accidentally unlocking of a challenge
     PlayerManager::getCurrentPlayer()->setCurrentChallenge("");
-    race_manager->startGP(grand_prix_manager->getGrandPrix(gp_id), false, false);
+    race_manager->startGP(*grand_prix_manager->getGrandPrix(gp_id), false, false);
 }
 
 // ----------------------------------------------------------------------------
@@ -270,8 +270,8 @@ GUIEngine::EventPropagation GPInfoDialog::processEvent(const std::string& event_
         // becomes invalid!
         std::string save_source = event_source;
         ModalDialog::dismiss();
-        race_manager->startGP(grand_prix_manager->getGrandPrix(gp_id), false,
-                              (save_source == "continue"));
+        //race_manager->startGP(grand_prix_manager->getGrandPrix(gp_id), false,
+        //                      (save_source == "continue"));
         return GUIEngine::EVENT_BLOCK;
     }
 
diff --git a/src/states_screens/dialogs/random_gp_dialog.cpp b/src/states_screens/dialogs/random_gp_dialog.cpp
index 848d01834..690afda1d 100644
--- a/src/states_screens/dialogs/random_gp_dialog.cpp
+++ b/src/states_screens/dialogs/random_gp_dialog.cpp
@@ -143,7 +143,7 @@ GUIEngine::EventPropagation RandomGPInfoDialog::processEvent(
         // Save GP data, since dismiss will delete this object.
         GrandPrixData gp = m_gp;
         ModalDialog::dismiss();
-        race_manager->startGP(&gp, false, false);
+        race_manager->startGP(gp, false, false);
         return GUIEngine::EVENT_BLOCK;
     }
     else if (eventSource == "Number of tracks")
diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index 8966f836c..fe04d1268 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -1,5 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2014  Marianne Gagnon
+//                2014       Joerg Henrichs, konstin
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -29,6 +30,7 @@
 #include "guiengine/widgets/label_widget.hpp"
 #include "guiengine/widgets/list_widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
+#include "guiengine/widgets/spinner_widget.hpp"
 #include "io/file_manager.hpp"
 #include "race/grand_prix_manager.hpp"
 #include "race/grand_prix_data.hpp"
@@ -42,88 +44,177 @@
 #include <IGUIEnvironment.h>
 #include <IGUIStaticText.h>
 
+#include <algorithm>
+
 using irr::gui::IGUIStaticText;
 using GUIEngine::PROP_ID;
 
 using namespace GUIEngine;
 
 DEFINE_SCREEN_SINGLETON( GPInfoScreen );
+DEFINE_SCREEN_SINGLETON( RandomGPInfoScreen );
 
-GPInfoScreen::GPInfoScreen() : Screen("gp_info.stkgui")
+BaseGPInfoScreen::BaseGPInfoScreen(const std::string &name) : Screen(name.c_str())
 {
-    m_gp        = NULL;
     m_curr_time = 0.0f;
-}   // GPInfoScreen
+    // Necessary to test if loadedFroMFile() was executed (in setGP)
+    m_reverse_spinner = NULL;
+}   // BaseGPInfoScreen
 
 // ----------------------------------------------------------------------------
 
-GPInfoScreen::~GPInfoScreen()
+BaseGPInfoScreen::~BaseGPInfoScreen()
 {
-}   // ~GPInfoScreen
+}   // ~BaseGPInfoScreen
 
 // ----------------------------------------------------------------------------
-/** Sets the GP to be displayed.
+void BaseGPInfoScreen::loadedFromFile()
+{
+    // The group spinner is filled in init every time the screen is shown
+    // (since the groups can change if addons are added/deleted).
+    m_group_spinner      = getWidget<SpinnerWidget>("group-spinner");
+
+    m_reverse_spinner    = getWidget<SpinnerWidget>("reverse-spinner");
+    m_reverse_spinner->addLabel(_("No"));
+    m_reverse_spinner->addLabel(_("Yes"));
+    m_reverse_spinner->addLabel(_("Random"));
+    m_reverse_spinner->setValue(0);
+
+    m_num_tracks_spinner = getWidget<SpinnerWidget>("track-spinner");
+    // Only init the number of tracks here, this way the previously selected
+    // number of tracks will be the default.
+    m_num_tracks_spinner->setValue(4);
+    int number_of_tracks = m_num_tracks_spinner->getValue();
+}   // loadedFromFile
+
+// ----------------------------------------------------------------------------
+/** Sets the GP to be displayed. If the identifier is 'random', no gp info
+ *  will be loaded.
  */
-void GPInfoScreen::setGP(const std::string &gp_ident)
+void BaseGPInfoScreen::setGP(const std::string &gp_ident)
 {
-    m_gp = grand_prix_manager->getGrandPrix(gp_ident);
+    if(gp_ident!="random")
+        m_gp = *grand_prix_manager->getGrandPrix(gp_ident);
+    else
+    {
+        // Doesn't matter what kind of GP we create, it just gets the
+        // right id ("random").
+        m_gp.createRandomGP(1, "standard", 
+                            m_reverse_spinner ? getReverse()
+                                              : GrandPrixData::GP_NO_REVERSE);
+    }
 }   // setGP
 
 // ----------------------------------------------------------------------------
-void GPInfoScreen::init()
+GrandPrixData::GPReverseType BaseGPInfoScreen::getReverse() const
+{
+    switch (m_reverse_spinner->getValue())
+    {
+    case 0: return GrandPrixData::GP_NO_REVERSE;     break;
+    case 1: return GrandPrixData::GP_ALL_REVERSE;    break;
+    case 2: return GrandPrixData::GP_RANDOM_REVERSE; break;
+    default: assert(false); 
+    }   // switch
+    // Avoid compiler warning
+    return GrandPrixData::GP_NO_REVERSE;
+}   // getReverse
+
+// ----------------------------------------------------------------------------
+void BaseGPInfoScreen::init()
 {
     Screen::init();
     m_curr_time = 0.0f;
 
-    getWidget<LabelWidget>("name")->setText(m_gp->getName(), false);
+    bool random = m_gp.getId()=="random";
 
-    m_gp->checkConsistency();
+    SpinnerWidget *reverse_spinner = getWidget<SpinnerWidget>("reverse-spinner");
+    getWidget<LabelWidget  >("track-text"   )->setVisible(random);
+    m_num_tracks_spinner->setVisible(random);
+    getWidget<LabelWidget  >("group-text"   )->setVisible(random);
+    m_group_spinner->setVisible(random);
 
-    m_over_body   = UserConfigParams::m_height/7;
-    m_lower_bound = UserConfigParams::m_height*6/7;
+
+    if(random)
+    {
+        getWidget<LabelWidget>("name")->setText(_("Random Grand Prix"), false);
+        getWidget<IconButtonWidget>("continue")->setVisible(false);
+
+        // We have to recreate the group spinner, but a new group might have
+        // been added or deleted since the last time this screen was shown.
+        m_group_spinner->clearLabels();
+        m_group_spinner->addLabel("all");
+        int index_standard;
+        const std::vector<std::string>& groups = track_manager->getAllTrackGroups();
+        for (unsigned int i = 0; i < groups.size(); i++)
+        {
+            m_group_spinner->addLabel(stringw(groups[i].c_str()));
+            if (groups[i] == "standard")
+                index_standard = i + 1;
+        }
+        // Try to keep a previously selected group value
+        if(m_group_spinner->getValue() >= (int)groups.size())
+        {
+            m_group_spinner->setValue(index_standard);
+            m_group_name = "standard";
+        }
+        else
+            m_group_name = stringc(m_group_spinner->getStringValue().c_str()).c_str();
+
+        // If there are more tracks selected atm as in the group (which can 
+        // happen if the group has been changed since last time this screen
+        // was shown), adjust it:
+        int max_num_tracks = 
+            m_group_name=="all" ? track_manager->getNumberOfTracks()
+                                : track_manager->getTracksInGroup(m_group_name).size();
+        if(m_num_tracks_spinner->getValue() > max_num_tracks)
+        {
+            m_num_tracks_spinner->setValue(max_num_tracks);
+        }
+
+        // Now create the random GP:
+        m_gp.createRandomGP(m_num_tracks_spinner->getValue(), 
+                            m_group_name, getReverse(), true);
+    }
+    else
+    {
+        getWidget<LabelWidget>("name")->setText(m_gp.getName(), false);
+        m_gp.checkConsistency();
+
+        // Check if there is a saved GP:
+        SavedGrandPrix* saved_gp =
+            SavedGrandPrix::getSavedGP(StateManager::get()
+                                       ->getActivePlayerProfile(0)->getUniqueID(),
+                                       m_gp.getId(),
+                                       race_manager->getDifficulty(),
+                                       race_manager->getNumberOfKarts(),
+                                       race_manager->getNumLocalPlayers());
+
+        getWidget<IconButtonWidget>("continue")->setVisible(saved_gp != NULL);
+    }
 
     addTracks();
     addScreenshot();
-
-    CheckBoxWidget *reverse = getWidget<CheckBoxWidget>("reverse");
-    reverse->setState(false);
-
-    // Check if there is a saved GP:
-    SavedGrandPrix* saved_gp = 
-        SavedGrandPrix::getSavedGP(StateManager::get()
-                                   ->getActivePlayerProfile(0)->getUniqueID(),
-                                   m_gp->getId(),
-                                   race_manager->getDifficulty(),
-                                   race_manager->getNumberOfKarts(),
-                                   race_manager->getNumLocalPlayers());
-    
-    getWidget<IconButtonWidget>("continue")->setVisible(saved_gp!=NULL);
 }   // init
 
 // ----------------------------------------------------------------------------
-void GPInfoScreen::loadedFromFile()
-{
-}   // loadedFromFile
 
-// ----------------------------------------------------------------------------
-
-void GPInfoScreen::addTracks()
+void BaseGPInfoScreen::addTracks()
 {
-    const std::vector<std::string> tracks = m_gp->getTrackNames();
+    const std::vector<std::string> tracks = m_gp.getTrackNames();
 
     ListWidget *list = getWidget<ListWidget>("tracks");
     list->clear();
-    for(unsigned int i=0; i<tracks.size(); i++)
+    for (unsigned int i = 0; i < tracks.size(); i++)
     {
         const Track *track = track_manager->getTrack(tracks[i]);
         std::string s = StringUtils::toString(i);
-        list->addItem(s, translations->fribidize(track->getName()) );
+        list->addItem(s, translations->fribidize(track->getName()));
     }
 }   // addTracks
 
 // ----------------------------------------------------------------------------
 
-void GPInfoScreen::addScreenshot()
+void BaseGPInfoScreen::addScreenshot()
 {
     Widget* screenshot_div = getWidget("screenshot_div");
 
@@ -143,7 +234,7 @@ void GPInfoScreen::addScreenshot()
     m_screenshot_widget->m_properties[PROP_ICON] = "gui/main_help.png";
     m_screenshot_widget->add();
 
-    const Track *track = track_manager->getTrack(m_gp->getTrackId(0));
+    const Track *track = track_manager->getTrack(m_gp.getTrackId(0));
     video::ITexture* screenshot = irr_driver->getTexture(track->getScreenshotFile(),
                                     "While loading screenshot for track '%s':",
                                            track->getFilename()            );
@@ -154,19 +245,39 @@ void GPInfoScreen::addScreenshot()
 
 // ----------------------------------------------------------------------------
 
-void GPInfoScreen::onEnterPressedInternal()
+void BaseGPInfoScreen::onEnterPressedInternal()
 {
     // Save the GP id because dismiss() will destroy this instance
-    std::string gp_id = m_gp->getId();
-//FIXME    ModalDialog::dismiss();
+    GrandPrixData gp_data = m_gp;
     // Disable accidentally unlocking of a challenge
     PlayerManager::getCurrentPlayer()->setCurrentChallenge("");
-    race_manager->startGP(grand_prix_manager->getGrandPrix(gp_id), false, false);
+    race_manager->startGP(m_gp, false, false);
 }
 
 // ----------------------------------------------------------------------------
+void BaseGPInfoScreen::updateRandomGP()
+{
+    // First get the right track group to use
+    const std::vector<std::string>& groups = track_manager->getAllTrackGroups();
 
-void GPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &name,
+    int n = m_group_spinner->getValue();
+    std::string track_group;
+    if(n>=0 && n < (int)groups.size())
+    {
+        track_group = groups[m_group_spinner->getValue()];
+    }
+    else
+    {
+        m_group_spinner->setValue(0);
+        track_group = groups[0];
+    }
+
+    int number_of_tracks = getWidget<SpinnerWidget>("track-spinner")->getValue();
+}   // updateRandomGP
+
+// ----------------------------------------------------------------------------
+
+void BaseGPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &name,
                                  const int player_id)
 {
     if(name=="buttons")
@@ -177,22 +288,49 @@ void GPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &name,
         if (button == "start" || button=="continue")
         {
             // Save GP identifier, since dismiss will delete this object.
-            std::string gp_id = m_gp->getId();
+            GrandPrixData gp_data = m_gp;
             // Also create a copy of the string: it is a reference to data
             // in a widget in the dialog - so if we call dismiss, this reference
             // becomes invalid!
             std::string save_source = name;
             // FIXME ModalDialog::dismiss();
-            race_manager->startGP(grand_prix_manager->getGrandPrix(gp_id), false,
-                (save_source == "continue"));
+            race_manager->startGP(gp_data, false, (save_source == "continue"));
         }
     }   // name=="buttons"
+    else if (name=="group-spinner")
+    {
+        m_group_name = stringc(m_group_spinner->getStringValue()).c_str();
+
+        // Update the maximum for the number of tracks since it's depending on
+        // the current track. The current value in the Number-of-tracks-spinner
+        // has to be updated, since otherwise the displayed (and used) value
+        // can be bigger than the maximum. (Might be a TODO to fix this)
+        unsigned int max = (m_group_name == "all") ?
+                           track_manager->getNumberOfTracks() :
+                           track_manager->getTracksInGroup(m_group_name).size();
+        m_num_tracks_spinner->setMax(max);
+        int number_of_tracks = std::min((int)max, m_num_tracks_spinner->getValue());
+        if (m_num_tracks_spinner->getValue() > (signed)max)
+            m_num_tracks_spinner->setValue(max);
+        // Create a new (i.e. with new tracks) random gp, since the old
+        // tracks might not all belong to the newly selected group.
+        
+        m_gp.createRandomGP(m_num_tracks_spinner->getValue(), m_group_name,
+                            getReverse(),  /*new_tracks*/true);
+        addTracks();
+
+    }
+    else if (name=="track-spinner")
+    {
+        m_gp.changeTrackNumber(m_num_tracks_spinner->getValue(), m_group_name);
+        addTracks();
+    }
 
 }   // eventCallback
 
 // ----------------------------------------------------------------------------
 
-void GPInfoScreen::onUpdate(float dt)
+void BaseGPInfoScreen::onUpdate(float dt)
 {
     if (dt == 0)
         return; // if nothing changed, return right now
@@ -200,7 +338,7 @@ void GPInfoScreen::onUpdate(float dt)
     m_curr_time += dt;
     int frameAfter = (int)(m_curr_time / 1.5f);
 
-    const std::vector<std::string> tracks = m_gp->getTrackNames();
+    const std::vector<std::string> tracks = m_gp.getTrackNames();
     if (frameAfter >= (int)tracks.size())
     {
         frameAfter = 0;
diff --git a/src/states_screens/gp_info_screen.hpp b/src/states_screens/gp_info_screen.hpp
index 976d2c2b4..1e8a0f5e9 100644
--- a/src/states_screens/gp_info_screen.hpp
+++ b/src/states_screens/gp_info_screen.hpp
@@ -21,32 +21,36 @@
 #define HEADER_GP_INFO_SCREEN_HPP
 
 #include "guiengine/screen.hpp"
+#include "race/grand_prix_data.hpp"
 
 class GrandPrixData;
 
 namespace GUIEngine
 {
     class IconButtonWidget;
+    class SpinnerWidget;
 }
 
 /**
  * \brief Dialog that shows information about a specific grand prix
  * \ingroup states_screens
  */
-class GPInfoScreen : public GUIEngine::Screen,
-                     public GUIEngine::ScreenSingleton<GPInfoScreen>
+class BaseGPInfoScreen : public GUIEngine::Screen
 {
-protected: // Necessary for RandomGPInfoScreen
+private:
+    GUIEngine::SpinnerWidget *m_group_spinner;
+    GUIEngine::SpinnerWidget *m_reverse_spinner;
+    GUIEngine::SpinnerWidget *m_num_tracks_spinner;
+
+    /** The currently selected group name. */
+    std::string m_group_name;
+
+protected: // Necessary for RandomBaseGPInfoScreen
     GUIEngine::IconButtonWidget* m_screenshot_widget;
     float m_curr_time;
 
     /** The grand prix data. */
-    GrandPrixData *m_gp;
-
-    /** height of the separator over the body */
-    int m_over_body;
-    /** height of the seperator over the buttons */
-    int m_lower_bound;
+    GrandPrixData m_gp;
 
     /** \brief display all the tracks according to the current gp
      * For a normal gp info dialog, it just creates a label for every track.
@@ -54,12 +58,14 @@ protected: // Necessary for RandomGPInfoScreen
      * labels as possible by just changing their text. */
     void addTracks();
     void addScreenshot();
+    void updateRandomGP();
+    GrandPrixData::GPReverseType getReverse() const;
 
 public:
-    GPInfoScreen();
+    BaseGPInfoScreen(const std::string &name);
     /** Places the focus back on the selected GP, in the case that the dialog
      * was cancelled and we're returning to the track selection screen */
-    virtual ~GPInfoScreen();
+    virtual ~BaseGPInfoScreen();
 
     void onEnterPressedInternal();
     virtual void eventCallback(GUIEngine::Widget *, const std::string &name,
@@ -70,6 +76,28 @@ public:
     virtual void onUpdate(float dt);
 
     void setGP(const std::string &gp_ident);
-};
+};   // BaseGPInfoScreen
+
+// ============================================================================
+class GPInfoScreen: public BaseGPInfoScreen,
+                    public GUIEngine::ScreenSingleton<GPInfoScreen>
+{
+private:
+    GPInfoScreen() : BaseGPInfoScreen("gp_info.stkgui")
+    {};
+public:
+    friend class GUIEngine::ScreenSingleton<GPInfoScreen>;
+};   // class GPInfoScreen
+
+// ============================================================================
+class RandomGPInfoScreen: public BaseGPInfoScreen,
+                          public GUIEngine::ScreenSingleton<RandomGPInfoScreen>
+{
+private:
+    RandomGPInfoScreen() : BaseGPInfoScreen("random_gp_info.stkgui")
+    {};
+public:
+    friend class GUIEngine::ScreenSingleton<RandomGPInfoScreen>;
+};   // class RandomGPInfoScreen
 
 #endif
diff --git a/src/states_screens/tracks_screen.cpp b/src/states_screens/tracks_screen.cpp
index ba4865c07..2491176c5 100644
--- a/src/states_screens/tracks_screen.cpp
+++ b/src/states_screens/tracks_screen.cpp
@@ -116,7 +116,11 @@ void TracksScreen::eventCallback(Widget* widget, const std::string& name,
         else
         {
             if (selection == "Random Grand Prix")
-                new RandomGPInfoDialog();
+            {
+                RandomGPInfoScreen *gpis = RandomGPInfoScreen::getInstance();
+                gpis->setGP("random");
+                StateManager::get()->pushScreen(gpis);
+            }
             else
             {
                 GPInfoScreen *gpis = GPInfoScreen::getInstance();

From 06915cc354e0f6f6adfb7d06b1abf25a3d83d426 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 2 Sep 2014 09:51:30 +1000
Subject: [PATCH 160/248] Fix compilation on very old mesa versions. vlj,
 please check.

---
 src/graphics/glwrap.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index dabd4a83c..7f797f1fa 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -121,9 +121,11 @@ CALLBACK
 debugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length,
               const GLchar* msg, const void *userparam)
 {
+#ifdef GL_DEBUG_SEVERITY_NOTIFICATION
     // ignore minor notifications sent by some drivers (notably the nvidia one)
     if (severity == GL_DEBUG_SEVERITY_NOTIFICATION)
         return;
+#endif
 
     switch(source)
     {

From c8500b65cbd9238e3bc6df747e5ad2a5fda6f907 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 2 Sep 2014 16:40:00 +1000
Subject: [PATCH 161/248] Fixed compiler warning.

---
 src/karts/kart_model.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index 403b2582d..fe7e85e05 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -113,7 +113,7 @@ KartModel::KartModel(bool is_master)
 
         // default value for kart suspensions. move to config file later
         // if we find each kart needs custom values
-        m_min_suspension[i] = -0.07;
+        m_min_suspension[i] = -0.07f;
         m_max_suspension[i] = 0.20f;
         m_dampen_suspension_amplitude[i] = 2.5f;
     }

From c8724632e85b62d985c741ce3ee6f10cf81e3989 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 2 Sep 2014 16:40:26 +1000
Subject: [PATCH 162/248] Bugfix: only allow races (i.e. no arenas, or cut
 scenes) in an 'all tracks' random GP.

---
 src/race/grand_prix_data.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/race/grand_prix_data.cpp b/src/race/grand_prix_data.cpp
index b4d058e15..f23c26987 100644
--- a/src/race/grand_prix_data.cpp
+++ b/src/race/grand_prix_data.cpp
@@ -90,26 +90,27 @@ void GrandPrixData::changeTrackNumber(const unsigned int number_of_tracks,
     // The problem with the track groups is that "all" isn't a track group
     // TODO: Add "all" to the track groups and rewrite this more elegant
     std::vector<int> track_indices;
-    size_t available_tracks;
     if (track_group == "all")
     {
-        available_tracks = track_manager->getNumberOfTracks();
+        for(unsigned int i=0; i<track_manager->getNumberOfTracks(); i++)
+        {
+            const Track *track = track_manager->getTrack(i);
+            if(!track->isArena() && !track->isSoccer() && !track->isInternal())
+                track_indices.push_back(i);
+        }
     }
     else
     {
         track_indices = track_manager->getTracksInGroup(track_group);
-        available_tracks = track_indices.size();
     }
-    assert(number_of_tracks <= available_tracks);
+    assert(number_of_tracks <= track_indices.size());
 
     // add or remove the right number of tracks
     if (m_tracks.size() < number_of_tracks)
     {
         while (m_tracks.size() < number_of_tracks)
         {
-            int index = (track_group == "all") ?
-                         rand() % available_tracks :
-                         track_indices[rand() % available_tracks];
+            int index = track_indices[rand() % track_indices.size()];
 
             const Track *track = track_manager->getTrack(index);
             std::string id = track->getIdent();

From 050d83540ca017784e983ad7caa8d02e9b530958 Mon Sep 17 00:00:00 2001
From: Stephen Just <stephenjust@gmail.com>
Date: Tue, 2 Sep 2014 08:36:06 -0600
Subject: [PATCH 163/248] Use four-channel storage for diffuse/specular RTTs

Mesa doesn't seem to support three-channel texture storage, so
increase to four channels. This supposedly will not negatively
impact performance, and may actually improve it depending on the
driver implementation.

See http://www.gamedev.net/topic/560908-is-float-point-fb-possible-with-opengl/
---
 src/graphics/rtts.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/graphics/rtts.cpp b/src/graphics/rtts.cpp
index c16921488..3cd98bf5a 100644
--- a/src/graphics/rtts.cpp
+++ b/src/graphics/rtts.cpp
@@ -115,8 +115,8 @@ RTT::RTT(size_t width, size_t height)
     RenderTargetTextures[RTT_MLAA_BLEND] = generateRTT(res, GL_SRGB8_ALPHA8, GL_BGR, GL_UNSIGNED_BYTE);
     RenderTargetTextures[RTT_SSAO] = generateRTT(res, GL_R16F, GL_RED, GL_FLOAT);
     RenderTargetTextures[RTT_DISPLACE] = generateRTT(res, GL_RGBA16F, GL_BGRA, GL_FLOAT);
-    RenderTargetTextures[RTT_DIFFUSE] = generateRTT(res, GL_RGB16F, GL_BGR, GL_FLOAT);
-    RenderTargetTextures[RTT_SPECULAR] = generateRTT(res, GL_RGB16F, GL_BGR, GL_FLOAT);
+    RenderTargetTextures[RTT_DIFFUSE] = generateRTT(res, GL_RGBA16F, GL_BGRA, GL_FLOAT);
+    RenderTargetTextures[RTT_SPECULAR] = generateRTT(res, GL_RGBA16F, GL_BGRA, GL_FLOAT);
 
     RenderTargetTextures[RTT_HALF1] = generateRTT(half, GL_RGBA16F, GL_BGRA, GL_FLOAT);
     RenderTargetTextures[RTT_QUARTER1] = generateRTT(quarter, GL_RGBA16F, GL_BGRA, GL_FLOAT);

From 96c2c8c6b73260582274218301867855da5855a1 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 2 Sep 2014 17:30:57 +0200
Subject: [PATCH 164/248] Add glDrawElementsIndirect support

---
 src/graphics/gl_headers.hpp | 1 +
 src/graphics/glwrap.cpp     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp
index 3a2dfd5e5..3bdd39c8c 100644
--- a/src/graphics/gl_headers.hpp
+++ b/src/graphics/gl_headers.hpp
@@ -73,6 +73,7 @@ extern PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
 extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
 extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
 extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC glDrawElementsInstancedBaseVertexBaseInstance;
+extern PFNGLDRAWELEMENTSINDIRECTPROC glDrawElementsIndirect;
 extern PFNGLMULTIDRAWELEMENTSINDIRECTPROC glMultiDrawElementsIndirect;
 extern PFNGLDELETEBUFFERSPROC glDeleteBuffers;
 extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 7f797f1fa..f83f02948 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -54,6 +54,7 @@ PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
 PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
 PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
 PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC glDrawElementsInstancedBaseVertexBaseInstance;
+PFNGLDRAWELEMENTSINDIRECTPROC glDrawElementsIndirect;
 PFNGLMULTIDRAWELEMENTSINDIRECTPROC glMultiDrawElementsIndirect;
 PFNGLDELETEBUFFERSPROC glDeleteBuffers;
 PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
@@ -247,6 +248,7 @@ void initGL()
     glDrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsInstanced");
     glDrawElementsInstancedBaseVertex = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsInstancedBaseVertex");
     glDrawElementsInstancedBaseVertexBaseInstance = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsInstancedBaseVertexBaseInstance");
+    glDrawElementsIndirect = (PFNGLDRAWELEMENTSINDIRECTPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsIndirect");
     glMultiDrawElementsIndirect = (PFNGLMULTIDRAWELEMENTSINDIRECTPROC)IRR_OGL_LOAD_EXTENSION("glMultiDrawElementsIndirect");
     glDeleteBuffers = (PFNGLDELETEBUFFERSPROC)IRR_OGL_LOAD_EXTENSION("glDeleteBuffers");
     glGenVertexArrays = (PFNGLGENVERTEXARRAYSPROC)IRR_OGL_LOAD_EXTENSION("glGenVertexArrays");

From 3cea173ee25bfe44d7956f5d898fd968d270cd52 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 2 Sep 2014 18:02:56 +0200
Subject: [PATCH 165/248] Check for draw indirect support

---
 src/graphics/gl_headers.hpp | 1 +
 src/graphics/irr_driver.cpp | 7 +++++++
 src/graphics/irr_driver.hpp | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp
index 3bdd39c8c..baf7f828e 100644
--- a/src/graphics/gl_headers.hpp
+++ b/src/graphics/gl_headers.hpp
@@ -132,6 +132,7 @@ extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
 #define Base_Instance_Support
 #define Buffer_Storage
 #define Multi_Draw_Indirect
+#define Draw_Indirect
 #endif
 
 
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 3bc9c5b97..8f2b9698a 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -490,6 +490,7 @@ void IrrDriver::initDevice()
     hasVSLayer = false;
     hasBaseInstance = false;
     hasBuffserStorage = false;
+    hasDrawIndirect = false;
     // Default false value for hasVSLayer if --no-graphics argument is used
     if (!ProfileWorld::isNoGraphics())
     {
@@ -508,6 +509,12 @@ void IrrDriver::initDevice()
             hasBaseInstance = true;
             Log::info("GLDriver", "ARB Instance enabled");
         }
+#endif
+#ifdef Draw_Indirect
+        if (hasGLExtension("GL_ARB_draw_indirect")) {
+            hasDrawIndirect = true;
+            Log::info("GLDriver", "ARB Draw Indirect enabled");
+        }
 #endif
     }
 
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 76a6e86e7..1d2710cc0 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -200,6 +200,7 @@ private:
     int GLMajorVersion, GLMinorVersion;
     bool hasVSLayer;
     bool hasBaseInstance;
+    bool hasDrawIndirect;
     bool hasBuffserStorage;
     bool m_need_ubo_workaround;
     bool m_need_rh_workaround;
@@ -306,6 +307,11 @@ public:
         return hasBaseInstance;
     }
 
+    bool hasARB_draw_indirect() const
+    {
+        return hasDrawIndirect;
+    }
+
     bool hasVSLayerExtension() const
     {
         return hasVSLayer;

From dfbae2ea07f65a666a51fcb202a856b259c6bc96 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Tue, 26 Aug 2014 01:33:36 +0200
Subject: [PATCH 166/248] Remove instancing

---
 src/tracks/track.cpp        | 8 ++++----
 src/tracks/track_object.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 9c4ecdf9a..02e10b9a6 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -743,7 +743,7 @@ void Track::convertTrackToBullet(scene::ISceneNode *node)
 
     std::vector<core::matrix4> matrices;
 
-    STKInstancedSceneNode* instancing_node = dynamic_cast<STKInstancedSceneNode*>(node);
+    STKInstancedSceneNode* instancing_node = NULL;// dynamic_cast<STKInstancedSceneNode*>(node);
     if (instancing_node != NULL)
     {
         int count = instancing_node->getInstanceCount();
@@ -1064,7 +1064,7 @@ bool Track::loadMainTrack(const XMLNode &root)
     }
 
     // Load instancing models (for the moment they are loaded the same way as LOD to simplify implementation)
-    const XMLNode *instancing_xml_node = root.getNode("instancing");
+    const XMLNode *instancing_xml_node = NULL;// root.getNode("instancing");
     if (instancing_xml_node != NULL)
     {
         for (unsigned int i = 0; i < instancing_xml_node->getNumNodes(); i++)
@@ -1757,7 +1757,7 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
     }
 
     // Load instancing models (for the moment they are loaded the same way as LOD to simplify implementation)
-    const XMLNode *instancing_xml_node = root->getNode("instancing");
+    const XMLNode *instancing_xml_node = NULL;// root->getNode("instancing");
     if (instancing_xml_node != NULL)
     {
         for (unsigned int i = 0; i < instancing_xml_node->getNumNodes(); i++)
@@ -2012,7 +2012,7 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
                 }
 
                 // Load instancing definitions
-                const XMLNode *instancing_xml_node = libroot->getNode("instancing");
+                const XMLNode *instancing_xml_node = NULL;// libroot->getNode("instancing");
                 if (instancing_xml_node != NULL)
                 {
                     for (unsigned int i = 0; i < instancing_xml_node->getNumNodes(); i++)
diff --git a/src/tracks/track_object.cpp b/src/tracks/track_object.cpp
index 8c5fd40af..4053ca239 100644
--- a/src/tracks/track_object.cpp
+++ b/src/tracks/track_object.cpp
@@ -104,7 +104,7 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
     xml_node.get("lod_instance", &lod_instance);
 
     bool instancing = false;
-    xml_node.get("instancing", &instancing);
+//    xml_node.get("instancing", &instancing);
 
     m_soccer_ball = false;
     xml_node.get("soccer_ball", &m_soccer_ball);

From 0fa13334ea1e4cee155490b5fa13d140abe49330 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Wed, 27 Aug 2014 23:13:09 +0200
Subject: [PATCH 167/248] Increase instance buffer size

---
 src/graphics/stkmeshscenenode.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 047552b8a..21024252d 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -276,6 +276,7 @@ void STKMeshSceneNode::render()
 
         if (immediate_draw)
         {
+            return;
             glDisable(GL_CULL_FACE);
             if (!spareWhiteTex)
                 spareWhiteTex = getUnicolorTexture(video::SColor(255, 255, 255, 255));

From 3083df450f22794e7cacb3ed3461aae5a8ec6bd7 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Mon, 25 Aug 2014 18:20:37 +0200
Subject: [PATCH 168/248] Gather object in instanced calls

---
 data/shaders/glow_object.frag          |   8 +
 data/shaders/glow_object.vert          |  24 +
 data/shaders/instanced_rsm.frag        |  27 +
 data/shaders/instanced_rsm.vert        |  39 ++
 src/graphics/glwrap.cpp                |  79 ++-
 src/graphics/glwrap.hpp                |  44 +-
 src/graphics/gpuparticles.cpp          |   6 +
 src/graphics/gpuparticles.hpp          |   1 +
 src/graphics/irr_driver.cpp            |  15 +-
 src/graphics/irr_driver.hpp            |   4 +
 src/graphics/render.cpp                |  76 ++-
 src/graphics/render_geometry.cpp       | 655 ++++++++++---------------
 src/graphics/shaders.cpp               |  26 +
 src/graphics/shaders.hpp               |  12 +
 src/graphics/stkanimatedmesh.cpp       |   4 +-
 src/graphics/stkanimatedmesh.hpp       |   3 +-
 src/graphics/stkinstancedscenenode.cpp |   6 +-
 src/graphics/stkinstancedscenenode.hpp |  12 -
 src/graphics/stkmesh.cpp               |   3 +-
 src/graphics/stkmesh.hpp               |  85 +++-
 src/graphics/stkmeshscenenode.cpp      | 156 +++---
 src/graphics/stkmeshscenenode.hpp      |   5 +
 src/graphics/stkscenemanager.cpp       | 634 ++++++++++++++++++++++++
 src/graphics/stkscenemanager.hpp       |  32 +-
 24 files changed, 1392 insertions(+), 564 deletions(-)
 create mode 100644 data/shaders/glow_object.frag
 create mode 100644 data/shaders/glow_object.vert
 create mode 100644 data/shaders/instanced_rsm.frag
 create mode 100644 data/shaders/instanced_rsm.vert
 create mode 100644 src/graphics/stkscenemanager.cpp

diff --git a/data/shaders/glow_object.frag b/data/shaders/glow_object.frag
new file mode 100644
index 000000000..ca2f881dc
--- /dev/null
+++ b/data/shaders/glow_object.frag
@@ -0,0 +1,8 @@
+in vec4 glowColor;
+
+flat out vec4 FragColor;
+
+void main()
+{
+    FragColor = vec4(glowColor.rgb, 1.0);
+}
diff --git a/data/shaders/glow_object.vert b/data/shaders/glow_object.vert
new file mode 100644
index 000000000..703529317
--- /dev/null
+++ b/data/shaders/glow_object.vert
@@ -0,0 +1,24 @@
+layout(location = 0) in vec3 Position;
+layout(location = 1) in vec3 Normal;
+layout(location = 2) in vec4 Color;
+layout(location = 3) in vec2 Texcoord;
+layout(location = 5) in vec3 Tangent;
+layout(location = 6) in vec3 Bitangent;
+
+layout(location = 7) in vec3 Origin;
+layout(location = 8) in vec3 Orientation;
+layout(location = 9) in vec3 Scale;
+layout(location = 12) in vec4 GlowColor;
+
+flat out vec4 glowColor;
+
+mat4 getWorldMatrix(vec3 translation, vec3 rotation, vec3 scale);
+mat4 getInverseWorldMatrix(vec3 translation, vec3 rotation, vec3 scale);
+
+void main(void)
+{
+    mat4 ModelMatrix = getWorldMatrix(Origin, Orientation, Scale);
+    mat4 TransposeInverseModelView = transpose(getInverseWorldMatrix(Origin, Orientation, Scale) * InverseViewMatrix);
+    gl_Position = ProjectionMatrix * ViewMatrix *  ModelMatrix * vec4(Position, 1.);
+    glowColor = GlowColor;
+}
diff --git a/data/shaders/instanced_rsm.frag b/data/shaders/instanced_rsm.frag
new file mode 100644
index 000000000..a5f82d259
--- /dev/null
+++ b/data/shaders/instanced_rsm.frag
@@ -0,0 +1,27 @@
+#ifndef GL_ARB_bindless_texture
+uniform sampler2D tex;
+#endif
+
+in vec2 uv;
+in vec3 nor;
+in vec4 color;
+#ifdef GL_ARB_bindless_texture
+flat in uvec2 handle;
+#endif
+layout (location = 0) out vec3 RSMColor;
+layout (location = 1) out vec3 RSMNormals;
+
+void main()
+{
+#ifdef GL_ARB_bindless_texture
+    vec4 col = texture(sampler2D(handle), uv);
+#ifdef SRGBBindlessFix
+    col.xyz = pow(col.xyz, vec3(2.2));
+#endif
+#else
+    vec4 col = texture(tex, uv);
+#endif
+    if (col.a < .5) discard;
+    RSMColor = col.xyz * color.rgb;
+    RSMNormals = .5 * normalize(nor) + .5;
+}
diff --git a/data/shaders/instanced_rsm.vert b/data/shaders/instanced_rsm.vert
new file mode 100644
index 000000000..fc84a79ed
--- /dev/null
+++ b/data/shaders/instanced_rsm.vert
@@ -0,0 +1,39 @@
+uniform mat4 RSMMatrix;
+
+layout(location = 0) in vec3 Position;
+layout(location = 1) in vec3 Normal;
+layout(location = 2) in vec4 Color;
+layout(location = 3) in vec2 Texcoord;
+layout(location = 4) in vec2 SecondTexcoord;
+layout(location = 7) in vec3 Origin;
+layout(location = 8) in vec3 Orientation;
+layout(location = 9) in vec3 Scale;
+#ifdef GL_ARB_bindless_texture
+layout(location = 10) in uvec2 Handle;
+#endif
+
+out vec3 nor;
+out vec2 uv;
+out vec2 uv_bis;
+out vec4 color;
+#ifdef GL_ARB_bindless_texture
+flat out uvec2 handle;
+#endif
+
+
+mat4 getWorldMatrix(vec3 translation, vec3 rotation, vec3 scale);
+mat4 getInverseWorldMatrix(vec3 translation, vec3 rotation, vec3 scale);
+
+void main(void)
+{
+    mat4 ModelMatrix = getWorldMatrix(Origin, Orientation, Scale);
+    mat4 ModelViewProjectionMatrix = RSMMatrix * ModelMatrix;
+    mat4 TransposeInverseModel = transpose(inverse(ModelMatrix));
+    gl_Position = ModelViewProjectionMatrix * vec4(Position, 1.);
+    nor = (TransposeInverseModel * vec4(Normal, 0.)).xyz;
+    uv = Texcoord;
+    color = Color.zyxw;
+#ifdef GL_ARB_bindless_texture
+    handle = Handle;
+#endif
+}
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index f83f02948..fcdcf2372 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -601,9 +601,22 @@ VAOManager::VAOManager()
     idx_mirror[0] = idx_mirror[1] = idx_mirror[2] = NULL;
     instance_count[0] = 0;
 
-    glGenBuffers(1, &instance_vbo[0]);
-    glBindBuffer(GL_ARRAY_BUFFER, instance_vbo[0]);
-    glBufferData(GL_ARRAY_BUFFER, 10000 * sizeof(float)* 9, 0, GL_STATIC_DRAW);
+    for (unsigned i = 0; i < InstanceTypeCount; i++)
+    {
+        glGenBuffers(1, &instance_vbo[i]);
+        glBindBuffer(GL_ARRAY_BUFFER, instance_vbo[i]);
+#ifdef Buffer_Storage
+        if (irr_driver->hasBufferStorageExtension())
+        {
+            glBufferStorage(GL_ARRAY_BUFFER, 10000 * sizeof(InstanceData), 0, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT);
+            Ptr[i] = glMapBufferRange(GL_ARRAY_BUFFER, 0, 10000 * sizeof(InstanceData), GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT);
+        }
+        else
+#endif
+        {
+            glBufferData(GL_ARRAY_BUFFER, 10000 * sizeof(InstanceData), 0, GL_STREAM_DRAW);
+        }
+    }
 }
 
 static void cleanVAOMap(std::map<std::pair<video::E_VERTEX_TYPE, InstanceType>, GLuint> Map)
@@ -618,9 +631,7 @@ static void cleanVAOMap(std::map<std::pair<video::E_VERTEX_TYPE, InstanceType>,
 void VAOManager::cleanInstanceVAOs()
 {
     cleanVAOMap(InstanceVAO);
-    cleanVAOMap(ShadowInstanceVAO);
     InstanceVAO.clear();
-    ShadowInstanceVAO.clear();
 }
 
 VAOManager::~VAOManager()
@@ -639,7 +650,11 @@ VAOManager::~VAOManager()
         if (vao[i])
             glDeleteVertexArrays(1, &vao[i]);
     }
-    glDeleteBuffers(1, &instance_vbo[0]);
+    for (unsigned i = 0; i < InstanceTypeCount; i++)
+    {
+        glDeleteBuffers(1, &instance_vbo[i]);
+    }
+
 }
 
 void VAOManager::regenerateBuffer(enum VTXTYPE tp)
@@ -743,13 +758,11 @@ void VAOManager::regenerateInstancedVAO()
     enum video::E_VERTEX_TYPE IrrVT[] = { video::EVT_STANDARD, video::EVT_2TCOORDS, video::EVT_TANGENTS };
     for (unsigned i = 0; i < VTXTYPE_COUNT; i++)
     {
-        for (unsigned j = 0; j < InstanceTypeCount; j++)
-        {
             video::E_VERTEX_TYPE tp = IrrVT[i];
             if (!vbo[tp] || !ibo[tp])
                 continue;
             GLuint vao = createVAO(vbo[tp], ibo[tp], tp);
-            glBindBuffer(GL_ARRAY_BUFFER, instance_vbo[j]);
+            glBindBuffer(GL_ARRAY_BUFFER, instance_vbo[InstanceTypeDefault]);
 
             glEnableVertexAttribArray(7);
             glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
@@ -766,10 +779,10 @@ void VAOManager::regenerateInstancedVAO()
             glEnableVertexAttribArray(11);
             glVertexAttribIPointer(11, 2, GL_UNSIGNED_INT, sizeof(InstanceData), (GLvoid*)(9 * sizeof(float) + 2 * sizeof(unsigned)));
             glVertexAttribDivisor(11, 1);
-            InstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(tp, (InstanceType) j)] = vao;
+            InstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(tp, InstanceTypeDefault)] = vao;
 
-            GLuint shadow_vao = createVAO(vbo[tp], ibo[tp], tp);
-            glBindBuffer(GL_ARRAY_BUFFER, instance_vbo[j]);
+            vao = createVAO(vbo[tp], ibo[tp], tp);
+            glBindBuffer(GL_ARRAY_BUFFER, instance_vbo[InstanceTypeShadow]);
 
             glEnableVertexAttribArray(7);
             glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
@@ -784,11 +797,47 @@ void VAOManager::regenerateInstancedVAO()
             glVertexAttribIPointer(10, 2, GL_UNSIGNED_INT, sizeof(InstanceData), (GLvoid*)(9 * sizeof(float)));
             glVertexAttribDivisor(10, 1);
             glEnableVertexAttribArray(11);
-            glVertexAttribIPointer(11, 2, GL_UNSIGNED_INT, sizeof(InstanceData), (GLvoid*)(9 * sizeof(float)+2 * sizeof(unsigned)));
+            glVertexAttribIPointer(11, 2, GL_UNSIGNED_INT, sizeof(InstanceData), (GLvoid*)(9 * sizeof(float) + 2 * sizeof(unsigned)));
             glVertexAttribDivisor(11, 1);
-            ShadowInstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(tp, (InstanceType)j)] = shadow_vao;
+            InstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(tp, InstanceTypeShadow)] = vao;
+
+            vao = createVAO(vbo[tp], ibo[tp], tp);
+            glBindBuffer(GL_ARRAY_BUFFER, instance_vbo[InstanceTypeRSM]);
+
+            glEnableVertexAttribArray(7);
+            glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
+            glVertexAttribDivisor(7, 1);
+            glEnableVertexAttribArray(8);
+            glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(3 * sizeof(float)));
+            glVertexAttribDivisor(8, 1);
+            glEnableVertexAttribArray(9);
+            glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
+            glVertexAttribDivisor(9, 1);
+            glEnableVertexAttribArray(10);
+            glVertexAttribIPointer(10, 2, GL_UNSIGNED_INT, sizeof(InstanceData), (GLvoid*)(9 * sizeof(float)));
+            glVertexAttribDivisor(10, 1);
+            glEnableVertexAttribArray(11);
+            glVertexAttribIPointer(11, 2, GL_UNSIGNED_INT, sizeof(InstanceData), (GLvoid*)(9 * sizeof(float) + 2 * sizeof(unsigned)));
+            glVertexAttribDivisor(11, 1);
+            InstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(tp, InstanceTypeRSM)] = vao;
+
+            vao = createVAO(vbo[tp], ibo[tp], tp);
+            glBindBuffer(GL_ARRAY_BUFFER, instance_vbo[InstanceTypeGlow]);
+
+            glEnableVertexAttribArray(7);
+            glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(GlowInstanceData), 0);
+            glVertexAttribDivisor(7, 1);
+            glEnableVertexAttribArray(8);
+            glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, sizeof(GlowInstanceData), (GLvoid*)(3 * sizeof(float)));
+            glVertexAttribDivisor(8, 1);
+            glEnableVertexAttribArray(9);
+            glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(GlowInstanceData), (GLvoid*)(6 * sizeof(float)));
+            glVertexAttribDivisor(9, 1);
+            glEnableVertexAttribArray(12);
+            glVertexAttribPointer(12, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(GlowInstanceData), (GLvoid*)(9 * sizeof(float)));
+            glVertexAttribDivisor(12, 1);
+            InstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(tp, InstanceTypeGlow)] = vao;
             glBindVertexArray(0);
-        }
     }
 
 
diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index d973321d3..273cbdcb0 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -142,6 +142,9 @@ void saveCompressedTexture(const std::string& compressed_tex);
 enum InstanceType
 {
     InstanceTypeDefault,
+    InstanceTypeShadow,
+    InstanceTypeRSM,
+    InstanceTypeGlow,
     InstanceTypeCount,
 };
 
@@ -172,23 +175,53 @@ struct InstanceData
     uint64_t SecondTexture;
 #ifdef WIN32
 };
-#pragma pack(pop)
 #else
 } __attribute__((packed));
 #endif
 
+struct GlowInstanceData
+{
+    struct
+    {
+        float X;
+        float Y;
+        float Z;
+    } Origin;
+    struct
+    {
+        float X;
+        float Y;
+        float Z;
+    } Orientation;
+    struct
+    {
+        float X;
+        float Y;
+        float Z;
+    } Scale;
+    unsigned Color;
+#ifdef WIN32
+};
+#else
+} __attribute__((packed));
+#endif
+#ifdef WIN32
+#pragma pack(pop)
+#endif
+
 class VAOManager : public Singleton<VAOManager>
 {
     enum VTXTYPE { VTXTYPE_STANDARD, VTXTYPE_TCOORD, VTXTYPE_TANGENT, VTXTYPE_COUNT };
     GLuint vbo[VTXTYPE_COUNT], ibo[VTXTYPE_COUNT], vao[VTXTYPE_COUNT];
-    GLuint instance_vbo[1];
-    size_t instance_count[1];
+    GLuint instance_vbo[InstanceTypeCount];
+    size_t instance_count[InstanceTypeCount];
+    void *Ptr[InstanceTypeCount];
     void *VBOPtr[VTXTYPE_COUNT];
     std::vector<scene::IMeshBuffer *> storedCPUBuffer[VTXTYPE_COUNT];
     void *vtx_mirror[VTXTYPE_COUNT], *idx_mirror[VTXTYPE_COUNT];
     size_t vtx_cnt[VTXTYPE_COUNT], idx_cnt[VTXTYPE_COUNT];
     std::map<scene::IMeshBuffer*, unsigned> mappedBaseVertex[VTXTYPE_COUNT], mappedBaseIndex[VTXTYPE_COUNT];
-    std::map<std::pair<video::E_VERTEX_TYPE, InstanceType>, GLuint> InstanceVAO, ShadowInstanceVAO;
+    std::map<std::pair<video::E_VERTEX_TYPE, InstanceType>, GLuint> InstanceVAO;
 
     void cleanInstanceVAOs();
     void regenerateBuffer(enum VTXTYPE);
@@ -201,11 +234,12 @@ public:
     VAOManager();
     std::pair<unsigned, unsigned> getBase(scene::IMeshBuffer *);
     size_t appendInstance(enum InstanceType, const std::vector<InstanceData> &instance_data);
+    GLuint getInstanceBuffer(InstanceType it) { return instance_vbo[it]; }
+    void *getInstanceBufferPtr(InstanceType it) { return Ptr[it]; }
     unsigned getVBO(video::E_VERTEX_TYPE type) { return vbo[getVTXTYPE(type)]; }
     void *getVBOPtr(video::E_VERTEX_TYPE type) { return VBOPtr[getVTXTYPE(type)]; }
     unsigned getVAO(video::E_VERTEX_TYPE type) { return vao[getVTXTYPE(type)]; }
     unsigned getInstanceVAO(video::E_VERTEX_TYPE vt, enum InstanceType it) { return InstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(vt, it)]; }
-    unsigned getShadowInstanceVAO(video::E_VERTEX_TYPE vt, enum InstanceType it) { return ShadowInstanceVAO[std::pair<video::E_VERTEX_TYPE, InstanceType>(vt, it)]; }
     ~VAOManager();
 };
 
diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index 563852110..6108aa0a7 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -449,6 +449,12 @@ void ParticleSystemProxy::render() {
     draw();
 }
 
+bool ParticleSystemProxy::update()
+{
+    doParticleSystem(os::Timer::getTime());
+    return (IsVisible && (Particles.size() != 0));
+}
+
 void ParticleSystemProxy::OnRegisterSceneNode()
 {
     doParticleSystem(os::Timer::getTime());
diff --git a/src/graphics/gpuparticles.hpp b/src/graphics/gpuparticles.hpp
index 84fd72fab..94ca75f81 100644
--- a/src/graphics/gpuparticles.hpp
+++ b/src/graphics/gpuparticles.hpp
@@ -81,6 +81,7 @@ public:
     const float* getColorTo() const { return m_color_to; }
     void setHeightmap(const std::vector<std::vector<float> >&, float, float, float, float);
     void setFlip();
+    bool update();
 };
 
 #endif // GPUPARTICLES_H
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 8f2b9698a..16ff20163 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -166,6 +166,11 @@ void IrrDriver::IncreaseObjectCount()
     object_count[m_phase]++;
 }
 
+void IrrDriver::IncreasePolyCount(unsigned Polys)
+{
+    poly_count[m_phase] += Polys;
+}
+
 core::array<video::IRenderTarget> &IrrDriver::getMainSetup()
 {
   return m_mrt;
@@ -1631,6 +1636,7 @@ video::ITexture* IrrDriver::applyMask(video::ITexture* texture,
 // ----------------------------------------------------------------------------
 void IrrDriver::setRTT(RTT* rtt)
 {
+    memset(m_shadow_camnodes, 0, 4 * sizeof(void*));
     m_rtts = rtt;
 }
 // ----------------------------------------------------------------------------
@@ -1733,13 +1739,14 @@ void IrrDriver::displayFPS()
     if (UserConfigParams::m_artist_debug_mode)
     {
         sprintf(
-            buffer, "FPS: %i/%i/%i - Objects (P1:%d P2:%d T:%d) - LightDst : ~%d",
+            buffer, "FPS: %i/%i/%i - PolyCount (Solid:%d Shadows:%d) - LightDst : ~%d",
             min, fps, max,
-            object_count[SOLID_NORMAL_AND_DEPTH_PASS],
-            object_count[SOLID_NORMAL_AND_DEPTH_PASS],
-            object_count[TRANSPARENT_PASS],
+            poly_count[SOLID_NORMAL_AND_DEPTH_PASS],
+            poly_count[SHADOW_PASS],
             m_last_light_bucket_distance
         );
+        poly_count[SOLID_NORMAL_AND_DEPTH_PASS] = 0;
+        poly_count[SHADOW_PASS] = 0;
         object_count[SOLID_NORMAL_AND_DEPTH_PASS] = 0;
         object_count[SOLID_NORMAL_AND_DEPTH_PASS] = 0;
         object_count[TRANSPARENT_PASS] = 0;
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 1d2710cc0..3e5a671e9 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -359,12 +359,14 @@ private:
     /** Performance stats */
     unsigned             m_last_light_bucket_distance;
     unsigned             object_count[PASS_COUNT];
+    unsigned             poly_count[PASS_COUNT];
     u32                  m_renderpass;
     u32                  m_lensflare_query;
     bool                 m_query_issued;
     class STKMeshSceneNode *m_sun_interposer;
     scene::CLensFlareSceneNode *m_lensflare;
     scene::ICameraSceneNode *m_suncam;
+    scene::ICameraSceneNode *m_shadow_camnodes[4];
     float m_shadows_cam[4][24];
 
     std::vector<GlowData> m_glowing;
@@ -406,6 +408,7 @@ private:
     void renderLights(unsigned pointlightCount);
     void renderShadowsDebug();
     void doScreenShot();
+    void PrepareDrawCalls();
 public:
          IrrDriver();
         ~IrrDriver();
@@ -421,6 +424,7 @@ public:
         return sun_ortho_matrix;
     }
     void IncreaseObjectCount();
+    void IncreasePolyCount(unsigned);
     core::array<video::IRenderTarget> &getMainSetup();
     void updateConfigIfRelevant();
     void setAllMaterialFlags(scene::IMesh *mesh) const;
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index f3f830fd6..18c97b305 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -47,6 +47,7 @@
 #include "utils/helpers.hpp"
 #include "utils/log.hpp"
 #include "utils/profiler.hpp"
+#include "stkscenemanager.hpp"
 
 #include <algorithm>
 #include <limits>
@@ -269,10 +270,35 @@ void IrrDriver::renderGLSL(float dt)
     getPostProcessing()->update(dt);
 }
 
+static GLsync m_sync;
+
 void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned pointlightcount, std::vector<GlowData>& glows, float dt, bool hasShadow, bool forceRTT)
 {
     glBindBufferBase(GL_UNIFORM_BUFFER, 0, SharedObject::ViewProjectionMatrixesUBO);
+    m_scene_manager->setActiveCamera(camnode);
 
+    // Add a 1 s timeout
+    if (!m_sync)
+        m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+    GLenum reason = glClientWaitSync(m_sync, GL_SYNC_FLUSH_COMMANDS_BIT, 1000000000);
+    /*    switch (reason)
+    {
+    case GL_ALREADY_SIGNALED:
+    printf("Already Signaled\n");
+    break;
+    case GL_TIMEOUT_EXPIRED:
+    printf("Timeout Expired\n");
+    break;
+    case GL_CONDITION_SATISFIED:
+    printf("Condition Satisfied\n");
+    break;
+    case GL_WAIT_FAILED:
+    printf("Wait Failed\n");
+    break;
+    }*/
+    PROFILER_PUSH_CPU_MARKER("- Draw Call Generation", 0xFF, 0xFF, 0xFF);
+    PrepareDrawCalls();
+    PROFILER_POP_CPU_MARKER();
     // Shadows
     {
         PROFILER_PUSH_CPU_MARKER("- Shadow", 0x30, 0x6F, 0x90);
@@ -323,6 +349,8 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
     renderSolidSecondPass();
     PROFILER_POP_CPU_MARKER();
 
+    m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+
     if (getNormals())
     {
         m_rtts->getFBO(FBO_NORMAL_AND_DEPTHS).Bind();
@@ -514,7 +542,9 @@ void IrrDriver::renderParticles()
     glDisable(GL_CULL_FACE);
     glEnable(GL_BLEND);
     glBlendEquation(GL_FUNC_ADD);
-    m_scene_manager->drawAll(scene::ESNRP_TRANSPARENT_EFFECT);
+    for (unsigned i = 0; i < ParticlesList::getInstance()->size(); ++i)
+        ParticlesList::getInstance()->at(i)->render();
+//    m_scene_manager->drawAll(scene::ESNRP_TRANSPARENT_EFFECT);
 }
 
 /** Given a matrix transform and a set of points returns an orthogonal projection matrix that maps coordinates of
@@ -593,6 +623,11 @@ void IrrDriver::computeCameraMatrix(scene::ICameraSceneNode * const camnode, siz
     memcpy(&tmp[48], irr_driver->getInvProjMatrix().pointer(), 16 * sizeof(float));
 
     const core::matrix4 &SunCamViewMatrix = m_suncam->getViewMatrix();
+    for (unsigned i = 0; i < 4; i++)
+    {
+        if (!m_shadow_camnodes[i])
+            m_shadow_camnodes[i] = (scene::ICameraSceneNode *) m_suncam->clone();
+    }
     sun_ortho_matrix.clear();
 
     if (World::getWorld() && World::getWorld()->getTrack())
@@ -670,8 +705,8 @@ void IrrDriver::computeCameraMatrix(scene::ICameraSceneNode * const camnode, siz
             const float units_per_w = w / 1024;
             const float units_per_h = h / 1024;*/
 
-            m_suncam->setProjectionMatrix(getTighestFitOrthoProj(SunCamViewMatrix, vectors) , true);
-            m_suncam->render();
+            m_shadow_camnodes[i]->setProjectionMatrix(getTighestFitOrthoProj(SunCamViewMatrix, vectors) , true);
+            m_shadow_camnodes[i]->render();
 
             sun_ortho_matrix.push_back(getVideoDriver()->getTransform(video::ETS_PROJECTION) * getVideoDriver()->getTransform(video::ETS_VIEW));
         }
@@ -773,16 +808,35 @@ void IrrDriver::renderGlow(std::vector<GlowData>& glows)
     for (u32 i = 0; i < glowcount; i++)
     {
         const GlowData &dat = glows[i];
-        scene::ISceneNode * const cur = dat.node;
+        scene::ISceneNode * cur = dat.node;
 
-        //TODO : implement culling on gpu
-        // Quick box-based culling
-//        const core::aabbox3df nodebox = cur->getTransformedBoundingBox();
-//        if (!nodebox.intersectsWithBox(cambox))
-//            continue;
+        STKMeshSceneNode *node = static_cast<STKMeshSceneNode *>(cur);
+        node->setGlowColors(SColor(0, dat.b * 255.f, dat.g * 255.f, dat.r * 255.f));
+        if (!irr_driver->hasARB_draw_indirect())
+            node->render();
+    }
 
-        cb->setColor(dat.r, dat.g, dat.b);
-        cur->render();
+    if (irr_driver->hasARB_draw_indirect())
+    {
+        glBindBuffer(GL_DRAW_INDIRECT_BUFFER, GlowPassCmd::getInstance()->drawindirectcmd);
+        glUseProgram(MeshShader::InstancedColorizeShader::getInstance()->Program);
+
+        glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeGlow));
+        if (UserConfigParams::m_azdo)
+        {
+            if (GlowPassCmd::getInstance()->Size)
+            {
+                glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT,
+                    (const void*)(GlowPassCmd::getInstance()->Offset * sizeof(DrawElementsIndirectCommand)),
+                    GlowPassCmd::getInstance()->Size,
+                    sizeof(DrawElementsIndirectCommand));
+            }
+        }
+        else
+        {
+            for (unsigned i = 0; i < ListInstancedGlow::getInstance()->size(); i++)
+                glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)((GlowPassCmd::getInstance()->Offset + i) * sizeof(DrawElementsIndirectCommand)));
+        }
     }
 
     glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 77122a46a..a5192585d 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -117,16 +117,16 @@ struct custom_unroll_args<N, List...>
 
 
 template<typename Shader, enum E_VERTEX_TYPE VertexType, int ...List, typename... TupleType>
-void renderMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes)
+void renderMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > &meshes)
 {
     glUseProgram(Shader::getInstance()->Program);
     if (irr_driver->hasARB_base_instance())
         glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
-    for (unsigned i = 0; i < meshes->size(); i++)
+    for (unsigned i = 0; i < meshes.size(); i++)
     {
         std::vector<GLuint> Textures;
         std::vector<uint64_t> Handles;
-        GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
+        GLMesh &mesh = *(STK::tuple_get<0>(meshes.at(i)));
         if (!irr_driver->hasARB_base_instance())
             glBindVertexArray(mesh.vao);
         for (unsigned j = 0; j < TexUnits.size(); j++)
@@ -148,68 +148,33 @@ void renderMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
             Shader::getInstance()->SetTextureHandles(Handles);
         else
             Shader::getInstance()->SetTextureUnits(Textures);
-        custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
+        custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes.at(i));
     }
 }
 
-template<int...List>
-struct instanced_custom_unroll_args;
-
-template<>
-struct instanced_custom_unroll_args<>
-{
-    template<typename T, typename ...TupleTypes, typename ...Args>
-    static void exec(const T *Shader, const STK::Tuple<TupleTypes...> &t, Args... args)
-    {
-        const GLMesh *mesh = STK::tuple_get<0>(t);
-        size_t instance_count = STK::tuple_get<1>(t);
-        irr_driver->IncreaseObjectCount();
-        GLenum ptype = mesh->PrimitiveType;
-        GLenum itype = mesh->IndexType;
-        size_t count = mesh->IndexCount;
-
-        Shader->setUniforms(args...);
-#ifdef Base_Instance_Support
-        if (irr_driver->hasARB_base_instance())
-            glDrawElementsInstancedBaseVertexBaseInstance(ptype, count, itype, (const void*)mesh->vaoOffset, instance_count, mesh->vaoBaseVertex, mesh->vaoBaseInstance);
-        else
-#endif
-            glDrawElementsInstanced(ptype, count, itype, 0, instance_count);
-    }
-};
-
-template<int N, int...List>
-struct instanced_custom_unroll_args<N, List...>
-{
-    template<typename T, typename ...TupleTypes, typename ...Args>
-    static void exec(const T *Shader, const STK::Tuple<TupleTypes...> &t, Args... args)
-    {
-        instanced_custom_unroll_args<List...>::template exec<T>(Shader, t, STK::tuple_get<N>(t), args...);
-    }
-};
-
-template<typename Shader, enum E_VERTEX_TYPE VertexType, int ...List, typename... TupleType>
-void renderInstancedMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes)
+#ifdef Draw_Indirect
+template<typename Shader, MeshMaterial Mat, video::E_VERTEX_TYPE VT, typename...Args>
+void renderInstancedMeshes1stPass(const std::vector<TexUnit> &TexUnits, std::vector<GLMesh *> &meshes, Args...args)
 {
     glUseProgram(Shader::getInstance()->Program);
-    for (unsigned i = 0; i < meshes->size(); i++)
+    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(VT, InstanceTypeDefault));
+    for (unsigned i = 0; i < meshes.size(); i++)
     {
         std::vector<GLuint> Textures;
-        GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
+        GLMesh *mesh = meshes[i];
 #ifdef DEBUG
-        if (mesh.VAOType != VertexType)
+        if (mesh->VAOType != VT)
             Log::error("RenderGeometry", "Wrong instanced vertex format");
 #endif
-        if (!irr_driver->hasARB_base_instance())
-            glBindVertexArray(mesh.vao);
         for (unsigned j = 0; j < TexUnits.size(); j++)
-            Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
+            Textures.push_back(getTextureGLuint(mesh->textures[TexUnits[j].m_id]));
         Shader::getInstance()->SetTextureUnits(Textures);
-        instanced_custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
+
+        Shader::getInstance()->setUniforms(args...);
+        glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)((SolidPassCmd::getInstance()->Offset[Mat] + i) * sizeof(DrawElementsIndirectCommand)));
     }
 }
-
-static GLsync m_sync;
+#endif
 
 #ifdef Multi_Draw_Indirect
 template<typename Shader, MeshMaterial Mat, video::E_VERTEX_TYPE VT, typename...Args>
@@ -228,9 +193,11 @@ void multidraw1stPass(Args...args)
 }
 #endif
 
+static core::vector3df windDir;
 
 void IrrDriver::renderSolidFirstPass()
 {
+    windDir = getWindDir();
     m_rtts->getFBO(FBO_NORMAL_AND_DEPTHS).Bind();
     glClearColor(0., 0., 0., 0.);
     glDepthMask(GL_TRUE);
@@ -241,166 +208,88 @@ void IrrDriver::renderSolidFirstPass()
     glDisable(GL_ALPHA_TEST);
     glDisable(GL_BLEND);
     glEnable(GL_CULL_FACE);
-    irr_driver->setPhase(SOLID_NORMAL_AND_DEPTH_PASS);
-    ListMatDefault::getInstance()->clear();
-    ListMatAlphaRef::getInstance()->clear();
-    ListMatSphereMap::getInstance()->clear();
-    ListMatDetails::getInstance()->clear();
-    ListMatUnlit::getInstance()->clear();
-    ListMatNormalMap::getInstance()->clear();
-    ListMatGrass::getInstance()->clear();
-    ListMatSplatting::getInstance()->clear();
-    ListInstancedMatDefault::getInstance()->clear();
-    ListInstancedMatAlphaRef::getInstance()->clear();
-    ListInstancedMatGrass::getInstance()->clear();
-    ListInstancedMatNormalMap::getInstance()->clear();
-    // Add a 30 ms timeout
-    if (!m_sync)
-        m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-    GLenum reason = glClientWaitSync(m_sync, GL_SYNC_FLUSH_COMMANDS_BIT, 30000000);
-/*    switch (reason)
-    {
-    case GL_ALREADY_SIGNALED:
-        printf("Already Signaled\n");
-        break;
-    case GL_TIMEOUT_EXPIRED:
-        printf("Timeout Expired\n");
-        break;
-    case GL_CONDITION_SATISFIED:
-        printf("Condition Satisfied\n");
-        break;
-    case GL_WAIT_FAILED:
-        printf("Wait Failed\n");
-        break;
-    }*/
-    m_scene_manager->drawAll(scene::ESNRP_SOLID);
 
     if (!UserConfigParams::m_dynamic_lights)
         return;
 
     {
         ScopedGPUTimer Timer(getGPUTimer(Q_SOLID_PASS1));
+        irr_driver->setPhase(SOLID_NORMAL_AND_DEPTH_PASS);
+
+        for (unsigned i = 0; i < ImmediateDrawList::getInstance()->size(); i++)
+            ImmediateDrawList::getInstance()->at(i)->render();
 
         std::vector<TexUnit> object_pass1_texunits = TexUnits(TexUnit(0, true) );
-        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_STANDARD, 2, 1>(object_pass1_texunits, ListMatDefault::getInstance());
-        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_STANDARD, 2, 1>(object_pass1_texunits, ListMatSphereMap::getInstance());
-        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_2TCOORDS, 2, 1>(object_pass1_texunits, ListMatDetails::getInstance());
-        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_2TCOORDS, 2, 1>(object_pass1_texunits, ListMatSplatting::getInstance());
-        renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(object_pass1_texunits, ListMatUnlit::getInstance());
-        renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(0, true)), ListMatAlphaRef::getInstance());
-        renderMeshes1stPass<MeshShader::GrassPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(0, true)), ListMatGrass::getInstance());
+        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_STANDARD, 2, 1>(object_pass1_texunits, ListMatDefault::getInstance()->SolidPass);
+        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_2TCOORDS, 2, 1>(object_pass1_texunits, ListMatSplatting::getInstance()->SolidPass);
+        renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(object_pass1_texunits, ListMatUnlit::getInstance()->SolidPass);
+        renderMeshes1stPass<MeshShader::ObjectRefPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(0, true)), ListMatAlphaRef::getInstance()->SolidPass);
+        renderMeshes1stPass<MeshShader::GrassPass1Shader, video::EVT_STANDARD, 3, 2, 1>(TexUnits(TexUnit(0, true)), ListMatGrass::getInstance()->SolidPass);
         renderMeshes1stPass<MeshShader::NormalMapShader, video::EVT_TANGENTS, 2, 1>(TexUnits(
             TexUnit(1, false),
             TexUnit(0, true)
-        ), ListMatNormalMap::getInstance());
+            ), ListMatNormalMap::getInstance()->SolidPass);
+        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_STANDARD, 2, 1>(object_pass1_texunits, ListMatSphereMap::getInstance()->SolidPass);
+        renderMeshes1stPass<MeshShader::ObjectPass1Shader, video::EVT_2TCOORDS, 2, 1>(object_pass1_texunits, ListMatDetails::getInstance()->SolidPass);
+
+        if (irr_driver->hasARB_draw_indirect())
+            glBindBuffer(GL_DRAW_INDIRECT_BUFFER, SolidPassCmd::getInstance()->drawindirectcmd);
 
         if (UserConfigParams::m_azdo)
         {
-            glBindBuffer(GL_DRAW_INDIRECT_BUFFER, SolidPassCmd::getInstance()->drawindirectcmd);
-            DrawElementsIndirectCommand *CommandBufferPtr = SolidPassCmd::getInstance()->Ptr;
-
-            size_t offset = 0;
-            SolidPassCmd::getInstance()->Offset[MAT_DEFAULT] = offset;
-            for (unsigned i = 0; i < ListInstancedMatDefault::getInstance()->size(); i++)
-            {
-                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatDefault::getInstance()->at(i)));
-                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatDefault::getInstance()->at(i));
-                DrawElementsIndirectCommand &CurrentCommand = CommandBufferPtr[offset++];
-                CurrentCommand.instanceCount = instanceCount;
-                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
-                CurrentCommand.count = mesh.IndexCount;
-                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
-                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
-            }
-            SolidPassCmd::getInstance()->Size[MAT_DEFAULT] = ListInstancedMatDefault::getInstance()->size();
-
-            SolidPassCmd::getInstance()->Offset[MAT_NORMAL_MAP] = offset;
-            for (unsigned i = 0; i < ListInstancedMatNormalMap::getInstance()->size(); i++)
-            {
-                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatNormalMap::getInstance()->at(i)));
-                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatNormalMap::getInstance()->at(i));
-                DrawElementsIndirectCommand &CurrentCommand = CommandBufferPtr[offset++];
-                CurrentCommand.instanceCount = instanceCount;
-                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
-                CurrentCommand.count = mesh.IndexCount;
-                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
-                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
-            }
-            SolidPassCmd::getInstance()->Size[MAT_NORMAL_MAP] = ListInstancedMatNormalMap::getInstance()->size();
-
-            SolidPassCmd::getInstance()->Offset[MAT_ALPHA_REF] = offset;
-            for (unsigned i = 0; i < ListInstancedMatAlphaRef::getInstance()->size(); i++)
-            {
-                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatAlphaRef::getInstance()->at(i)));
-                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatAlphaRef::getInstance()->at(i));
-                DrawElementsIndirectCommand &CurrentCommand = CommandBufferPtr[offset++];
-                CurrentCommand.instanceCount = instanceCount;
-                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
-                CurrentCommand.count = mesh.IndexCount;
-                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
-                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
-            }
-            SolidPassCmd::getInstance()->Size[MAT_ALPHA_REF] = ListInstancedMatAlphaRef::getInstance()->size();
-
-            SolidPassCmd::getInstance()->Offset[MAT_GRASS] = offset;
-            for (unsigned i = 0; i < ListInstancedMatGrass::getInstance()->size(); i++)
-            {
-                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatGrass::getInstance()->at(i)));
-                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatGrass::getInstance()->at(i));
-                DrawElementsIndirectCommand &CurrentCommand = CommandBufferPtr[offset++];
-                CurrentCommand.instanceCount = instanceCount;
-                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
-                CurrentCommand.count = mesh.IndexCount;
-                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
-                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
-            }
-            SolidPassCmd::getInstance()->Size[MAT_GRASS] = ListInstancedMatGrass::getInstance()->size();
 #ifdef Multi_Draw_Indirect
             multidraw1stPass<MeshShader::InstancedObjectPass1Shader, MAT_DEFAULT, video::EVT_STANDARD>();
             multidraw1stPass<MeshShader::InstancedObjectRefPass1Shader, MAT_ALPHA_REF, video::EVT_STANDARD>();
             multidraw1stPass<MeshShader::InstancedNormalMapShader, MAT_NORMAL_MAP, video::EVT_TANGENTS>();
-            core::vector3df dir = ListInstancedMatGrass::getInstance()->empty() ? core::vector3df(0., 0., 0.) : STK::tuple_get<2>(ListInstancedMatGrass::getInstance()->at(0));
-            multidraw1stPass<MeshShader::InstancedGrassPass1Shader, MAT_GRASS, video::EVT_STANDARD>(dir);
+            multidraw1stPass<MeshShader::InstancedObjectPass1Shader, MAT_SPHEREMAP, video::EVT_STANDARD>();
+            multidraw1stPass<MeshShader::InstancedObjectPass1Shader, MAT_DETAIL, video::EVT_2TCOORDS>();
+            multidraw1stPass<MeshShader::InstancedObjectRefPass1Shader, MAT_UNLIT, video::EVT_STANDARD>();
+            multidraw1stPass<MeshShader::InstancedGrassPass1Shader, MAT_GRASS, video::EVT_STANDARD>(windDir);
 #endif
         }
-        else
+#ifdef Draw_Indirect
+        else if (irr_driver->hasARB_draw_indirect())
         {
-            if (irr_driver->hasARB_base_instance())
-                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            renderInstancedMeshes1stPass<MeshShader::InstancedObjectPass1Shader, video::EVT_STANDARD>(
-                TexUnits(TexUnit(0, true)),
-                ListInstancedMatDefault::getInstance());
-            if (irr_driver->hasARB_base_instance())
-                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            renderInstancedMeshes1stPass<MeshShader::InstancedObjectRefPass1Shader, video::EVT_STANDARD>(
-                TexUnits(TexUnit(0, true)),
-                ListInstancedMatAlphaRef::getInstance());
-            if (irr_driver->hasARB_base_instance())
-                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            renderInstancedMeshes1stPass<MeshShader::InstancedGrassPass1Shader, video::EVT_STANDARD, 2>(
-                TexUnits(TexUnit(0, true)),
-                ListInstancedMatGrass::getInstance());
-            if (irr_driver->hasARB_base_instance())
-                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
-            renderInstancedMeshes1stPass<MeshShader::InstancedNormalMapShader, video::EVT_TANGENTS>(
-                TexUnits(TexUnit(1, false), TexUnit(0, true)),
-                ListInstancedMatNormalMap::getInstance());
+            // Default
+            renderInstancedMeshes1stPass<MeshShader::InstancedObjectPass1Shader, MAT_DEFAULT, video::EVT_STANDARD>(
+                TexUnits(TexUnit(0, true)), ListInstancedMatDefault::getInstance()->SolidPass);
+            // Alpha ref
+            renderInstancedMeshes1stPass<MeshShader::InstancedObjectRefPass1Shader, MAT_ALPHA_REF, video::EVT_STANDARD>(
+                TexUnits(TexUnit(0, true)), ListInstancedMatAlphaRef::getInstance()->SolidPass);
+            // Unlit
+            renderInstancedMeshes1stPass<MeshShader::InstancedObjectPass1Shader, MAT_UNLIT, video::EVT_STANDARD>(
+                TexUnits(TexUnit(0, true)), ListInstancedMatUnlit::getInstance()->SolidPass);
+            // Spheremap
+            renderInstancedMeshes1stPass<MeshShader::InstancedObjectPass1Shader, MAT_SPHEREMAP, video::EVT_STANDARD>(
+                TexUnits(TexUnit(0, true)), ListInstancedMatSphereMap::getInstance()->SolidPass);
+            // Grass
+            renderInstancedMeshes1stPass<MeshShader::InstancedGrassPass1Shader, MAT_GRASS, video::EVT_STANDARD>(
+                TexUnits(TexUnit(0, true)), ListInstancedMatGrass::getInstance()->SolidPass, windDir);
+
+            // Detail
+            renderInstancedMeshes1stPass<MeshShader::InstancedObjectPass1Shader, MAT_DETAIL, video::EVT_2TCOORDS>(
+                TexUnits(TexUnit(0, true)), ListInstancedMatDetails::getInstance()->SolidPass);
+
+            // Normal Map
+            renderInstancedMeshes1stPass<MeshShader::InstancedNormalMapShader, MAT_NORMAL_MAP, video::EVT_TANGENTS>(
+                TexUnits(TexUnit(1, false), TexUnit(0, true)), ListInstancedMatNormalMap::getInstance()->SolidPass);
         }
+#endif
     }
 }
 
 template<typename Shader, enum E_VERTEX_TYPE VertexType, int...List, typename... TupleType>
-void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes, const std::vector<uint64_t> &Prefilled_Handle,
+void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > &meshes, const std::vector<uint64_t> &Prefilled_Handle,
     const std::vector<GLuint> &Prefilled_Tex)
 {
     glUseProgram(Shader::getInstance()->Program);
     if (irr_driver->hasARB_base_instance())
         glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
-    for (unsigned i = 0; i < meshes->size(); i++)
+    for (unsigned i = 0; i < meshes.size(); i++)
     {
         std::vector<uint64_t> Handles(Prefilled_Handle);
         std::vector<GLuint> Textures(Prefilled_Tex);
-        GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
+        GLMesh &mesh = *(STK::tuple_get<0>(meshes.at(i)));
         if (!irr_driver->hasARB_base_instance())
             glBindVertexArray(mesh.vao);
         for (unsigned j = 0; j < TexUnits.size(); j++)
@@ -423,27 +312,28 @@ void renderMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::
             Shader::getInstance()->SetTextureHandles(Handles);
         else
             Shader::getInstance()->SetTextureUnits(Textures);
-        custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
+        custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes.at(i));
     }
 }
 
-template<typename Shader, int...List, typename... TupleType>
-void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes, const std::vector<GLuint> &Prefilled_tex)
+#ifdef Draw_Indirect
+template<typename Shader, MeshMaterial Mat, video::E_VERTEX_TYPE VT, typename...Args>
+void renderInstancedMeshes2ndPass(const std::vector<TexUnit> &TexUnits, const std::vector<GLuint> &Prefilled_tex, std::vector<GLMesh *> &meshes, Args...args)
 {
     glUseProgram(Shader::getInstance()->Program);
-    for (unsigned i = 0; i < meshes->size(); i++)
+    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(VT, InstanceTypeDefault));
+    for (unsigned i = 0; i < meshes.size(); i++)
     {
-        GLMesh &mesh = *(STK::tuple_get<0>(meshes->at(i)));
-        if (!irr_driver->hasARB_base_instance())
-            glBindVertexArray(mesh.vao);
-
+        GLMesh *mesh = meshes[i];
         std::vector<GLuint> Textures(Prefilled_tex);
         for (unsigned j = 0; j < TexUnits.size(); j++)
-            Textures.push_back(getTextureGLuint(mesh.textures[TexUnits[j].m_id]));
+            Textures.push_back(getTextureGLuint(mesh->textures[TexUnits[j].m_id]));
         Shader::getInstance()->SetTextureUnits(Textures);
-        instanced_custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
+        Shader::getInstance()->setUniforms(args...);
+        glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)((SolidPassCmd::getInstance()->Offset[Mat] + i) * sizeof(DrawElementsIndirectCommand)));
     }
 }
+#endif
 
 #ifdef Multi_Draw_Indirect
 template<typename Shader, MeshMaterial Mat, video::E_VERTEX_TYPE VT, typename...Args>
@@ -463,7 +353,6 @@ void multidraw2ndPass(const std::vector<uint64_t> &Handles, Args... args)
 }
 #endif
 
-
 void IrrDriver::renderSolidSecondPass()
 {
     SColor clearColor(0, 150, 150, 150);
@@ -513,41 +402,43 @@ void IrrDriver::renderSolidSecondPass()
     {
         ScopedGPUTimer Timer(getGPUTimer(Q_SOLID_PASS2));
 
-        m_scene_manager->drawAll(scene::ESNRP_SOLID);
+        irr_driver->setPhase(SOLID_LIT_PASS);
+
+        for (unsigned i = 0; i < ImmediateDrawList::getInstance()->size(); i++)
+            ImmediateDrawList::getInstance()->at(i)->render();
 
         std::vector<GLuint> DiffSpecSSAOTex = createVector<GLuint>(m_rtts->getRenderTarget(RTT_DIFFUSE), m_rtts->getRenderTarget(RTT_SPECULAR), m_rtts->getRenderTarget(RTT_HALF1_R));
 
         renderMeshes2ndPass<MeshShader::ObjectPass2Shader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(0, true)
-        ), ListMatDefault::getInstance(),
+        ), ListMatDefault::getInstance()->SolidPass,
         createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
         renderMeshes2ndPass<MeshShader::ObjectRefPass2Shader, video::EVT_STANDARD, 3, 1 >(TexUnits(
             TexUnit(0, true)
-            ), ListMatAlphaRef::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-        renderMeshes2ndPass<MeshShader::SphereMapShader, video::EVT_STANDARD, 2, 1>(TexUnits(
-            TexUnit(0, true)
-            ), ListMatSphereMap::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-        renderMeshes2ndPass<MeshShader::DetailledObjectPass2Shader, video::EVT_2TCOORDS, 1>(TexUnits(
-            TexUnit(0, true),
-            TexUnit(1, true)
-            ), ListMatDetails::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-        renderMeshes2ndPass<MeshShader::GrassPass2Shader, video::EVT_STANDARD, 3, 1>(TexUnits(
-            TexUnit(0, true)
-            ), ListMatGrass::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
+            ), ListMatAlphaRef::getInstance()->SolidPass, createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
         renderMeshes2ndPass<MeshShader::ObjectUnlitShader, video::EVT_STANDARD, 3, 1>(TexUnits(
             TexUnit(0, true)
-            ), ListMatUnlit::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
-
+            ), ListMatUnlit::getInstance()->SolidPass, createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
         renderMeshes2ndPass<MeshShader::SplattingShader, video::EVT_2TCOORDS, 1>(TexUnits(
             TexUnit(1, false),
             TexUnit(2, true),
             TexUnit(3, true),
             TexUnit(4, true),
             TexUnit(5, true)
-            ), ListMatSplatting::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
+            ), ListMatSplatting::getInstance()->SolidPass, createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
+        renderMeshes2ndPass<MeshShader::SphereMapShader, video::EVT_STANDARD, 2, 1>(TexUnits(
+            TexUnit(0, true)
+            ), ListMatSphereMap::getInstance()->SolidPass, createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
+        renderMeshes2ndPass<MeshShader::DetailledObjectPass2Shader, video::EVT_2TCOORDS, 1>(TexUnits(
+            TexUnit(0, true),
+            TexUnit(1, true)
+            ), ListMatDetails::getInstance()->SolidPass, createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
+        renderMeshes2ndPass<MeshShader::GrassPass2Shader, video::EVT_STANDARD, 3, 1>(TexUnits(
+            TexUnit(0, true)
+            ), ListMatGrass::getInstance()->SolidPass, createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
         renderMeshes2ndPass<MeshShader::ObjectPass2Shader, video::EVT_TANGENTS, 3, 1>(TexUnits(
             TexUnit(0, true)
-            ), ListMatNormalMap::getInstance(), createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
+            ), ListMatNormalMap::getInstance()->SolidPass, createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
 
         if (UserConfigParams::m_azdo)
         {
@@ -555,38 +446,44 @@ void IrrDriver::renderSolidSecondPass()
             multidraw2ndPass<MeshShader::InstancedObjectPass2Shader, MAT_DEFAULT, video::EVT_STANDARD>(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0));
             multidraw2ndPass<MeshShader::InstancedObjectPass2Shader, MAT_NORMAL_MAP, video::EVT_TANGENTS>(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0));
             multidraw2ndPass<MeshShader::InstancedObjectRefPass2Shader, MAT_ALPHA_REF, video::EVT_STANDARD>(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0));
-            core::vector3df dir = ListInstancedMatGrass::getInstance()->empty() ? core::vector3df(0., 0., 0.) : STK::tuple_get<2>(ListInstancedMatGrass::getInstance()->at(0));
+            multidraw2ndPass<MeshShader::InstancedSphereMapShader, MAT_SPHEREMAP, video::EVT_STANDARD>(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0));
+            multidraw2ndPass<MeshShader::InstancedDetailledObjectPass2Shader, MAT_DETAIL, video::EVT_2TCOORDS>(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0, 0));
+            multidraw2ndPass<MeshShader::InstancedObjectUnlitShader, MAT_UNLIT, video::EVT_STANDARD>(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, 0));
             SunLightProvider * const cb = (SunLightProvider *)irr_driver->getCallback(ES_SUNLIGHT);
-            multidraw2ndPass<MeshShader::InstancedGrassPass2Shader, MAT_GRASS, video::EVT_STANDARD>(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, DepthHandle, 0), dir, cb->getPosition());
+            multidraw2ndPass<MeshShader::InstancedGrassPass2Shader, MAT_GRASS, video::EVT_STANDARD>(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, DepthHandle, 0), windDir, cb->getPosition());
 #endif
         }
-        else
+#ifdef Draw_Indirect
+        else if (irr_driver->hasARB_draw_indirect())
         {
-            if (irr_driver->hasARB_base_instance())
-                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            renderInstancedMeshes2ndPass<MeshShader::InstancedObjectPass2Shader>(
-                TexUnits(TexUnit(0, true)),
-                ListInstancedMatDefault::getInstance(), DiffSpecSSAOTex);
-            if (irr_driver->hasARB_base_instance())
-                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
-            renderInstancedMeshes2ndPass<MeshShader::InstancedObjectPass2Shader>(
-                TexUnits(TexUnit(0, true)),
-                ListInstancedMatNormalMap::getInstance(), DiffSpecSSAOTex);
-            if (irr_driver->hasARB_base_instance())
-                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            renderInstancedMeshes2ndPass<MeshShader::InstancedObjectRefPass2Shader>(
-                TexUnits(TexUnit(0, true)),
-                ListInstancedMatAlphaRef::getInstance(), DiffSpecSSAOTex);
-            if (irr_driver->hasARB_base_instance())
-                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            DiffSpecSSAOTex.push_back(irr_driver->getDepthStencilTexture());
-            renderInstancedMeshes2ndPass<MeshShader::InstancedGrassPass2Shader, 3, 2>(
-                TexUnits(TexUnit(0, true)),
-                ListInstancedMatGrass::getInstance(), DiffSpecSSAOTex);
-        }
+            // Default
+            renderInstancedMeshes2ndPass<MeshShader::InstancedObjectPass2Shader, MAT_DEFAULT, video::EVT_STANDARD>(
+                TexUnits(TexUnit(0, true)), DiffSpecSSAOTex, ListInstancedMatDefault::getInstance()->SolidPass);
+            // Alpha ref
+            renderInstancedMeshes2ndPass<MeshShader::InstancedObjectRefPass2Shader, MAT_ALPHA_REF, video::EVT_STANDARD>(
+                TexUnits(TexUnit(0, true)), DiffSpecSSAOTex, ListInstancedMatAlphaRef::getInstance()->SolidPass);
+            // Unlit
+            renderInstancedMeshes2ndPass<MeshShader::InstancedObjectUnlitShader, MAT_UNLIT, video::EVT_STANDARD>(
+                TexUnits(TexUnit(0, true)), DiffSpecSSAOTex, ListInstancedMatUnlit::getInstance()->SolidPass);
+            // Spheremap
+            renderInstancedMeshes2ndPass<MeshShader::InstancedSphereMapShader, MAT_SPHEREMAP, video::EVT_STANDARD>(
+                TexUnits(TexUnit(0, true)), DiffSpecSSAOTex, ListInstancedMatSphereMap::getInstance()->SolidPass);
+            // Details
+            renderInstancedMeshes2ndPass<MeshShader::InstancedDetailledObjectPass2Shader, MAT_DETAIL, video::EVT_2TCOORDS>(
+                TexUnits(TexUnit(0, true), TexUnit(1, false)), DiffSpecSSAOTex, ListInstancedMatDetails::getInstance()->SolidPass);
 
+            // Normal map
+            renderInstancedMeshes2ndPass<MeshShader::InstancedObjectPass2Shader, MAT_NORMAL_MAP, video::EVT_TANGENTS>(
+                TexUnits(TexUnit(0, true)), DiffSpecSSAOTex, ListInstancedMatNormalMap::getInstance()->SolidPass);
+
+            // Grass
+            SunLightProvider * const cb = (SunLightProvider *)irr_driver->getCallback(ES_SUNLIGHT);
+            DiffSpecSSAOTex.push_back(irr_driver->getDepthStencilTexture());
+            renderInstancedMeshes2ndPass<MeshShader::InstancedGrassPass2Shader, MAT_GRASS, video::EVT_STANDARD>(
+                TexUnits(TexUnit(0, true)), DiffSpecSSAOTex, ListInstancedMatGrass::getInstance()->SolidPass, windDir, cb->getPosition());
+        }
+#endif
     }
-    m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
 }
 
 template<enum E_VERTEX_TYPE VertexType, typename... TupleType>
@@ -611,15 +508,14 @@ static void renderMeshNormals(std::vector<STK::Tuple<TupleType...> > *meshes)
 
 void IrrDriver::renderNormalsVisualisation()
 {
-    renderMeshNormals<video::EVT_STANDARD>(ListMatDefault::getInstance());
-    renderMeshNormals<video::EVT_STANDARD>(ListMatAlphaRef::getInstance());
-    renderMeshNormals<video::EVT_STANDARD>(ListMatSphereMap::getInstance());
+//    renderMeshNormals<video::EVT_STANDARD>(ListMatDefault::getInstance());
+//    renderMeshNormals<video::EVT_STANDARD>(ListMatAlphaRef::getInstance());
+//    renderMeshNormals<video::EVT_STANDARD>(ListMatSphereMap::getInstance());
 //    renderMeshNormals<video::EVT_STANDARD>(ListMatGrass::getInstance());
-    renderMeshNormals<video::EVT_2TCOORDS>(ListMatDetails::getInstance());
-    renderMeshNormals<video::EVT_STANDARD>(ListMatUnlit::getInstance());
-    renderMeshNormals<video::EVT_2TCOORDS>(ListMatSplatting::getInstance());
-    renderMeshNormals<video::EVT_TANGENTS>(ListMatNormalMap::getInstance());
-
+//    renderMeshNormals<video::EVT_2TCOORDS>(ListMatDetails::getInstance());
+//    renderMeshNormals<video::EVT_STANDARD>(ListMatUnlit::getInstance());
+//    renderMeshNormals<video::EVT_2TCOORDS>(ListMatSplatting::getInstance());
+//    renderMeshNormals<video::EVT_TANGENTS>(ListMatNormalMap::getInstance());
 }
 
 template<typename Shader, enum E_VERTEX_TYPE VertexType, int...List, typename... TupleType>
@@ -674,19 +570,17 @@ static video::ITexture *displaceTex = 0;
 
 void IrrDriver::renderTransparent()
 {
-    irr_driver->setPhase(TRANSPARENT_PASS);
     glEnable(GL_DEPTH_TEST);
     glDisable(GL_ALPHA_TEST);
     glDepthMask(GL_FALSE);
     glEnable(GL_BLEND);
     glBlendEquation(GL_FUNC_ADD);
     glDisable(GL_CULL_FACE);
-    ListBlendTransparent::getInstance()->clear();
-    ListAdditiveTransparent::getInstance()->clear();
-    ListBlendTransparentFog::getInstance()->clear();
-    ListAdditiveTransparentFog::getInstance()->clear();
-    ListDisplacement::getInstance()->clear();
-    m_scene_manager->drawAll(scene::ESNRP_TRANSPARENT);
+
+    irr_driver->setPhase(TRANSPARENT_PASS);
+
+    for (unsigned i = 0; i < ImmediateDrawList::getInstance()->size(); i++)
+        ImmediateDrawList::getInstance()->at(i)->render();
 
     if (irr_driver->hasARB_base_instance())
         glBindVertexArray(VAOManager::getInstance()->getVAO(EVT_STANDARD));
@@ -831,16 +725,16 @@ struct shadow_custom_unroll_args<N, List...>
 };
 
 template<typename T, enum E_VERTEX_TYPE VertexType, int...List, typename... Args>
-void renderShadow(const std::vector<GLuint> TextureUnits, unsigned cascade, const std::vector<STK::Tuple<Args...> > *t)
+void renderShadow(const std::vector<GLuint> TextureUnits, unsigned cascade, const std::vector<STK::Tuple<Args...> > &t)
 {
     glUseProgram(T::getInstance()->Program);
     if (irr_driver->hasARB_base_instance())
         glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
-    for (unsigned i = 0; i < t->size(); i++)
+    for (unsigned i = 0; i < t.size(); i++)
     {
         std::vector<uint64_t> Handles;
         std::vector<GLuint> Textures;
-        GLMesh *mesh = STK::tuple_get<0>(t->at(i));
+        GLMesh *mesh = STK::tuple_get<0>(t.at(i));
         if (!irr_driver->hasARB_base_instance())
             glBindVertexArray(mesh->vao);
         for (unsigned j = 0; j < TextureUnits.size(); j++)
@@ -855,73 +749,39 @@ void renderShadow(const std::vector<GLuint> TextureUnits, unsigned cascade, cons
             T::getInstance()->SetTextureHandles(Handles);
         else
             T::getInstance()->SetTextureUnits(Textures);
-        shadow_custom_unroll_args<List...>::template exec<T>(T::getInstance(), cascade, t->at(i));
+        shadow_custom_unroll_args<List...>::template exec<T>(T::getInstance(), cascade, t.at(i));
     }
 }
 
-template<int...List>
-struct instanced_shadow_custom_unroll_args;
-
-template<>
-struct instanced_shadow_custom_unroll_args<>
+#ifdef Draw_Indirect
+template<typename Shader, MeshMaterial Mat, video::E_VERTEX_TYPE VT, typename...Args>
+void renderInstancedShadow(const std::vector<GLuint> TextureUnits, unsigned cascade, const std::vector<GLMesh *> &t, Args ...args)
 {
-    template<typename T, typename ...TupleTypes, typename ...Args>
-    static void exec(const T *Shader, unsigned cascade, const STK::Tuple<TupleTypes...> &t, Args... args)
-    {
-        const GLMesh *mesh = STK::tuple_get<0>(t);
-        size_t instance_count = STK::tuple_get<1>(t);
-        irr_driver->IncreaseObjectCount();
-        GLenum ptype = mesh->PrimitiveType;
-        GLenum itype = mesh->IndexType;
-        size_t count = mesh->IndexCount;
-
-        Shader->setUniforms(cascade, args...);
-#ifdef Base_Instance_Support
-        if (irr_driver->hasARB_base_instance())
-            glDrawElementsInstancedBaseVertexBaseInstance(ptype, count, itype, (const void*) mesh->vaoOffset, instance_count, mesh->vaoBaseVertex, mesh->vaoBaseInstance);
-        else
-#endif
-            glDrawElementsInstanced(ptype, count, itype, 0, instance_count);
-    }
-};
-
-template<int N, int...List>
-struct instanced_shadow_custom_unroll_args<N, List...>
-{
-    template<typename T, typename ...TupleTypes, typename ...Args>
-    static void exec(const T *Shader, unsigned cascade, const STK::Tuple<TupleTypes...> &t, Args... args)
-    {
-        instanced_shadow_custom_unroll_args<List...>::template exec<T>(Shader, cascade, t, STK::tuple_get<N>(t), args...);
-    }
-};
-
-template<typename T, int...List, typename... Args>
-void renderInstancedShadow(const std::vector<GLuint> TextureUnits, unsigned cascade, const std::vector<STK::Tuple<Args...> > *t)
-{
-    glUseProgram(T::getInstance()->Program);
-    for (unsigned i = 0; i < t->size(); i++)
+    glUseProgram(Shader::getInstance()->Program);
+    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(VT, InstanceTypeShadow));
+    for (unsigned i = 0; i < t.size(); i++)
     {
         std::vector<uint64_t> Handles;
         std::vector<GLuint> Textures;
-        GLMesh *mesh = STK::tuple_get<0>(t->at(i));
-        if (!irr_driver->hasARB_base_instance())
-            glBindVertexArray(mesh->vao);
+        GLMesh *mesh = t[i];
 
         for (unsigned j = 0; j < TextureUnits.size(); j++)
             Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
 
-        T::getInstance()->SetTextureUnits(Textures);
-        instanced_shadow_custom_unroll_args<List...>::template exec<T>(T::getInstance(), cascade, t->at(i));
+        Shader::getInstance()->SetTextureUnits(Textures);
+        Shader::getInstance()->setUniforms(cascade, args...);
+        size_t tmp = ShadowPassCmd::getInstance()->Offset[cascade][Mat] + i;
+        glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)((tmp) * sizeof(DrawElementsIndirectCommand)));
     }
 }
-
+#endif
 
 #ifdef Multi_Draw_Indirect
 template<typename Shader, MeshMaterial Mat, video::E_VERTEX_TYPE VT, typename...Args>
 static void multidrawShadow(unsigned i, Args ...args)
 {
     glUseProgram(Shader::getInstance()->Program);
-    glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(VT, InstanceTypeDefault));
+    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(VT, InstanceTypeShadow));
     if (ShadowPassCmd::getInstance()->Size[i][Mat])
     {
         Shader::getInstance()->setUniforms(i, args...);
@@ -943,117 +803,46 @@ void IrrDriver::renderShadows()
     glClear(GL_DEPTH_BUFFER_BIT);
     glDrawBuffer(GL_NONE);
 
-    irr_driver->setPhase(SHADOW_PASS);
-    ListMatDefault::getInstance()->clear();
-    ListMatAlphaRef::getInstance()->clear();
-    ListMatSphereMap::getInstance()->clear();
-    ListMatDetails::getInstance()->clear();
-    ListMatUnlit::getInstance()->clear();
-    ListMatNormalMap::getInstance()->clear();
-    ListMatGrass::getInstance()->clear();
-    ListMatSplatting::getInstance()->clear();
-    ListInstancedMatDefault::getInstance()->clear();
-    ListInstancedMatAlphaRef::getInstance()->clear();
-    ListInstancedMatGrass::getInstance()->clear();
-    ListInstancedMatNormalMap::getInstance()->clear();
-    m_scene_manager->drawAll(scene::ESNRP_SOLID);
-    size_t offset = 0;
 
     for (unsigned cascade = 0; cascade < 4; cascade++)
     {
+
         std::vector<GLuint> noTexUnits;
-        renderShadow<MeshShader::ShadowShader, EVT_STANDARD, 1>(noTexUnits, cascade, ListMatDefault::getInstance());
-        renderShadow<MeshShader::ShadowShader, EVT_STANDARD, 1>(noTexUnits, cascade, ListMatSphereMap::getInstance());
-        renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, cascade, ListMatDetails::getInstance());
-        renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, cascade, ListMatSplatting::getInstance());
-        renderShadow<MeshShader::ShadowShader, EVT_TANGENTS, 1>(noTexUnits, cascade, ListMatNormalMap::getInstance());
-        renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, cascade, ListMatAlphaRef::getInstance());
-        renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, cascade, ListMatUnlit::getInstance());
-        renderShadow<MeshShader::GrassShadowShader, EVT_STANDARD, 3, 1>(std::vector<GLuint>{ 0 }, cascade, ListMatGrass::getInstance());
+
+        renderShadow<MeshShader::ShadowShader, EVT_STANDARD, 1>(noTexUnits, cascade, ListMatDefault::getInstance()->Shadows[cascade]);
+        renderShadow<MeshShader::ShadowShader, EVT_STANDARD, 1>(noTexUnits, cascade, ListMatSphereMap::getInstance()->Shadows[cascade]);
+        renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, cascade, ListMatDetails::getInstance()->Shadows[cascade]);
+        renderShadow<MeshShader::ShadowShader, EVT_2TCOORDS, 1>(noTexUnits, cascade, ListMatSplatting::getInstance()->Shadows[cascade]);
+        renderShadow<MeshShader::ShadowShader, EVT_TANGENTS, 1>(noTexUnits, cascade, ListMatNormalMap::getInstance()->Shadows[cascade]);
+        renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, cascade, ListMatAlphaRef::getInstance()->Shadows[cascade]);
+        renderShadow<MeshShader::RefShadowShader, EVT_STANDARD, 1>(std::vector<GLuint>{ 0 }, cascade, ListMatUnlit::getInstance()->Shadows[cascade]);
+        renderShadow<MeshShader::GrassShadowShader, EVT_STANDARD, 3, 1>(std::vector<GLuint>{ 0 }, cascade, ListMatGrass::getInstance()->Shadows[cascade]);
+
+        if (irr_driver->hasARB_draw_indirect())
+            glBindBuffer(GL_DRAW_INDIRECT_BUFFER, ShadowPassCmd::getInstance()->drawindirectcmd);
 
         if (UserConfigParams::m_azdo)
         {
-            glBindBuffer(GL_DRAW_INDIRECT_BUFFER, ShadowPassCmd::getInstance()->drawindirectcmd);
-            DrawElementsIndirectCommand *ShadowCommandBufferPtr = ShadowPassCmd::getInstance()->Ptr;
-
-            ShadowPassCmd::getInstance()->Offset[cascade][MAT_DEFAULT] = offset;
-            for (unsigned i = 0; i < ListInstancedMatDefault::getInstance()->size(); i++)
-            {
-                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatDefault::getInstance()->at(i)));
-                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatDefault::getInstance()->at(i));
-                DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
-                CurrentCommand.instanceCount = instanceCount;
-                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
-                CurrentCommand.count = mesh.IndexCount;
-                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
-                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
-            }
-            ShadowPassCmd::getInstance()->Size[cascade][MAT_DEFAULT] = offset - ShadowPassCmd::getInstance()->Offset[cascade][MAT_DEFAULT];
-
-            ShadowPassCmd::getInstance()->Offset[cascade][MAT_NORMAL_MAP] = offset;
-            for (unsigned i = 0; i < ListInstancedMatNormalMap::getInstance()->size(); i++)
-            {
-                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatNormalMap::getInstance()->at(i)));
-                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatNormalMap::getInstance()->at(i));
-                DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
-                CurrentCommand.instanceCount = instanceCount;
-                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
-                CurrentCommand.count = mesh.IndexCount;
-                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
-                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
-            }
-            ShadowPassCmd::getInstance()->Size[cascade][MAT_NORMAL_MAP] = offset - ShadowPassCmd::getInstance()->Offset[cascade][MAT_NORMAL_MAP];
-
-            ShadowPassCmd::getInstance()->Offset[cascade][MAT_ALPHA_REF] = offset;
-            for (unsigned i = 0; i < ListInstancedMatAlphaRef::getInstance()->size(); i++)
-            {
-                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatAlphaRef::getInstance()->at(i)));
-                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatAlphaRef::getInstance()->at(i));
-                DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
-                CurrentCommand.instanceCount = instanceCount;
-                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
-                CurrentCommand.count = mesh.IndexCount;
-                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
-                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
-            }
-            ShadowPassCmd::getInstance()->Size[cascade][MAT_ALPHA_REF] = offset - ShadowPassCmd::getInstance()->Offset[cascade][MAT_ALPHA_REF];
-
-            ShadowPassCmd::getInstance()->Offset[cascade][MAT_GRASS] = offset;
-            for (unsigned i = 0; i < ListInstancedMatGrass::getInstance()->size(); i++)
-            {
-                const GLMesh &mesh = *(STK::tuple_get<0>(ListInstancedMatGrass::getInstance()->at(i)));
-                size_t &instanceCount = STK::tuple_get<1>(ListInstancedMatGrass::getInstance()->at(i));
-                DrawElementsIndirectCommand &CurrentCommand = ShadowCommandBufferPtr[offset++];
-                CurrentCommand.instanceCount = instanceCount;
-                CurrentCommand.baseVertex = mesh.vaoBaseVertex;
-                CurrentCommand.count = mesh.IndexCount;
-                CurrentCommand.firstIndex = mesh.vaoOffset / 2;
-                CurrentCommand.baseInstance = mesh.vaoBaseInstance;
-            }
-            ShadowPassCmd::getInstance()->Size[cascade][MAT_GRASS] = offset - ShadowPassCmd::getInstance()->Offset[cascade][MAT_GRASS];
 #ifdef Multi_Draw_Indirect
             multidrawShadow<MeshShader::InstancedShadowShader, MAT_DEFAULT, video::EVT_STANDARD>(cascade);
+            multidrawShadow<MeshShader::InstancedShadowShader, MAT_DETAIL, video::EVT_2TCOORDS>(cascade);
             multidrawShadow<MeshShader::InstancedShadowShader, MAT_NORMAL_MAP, video::EVT_TANGENTS>(cascade);
             multidrawShadow<MeshShader::InstancedRefShadowShader, MAT_ALPHA_REF, video::EVT_STANDARD>(cascade);
-            core::vector3df dir = ListInstancedMatGrass::getInstance()->empty() ? core::vector3df(0., 0., 0.) : STK::tuple_get<2>(ListInstancedMatGrass::getInstance()->at(0));
-            multidrawShadow<MeshShader::InstancedGrassShadowShader, MAT_GRASS, video::EVT_STANDARD>(cascade, dir);
+            multidrawShadow<MeshShader::InstancedRefShadowShader, MAT_UNLIT, video::EVT_STANDARD>(cascade);
+            multidrawShadow<MeshShader::InstancedGrassShadowShader, MAT_GRASS, video::EVT_STANDARD>(cascade, windDir);
 #endif
         }
-        else
+#ifdef Draw_Indirect
+        else if (irr_driver->hasARB_draw_indirect())
         {
-            if (irr_driver->hasARB_base_instance())
-                glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, cascade, ListInstancedMatDefault::getInstance());
-            if (irr_driver->hasARB_base_instance())
-                glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            renderInstancedShadow<MeshShader::InstancedRefShadowShader>(std::vector<GLuint>{ 0 }, cascade, ListInstancedMatAlphaRef::getInstance());
-            if (irr_driver->hasARB_base_instance())
-                glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_STANDARD, InstanceTypeDefault));
-            renderInstancedShadow<MeshShader::InstancedGrassShadowShader, 2>(std::vector<GLuint>{ 0 }, cascade, ListInstancedMatGrass::getInstance());
-            if (irr_driver->hasARB_base_instance())
-                glBindVertexArray(VAOManager::getInstance()->getShadowInstanceVAO(video::EVT_TANGENTS, InstanceTypeDefault));
-            renderInstancedShadow<MeshShader::InstancedShadowShader>(noTexUnits, cascade, ListInstancedMatNormalMap::getInstance());
+            renderInstancedShadow<MeshShader::InstancedShadowShader, MAT_DEFAULT, video::EVT_STANDARD>(noTexUnits, cascade, ListInstancedMatDefault::getInstance()->Shadows[cascade]);
+            renderInstancedShadow<MeshShader::InstancedShadowShader, MAT_DETAIL, video::EVT_2TCOORDS>(noTexUnits, cascade, ListInstancedMatDetails::getInstance()->Shadows[cascade]);
+            renderInstancedShadow<MeshShader::InstancedRefShadowShader, MAT_ALPHA_REF, video::EVT_STANDARD>(std::vector < GLuint > { 0 }, cascade, ListInstancedMatAlphaRef::getInstance()->Shadows[cascade]);
+            renderInstancedShadow<MeshShader::InstancedRefShadowShader, MAT_UNLIT, video::EVT_STANDARD>(std::vector < GLuint > { 0 }, cascade, ListInstancedMatUnlit::getInstance()->Shadows[cascade]);
+            renderInstancedShadow<MeshShader::InstancedGrassShadowShader, MAT_GRASS, video::EVT_STANDARD>(std::vector < GLuint > { 0 }, cascade, ListInstancedMatGrass::getInstance()->Shadows[cascade], windDir);
+            renderInstancedShadow<MeshShader::InstancedShadowShader, MAT_NORMAL_MAP, video::EVT_TANGENTS>(noTexUnits, cascade, ListInstancedMatNormalMap::getInstance()->Shadows[cascade]);
         }
+#endif
     }
 
     glDisable(GL_POLYGON_OFFSET_FILL);
@@ -1085,33 +874,93 @@ struct rsm_custom_unroll_args<N, List...>
 };
 
 template<typename T, enum E_VERTEX_TYPE VertexType, int... Selector, typename... Args>
-void drawRSM(const core::matrix4 & rsm_matrix, const std::vector<GLuint> &TextureUnits, std::vector<STK::Tuple<Args...> > *t)
+void drawRSM(const core::matrix4 & rsm_matrix, const std::vector<GLuint> &TextureUnits, const std::vector<STK::Tuple<Args...> > &t)
 {
     glUseProgram(T::getInstance()->Program);
     if (irr_driver->hasARB_base_instance())
         glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
-    for (unsigned i = 0; i < t->size(); i++)
+    for (unsigned i = 0; i < t.size(); i++)
     {
         std::vector<GLuint> Textures;
-        GLMesh *mesh = STK::tuple_get<0>(t->at(i));
+        GLMesh *mesh = STK::tuple_get<0>(t.at(i));
         if (!irr_driver->hasARB_base_instance())
             glBindVertexArray(mesh->vao);
         for (unsigned j = 0; j < TextureUnits.size(); j++)
             Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
         T::getInstance()->SetTextureUnits(Textures);
-        rsm_custom_unroll_args<Selector...>::template exec<T>(rsm_matrix, t->at(i));
+        rsm_custom_unroll_args<Selector...>::template exec<T>(rsm_matrix, t.at(i));
     }
 }
 
+#ifdef Draw_Indirect
+template<typename Shader, MeshMaterial Mat, video::E_VERTEX_TYPE VT, typename...Args>
+void renderRSMShadow(const std::vector<GLuint> TextureUnits, const std::vector<GLMesh *> &t, Args ...args)
+{
+    glUseProgram(Shader::getInstance()->Program);
+    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(VT, InstanceTypeRSM));
+    for (unsigned i = 0; i < t.size(); i++)
+    {
+        std::vector<uint64_t> Handles;
+        std::vector<GLuint> Textures;
+        GLMesh *mesh = t[i];
+
+        for (unsigned j = 0; j < TextureUnits.size(); j++)
+            Textures.push_back(getTextureGLuint(mesh->textures[TextureUnits[j]]));
+
+        Shader::getInstance()->SetTextureUnits(Textures);
+        Shader::getInstance()->setUniforms(args...);
+        glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)((RSMPassCmd::getInstance()->Offset[Mat] + i)* sizeof(DrawElementsIndirectCommand)));
+    }
+}
+#endif
+
+#ifdef Multi_Draw_Indirect
+template<typename Shader, MeshMaterial Mat, enum E_VERTEX_TYPE VertexType, typename... Args>
+void multidrawRSM(Args...args)
+{
+    glUseProgram(Shader::getInstance()->Program);
+    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(VertexType, InstanceTypeRSM));
+    if (RSMPassCmd::getInstance()->Size[Mat])
+    {
+        Shader::getInstance()->setUniforms(args...);
+        glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)(RSMPassCmd::getInstance()->Offset[Mat] * sizeof(DrawElementsIndirectCommand)), RSMPassCmd::getInstance()->Size[Mat], sizeof(DrawElementsIndirectCommand));
+    }
+}
+#endif
+
 void IrrDriver::renderRSM()
 {
     m_rtts->getRSM().Bind();
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-    drawRSM<MeshShader::RSMShader, EVT_STANDARD, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatDefault::getInstance());
-    drawRSM<MeshShader::RSMShader, EVT_STANDARD, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatAlphaRef::getInstance());
-    drawRSM<MeshShader::RSMShader, EVT_TANGENTS, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatNormalMap::getInstance());
-    drawRSM<MeshShader::RSMShader, EVT_STANDARD, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatUnlit::getInstance());
-    drawRSM<MeshShader::RSMShader, EVT_2TCOORDS, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatDetails::getInstance());
-    drawRSM<MeshShader::SplattingRSMShader, EVT_2TCOORDS, 1>(rsm_matrix, createVector<GLuint>(1, 2, 3, 4, 5), ListMatSplatting::getInstance());
+    drawRSM<MeshShader::RSMShader, EVT_STANDARD, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatDefault::getInstance()->RSM);
+    drawRSM<MeshShader::RSMShader, EVT_STANDARD, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatAlphaRef::getInstance()->RSM);
+    drawRSM<MeshShader::RSMShader, EVT_TANGENTS, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatNormalMap::getInstance()->RSM);
+    drawRSM<MeshShader::RSMShader, EVT_STANDARD, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatUnlit::getInstance()->RSM);
+    drawRSM<MeshShader::RSMShader, EVT_2TCOORDS, 3, 1>(rsm_matrix, std::vector<GLuint>{ 0 }, ListMatDetails::getInstance()->RSM);
+    drawRSM<MeshShader::SplattingRSMShader, EVT_2TCOORDS, 1>(rsm_matrix, createVector<GLuint>(1, 2, 3, 4, 5), ListMatSplatting::getInstance()->RSM);
+
+    if (irr_driver->hasARB_draw_indirect())
+        glBindBuffer(GL_DRAW_INDIRECT_BUFFER, RSMPassCmd::getInstance()->drawindirectcmd);
+
+    if (UserConfigParams::m_azdo)
+    {
+#ifdef Multi_Draw_Indirect
+        multidrawRSM<MeshShader::InstancedRSMShader, MAT_DEFAULT, video::EVT_STANDARD>(rsm_matrix);
+        multidrawRSM<MeshShader::InstancedRSMShader, MAT_NORMAL_MAP, video::EVT_TANGENTS>(rsm_matrix);
+        multidrawRSM<MeshShader::InstancedRSMShader, MAT_ALPHA_REF, video::EVT_STANDARD>(rsm_matrix);
+        multidrawRSM<MeshShader::InstancedRSMShader, MAT_UNLIT, video::EVT_STANDARD>(rsm_matrix);
+        multidrawRSM<MeshShader::InstancedRSMShader, MAT_DETAIL, video::EVT_2TCOORDS>(rsm_matrix);
+#endif
+    }
+#ifdef Draw_Indirect
+    else if (irr_driver->hasARB_draw_indirect())
+    {
+        renderRSMShadow<MeshShader::InstancedRSMShader, MAT_DEFAULT, video::EVT_STANDARD>(std::vector < GLuint > { 0 }, ListInstancedMatDefault::getInstance()->RSM, rsm_matrix);
+        renderRSMShadow<MeshShader::InstancedRSMShader, MAT_ALPHA_REF, video::EVT_STANDARD>(std::vector < GLuint > { 0 }, ListInstancedMatAlphaRef::getInstance()->RSM, rsm_matrix);
+        renderRSMShadow<MeshShader::InstancedRSMShader, MAT_UNLIT, video::EVT_STANDARD>(std::vector < GLuint > { 0 }, ListInstancedMatUnlit::getInstance()->RSM, rsm_matrix);
+        renderRSMShadow<MeshShader::InstancedRSMShader, MAT_NORMAL_MAP, video::EVT_TANGENTS>(std::vector<GLuint>(), ListInstancedMatNormalMap::getInstance()->RSM, rsm_matrix);
+        renderRSMShadow<MeshShader::InstancedRSMShader, MAT_DETAIL, video::EVT_2TCOORDS>(std::vector < GLuint > { 0 }, ListInstancedMatDetails::getInstance()->RSM, rsm_matrix);
+    }
+#endif
 }
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 8a901c38c..c6d3d6958 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1137,6 +1137,18 @@ namespace MeshShader
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
     }
 
+    InstancedColorizeShader::InstancedColorizeShader()
+    {
+        Program = LoadProgram(
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/glow_object.vert").c_str(),
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/glow_object.frag").c_str());
+        AssignUniforms();
+
+        GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
+        glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
+    }
+
     ShadowShader::ShadowShader()
     {
         // Geometry shader needed
@@ -1173,6 +1185,20 @@ namespace MeshShader
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
     }
 
+    InstancedRSMShader::InstancedRSMShader()
+    {
+        Program = LoadProgram(
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_rsm.vert").c_str(),
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_rsm.frag").c_str());
+
+        AssignUniforms("RSMMatrix");
+        AssignSamplerNames(Program, 0, "tex");
+
+        GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
+        glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
+    }
+
     SplattingRSMShader::SplattingRSMShader()
     {
         Program = LoadProgram(
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 48bef7ad1..9baae2679 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -615,6 +615,12 @@ public:
     ColorizeShader();
 };
 
+class InstancedColorizeShader : public ShaderHelperSingleton<InstancedColorizeShader>
+{
+public:
+    InstancedColorizeShader();
+};
+
 class ShadowShader : public ShaderHelperSingleton<ShadowShader, int, core::matrix4>, public TextureRead<>
 {
 public:
@@ -627,6 +633,12 @@ public:
     RSMShader();
 };
 
+class InstancedRSMShader : public ShaderHelperSingleton<InstancedRSMShader, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+{
+public:
+    InstancedRSMShader();
+};
+
 class SplattingRSMShader : public ShaderHelperSingleton<SplattingRSMShader, core::matrix4, core::matrix4>,
     public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stkanimatedmesh.cpp
index 04d3128bd..95b0f0561 100644
--- a/src/graphics/stkanimatedmesh.cpp
+++ b/src/graphics/stkanimatedmesh.cpp
@@ -165,7 +165,7 @@ void STKAnimatedMesh::render()
 
     update();
 
-    if (irr_driver->getPhase() == SOLID_NORMAL_AND_DEPTH_PASS || irr_driver->getPhase() == SHADOW_PASS)
+/*    if (irr_driver->getPhase() == SOLID_NORMAL_AND_DEPTH_PASS || irr_driver->getPhase() == SHADOW_PASS)
     {
         ModelViewProjectionMatrix = computeMVP(AbsoluteTransformation);
         core::matrix4 invmodel;
@@ -185,7 +185,7 @@ void STKAnimatedMesh::render()
             pushVector(ListMatUnlit::getInstance(), mesh, AbsoluteTransformation, core::matrix4::EM4CONST_IDENTITY, mesh->TextureMatrix);
 
         return;
-    }
+    }*/
 
     if (irr_driver->getPhase() == TRANSPARENT_PASS)
     {
diff --git a/src/graphics/stkanimatedmesh.hpp b/src/graphics/stkanimatedmesh.hpp
index 0ca233ac3..bfcd3f571 100644
--- a/src/graphics/stkanimatedmesh.hpp
+++ b/src/graphics/stkanimatedmesh.hpp
@@ -11,8 +11,6 @@ class STKAnimatedMesh : public irr::scene::CAnimatedMeshSceneNode, public STKMes
 {
 protected:
     bool firstTime;
-    PtrVector<GLMesh, REF> MeshSolidMaterial[MAT_COUNT];
-    PtrVector<GLMesh, REF> TransparentMesh[TM_COUNT];
     std::vector<GLMesh> GLmeshes;
     core::matrix4 ModelViewProjectionMatrix;
     void cleanGLMeshes();
@@ -26,6 +24,7 @@ public:
 
   virtual void render();
   virtual void setMesh(irr::scene::IAnimatedMesh* mesh);
+  virtual bool glow() const { return false; }
 };
 
 #endif // STKANIMATEDMESH_HPP
diff --git a/src/graphics/stkinstancedscenenode.cpp b/src/graphics/stkinstancedscenenode.cpp
index cde162d82..ce6b5a907 100644
--- a/src/graphics/stkinstancedscenenode.cpp
+++ b/src/graphics/stkinstancedscenenode.cpp
@@ -108,8 +108,6 @@ void STKInstancedSceneNode::setFirstTimeMaterial()
         GLMesh &mesh = GLmeshes[i];
         MeshMaterial MatType = MaterialTypeToMeshMaterial(type, mb->getVertexType());
         initinstancedvaostate(mesh, instanceData[i]);
-        if (irr_driver->hasARB_base_instance())
-            mesh.vaoBaseInstance = VAOManager::getInstance()->appendInstance(InstanceTypeDefault, instanceData[i]);
         MeshSolidMaterial[MatType].push_back(&mesh);
         InitTextures(mesh, MatType);
     }
@@ -191,7 +189,7 @@ void STKInstancedSceneNode::render()
 
     setFirstTimeMaterial();
 
-    if (irr_driver->getPhase() == SOLID_NORMAL_AND_DEPTH_PASS || irr_driver->getPhase() == SHADOW_PASS)
+/*    if (irr_driver->getPhase() == SOLID_NORMAL_AND_DEPTH_PASS || irr_driver->getPhase() == SHADOW_PASS)
     {
         for (unsigned i = 0; i < MeshSolidMaterial[MAT_DEFAULT].size(); i++)
         {
@@ -218,5 +216,5 @@ void STKInstancedSceneNode::render()
             GLMesh *mesh = MeshSolidMaterial[MAT_NORMAL_MAP][i];
             ListInstancedMatNormalMap::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
         }
-    }
+    }*/
 }
diff --git a/src/graphics/stkinstancedscenenode.hpp b/src/graphics/stkinstancedscenenode.hpp
index 466d0f96c..0766b1c02 100644
--- a/src/graphics/stkinstancedscenenode.hpp
+++ b/src/graphics/stkinstancedscenenode.hpp
@@ -4,18 +4,6 @@
 #include "stkmesh.hpp"
 #include "utils/leak_check.hpp"
 
-class ListInstancedMatDefault : public MeshList<ListInstancedMatDefault, GLMesh *, size_t>
-{};
-
-class ListInstancedMatAlphaRef : public MeshList<ListInstancedMatAlphaRef, GLMesh *, size_t>
-{};
-
-class ListInstancedMatGrass : public MeshList<ListInstancedMatGrass, GLMesh *, size_t, core::vector3df, core::vector3df>
-{};
-
-class ListInstancedMatNormalMap : public MeshList<ListInstancedMatNormalMap, GLMesh *, size_t>
-{};
-
 class STKInstancedSceneNode : public irr::scene::CMeshSceneNode
 {
 protected:
diff --git a/src/graphics/stkmesh.cpp b/src/graphics/stkmesh.cpp
index a8a9f6ffe..2746a5428 100644
--- a/src/graphics/stkmesh.cpp
+++ b/src/graphics/stkmesh.cpp
@@ -126,6 +126,7 @@ GLMesh allocateMeshBuffer(scene::IMeshBuffer* mb)
     GLMesh result = {};
     if (!mb)
         return result;
+    result.mb = mb;
 
     result.IndexCount = mb->getIndexCount();
     switch (mb->getIndexType())
@@ -230,7 +231,7 @@ core::matrix4 computeMVP(const core::matrix4 &ModelMatrix)
     return ModelViewProjectionMatrix;
 }
 
-core::vector3df getWind()
+core::vector3df getWindDir()
 {
     const float time = irr_driver->getDevice()->getTimer()->getTime() / 1000.0f;
     GrassShaderProvider *gsp = (GrassShaderProvider *)irr_driver->getCallback(ES_GRASS);
diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stkmesh.hpp
index d5d57c596..f4c246419 100644
--- a/src/graphics/stkmesh.hpp
+++ b/src/graphics/stkmesh.hpp
@@ -46,9 +46,9 @@ struct GLMesh {
     core::matrix4 TextureMatrix;
     size_t vaoBaseVertex;
     size_t vaoOffset;
-    size_t vaoBaseInstance;
     video::E_VERTEX_TYPE VAOType;
     uint64_t TextureHandles[6];
+    scene::IMeshBuffer *mb;
 };
 
 GLMesh allocateMeshBuffer(scene::IMeshBuffer* mb);
@@ -58,61 +58,122 @@ GLuint createVAO(GLuint vbo, GLuint idx, video::E_VERTEX_TYPE type);
 core::matrix4 computeMVP(const core::matrix4 &ModelViewProjectionMatrix);
 bool isObject(video::E_MATERIAL_TYPE type);
 
-core::vector3df getWind();
+core::vector3df getWindDir();
 
 
 class STKMeshCommon
 {
-protected:
+public:
     PtrVector<GLMesh, REF> MeshSolidMaterial[MAT_COUNT];
     PtrVector<GLMesh, REF> TransparentMesh[TM_COUNT];
-public:
     virtual void update() = 0;
+    virtual bool glow() const = 0;
     virtual bool isImmediateDraw() const { return false; }
 };
 
-
 template<typename T, typename... Args>
-class MeshList : public Singleton<T>, public std::vector<STK::Tuple<Args...> >
-{};
+class MeshList : public Singleton<T>
+{
+public:
+    std::vector<STK::Tuple<Args...> > SolidPass, Shadows[4], RSM;
+    void clear()
+    {
+        SolidPass.clear();
+        RSM.clear();
+        for (unsigned i = 0; i < 4; i++)
+            Shadows[i].clear();
+    }
+};
 
+template<typename T>
+class InstancedMeshList : public Singleton<T>
+{
+public:
+    std::vector<GLMesh *> SolidPass, Shadows[4], RSM;
+    void clear()
+    {
+        SolidPass.clear();
+        RSM.clear();
+        for (unsigned i = 0; i < 4; i++)
+            Shadows[i].clear();
+    }
+};
+
+// -----------------------------------------Mat Default---------------------------------------------------- //
 class ListMatDefault : public MeshList<ListMatDefault, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
+class ListInstancedMatDefault : public InstancedMeshList<ListInstancedMatDefault>
+{};
+
+
+// -----------------------------------------Mat Alpha Ref---------------------------------------------------- //
 class ListMatAlphaRef : public MeshList<ListMatAlphaRef, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
+class ListInstancedMatAlphaRef : public InstancedMeshList<ListInstancedMatAlphaRef>
+{};
+
+// -----------------------------------------Mat Normap Map---------------------------------------------------- //
 class ListMatNormalMap : public MeshList<ListMatNormalMap, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
+class ListInstancedMatNormalMap : public InstancedMeshList<ListInstancedMatNormalMap>
+{};
+
+// -----------------------------------------Mat Grass---------------------------------------------------- //
 class ListMatGrass : public MeshList<ListMatGrass, GLMesh *, core::matrix4, core::matrix4, core::vector3df>
 {};
 
+class ListInstancedMatGrass : public InstancedMeshList<ListInstancedMatGrass>
+{};
+
+// -----------------------------------------Mat Sphere Map---------------------------------------------------- //
 class ListMatSphereMap : public MeshList<ListMatSphereMap, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
+class ListInstancedMatSphereMap : public InstancedMeshList<ListInstancedMatSphereMap>
+{};
+
+// -----------------------------------------Mat Splatting---------------------------------------------------- //
 class ListMatSplatting : public MeshList<ListMatSplatting, GLMesh *, core::matrix4, core::matrix4>
 {};
 
+// -----------------------------------------Mat Unlit---------------------------------------------------- //
 class ListMatUnlit : public MeshList<ListMatUnlit, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
+class ListInstancedMatUnlit : public InstancedMeshList<ListInstancedMatUnlit>
+{};
+
+// -----------------------------------------Mat Details---------------------------------------------------- //
 class ListMatDetails : public MeshList<ListMatDetails, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
-class ListBlendTransparent : public MeshList<ListBlendTransparent, GLMesh *, core::matrix4, core::matrix4>
+class ListInstancedMatDetails : public InstancedMeshList<ListInstancedMatDetails>
 {};
 
-class ListAdditiveTransparent : public MeshList<ListAdditiveTransparent, GLMesh *, core::matrix4, core::matrix4>
+// Transparent
+template <typename T, typename ...Args>
+class MiscList : public Singleton<T>, public std::vector<STK::Tuple<Args...> >
 {};
 
-class ListBlendTransparentFog : public MeshList<ListBlendTransparentFog, GLMesh *, core::matrix4, core::matrix4, float, float, float, float, float, video::SColorf>
+class ListBlendTransparent : public MiscList<ListBlendTransparent, GLMesh *, core::matrix4, core::matrix4>
 {};
 
-class ListAdditiveTransparentFog : public MeshList<ListAdditiveTransparentFog, GLMesh *, core::matrix4, core::matrix4, float, float, float, float, float, video::SColorf>
+class ListAdditiveTransparent : public MiscList<ListAdditiveTransparent, GLMesh *, core::matrix4, core::matrix4>
 {};
 
-class ListDisplacement : public MeshList<ListDisplacement, GLMesh *, core::matrix4>
+class ListBlendTransparentFog : public MiscList<ListBlendTransparentFog, GLMesh *, core::matrix4, core::matrix4, float, float, float, float, float, video::SColorf>
+{};
+
+class ListAdditiveTransparentFog : public MiscList<ListAdditiveTransparentFog, GLMesh *, core::matrix4, core::matrix4, float, float, float, float, float, video::SColorf>
+{};
+
+class ListDisplacement : public MiscList<ListDisplacement, GLMesh *, core::matrix4>
+{};
+
+class ListInstancedGlow : public Singleton<ListInstancedGlow>, public std::vector<GLMesh *>
 {};
 
 // Forward pass (for transparents meshes)
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 21024252d..291b5617f 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -21,6 +21,7 @@ STKMeshSceneNode::STKMeshSceneNode(irr::scene::IMesh* mesh, ISceneNode* parent,
     isDisplacement = false;
     immediate_draw = false;
     update_each_frame = false;
+    isGlow = false;
 
     if (createGLMeshes)
         this->createGLMeshes();
@@ -142,14 +143,12 @@ STKMeshSceneNode::~STKMeshSceneNode()
 
 void STKMeshSceneNode::drawGlow(const GLMesh &mesh)
 {
-    ColorizeProvider * const cb = (ColorizeProvider *)irr_driver->getCallback(ES_COLORIZE);
     assert(mesh.VAOType == video::EVT_STANDARD);
 
     GLenum ptype = mesh.PrimitiveType;
     GLenum itype = mesh.IndexType;
     size_t count = mesh.IndexCount;
-
-    MeshShader::ColorizeShader::getInstance()->setUniforms(AbsoluteTransformation, video::SColorf(cb->getRed(), cb->getGreen(), cb->getBlue()));
+    MeshShader::ColorizeShader::getInstance()->setUniforms(AbsoluteTransformation, video::SColorf(glowcolor.getRed() / 255.f, glowcolor.getGreen() / 255.f, glowcolor.getBlue() / 255.f));
     glDrawElementsBaseVertex(ptype, count, itype, (GLvoid *)mesh.vaoOffset, mesh.vaoBaseVertex);
 }
 
@@ -170,8 +169,6 @@ void STKMeshSceneNode::updatevbo()
     }
 }
 
-static video::ITexture *spareWhiteTex = 0;
-
 void STKMeshSceneNode::update()
 {
     Box = Mesh->getBoundingBox();
@@ -196,6 +193,8 @@ void STKMeshSceneNode::OnRegisterSceneNode()
         CMeshSceneNode::OnRegisterSceneNode();
 }
 
+static video::ITexture *spareWhiteTex = 0;
+
 void STKMeshSceneNode::render()
 {
     irr::video::IVideoDriver* driver = irr_driver->getVideoDriver();
@@ -207,7 +206,22 @@ void STKMeshSceneNode::render()
 
     update();
 
-    if (irr_driver->getPhase() == SOLID_NORMAL_AND_DEPTH_PASS && immediate_draw)
+    bool isTransparent;
+
+    for (u32 i = 0; i < Mesh->getMeshBufferCount(); ++i)
+    {
+        scene::IMeshBuffer* mb = Mesh->getMeshBuffer(i);
+        if (!mb)
+            continue;
+
+        video::E_MATERIAL_TYPE type = mb->getMaterial().MaterialType;
+        video::IMaterialRenderer* rnd = driver->getMaterialRenderer(type);
+
+        isTransparent = rnd->isTransparent();
+        break;
+    }
+
+    if ((irr_driver->getPhase() == SOLID_NORMAL_AND_DEPTH_PASS) && immediate_draw && !isTransparent)
     {
         core::matrix4 invmodel;
         AbsoluteTransformation.getInverse(invmodel);
@@ -225,6 +239,21 @@ void STKMeshSceneNode::render()
             GLenum itype = mesh.IndexType;
             size_t count = mesh.IndexCount;
 
+            if (!mesh.textures[0])
+                mesh.textures[0] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
+            compressTexture(mesh.textures[0], true);
+            if (UserConfigParams::m_azdo)
+            {
+#ifdef Bindless_Texture_Support
+                if (!mesh.TextureHandles[0])
+                    mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::TransparentFogShader::getInstance()->SamplersId[0]);
+                if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
+                    glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
+                MeshShader::ObjectPass1Shader::getInstance()->SetTextureHandles(createVector<uint64_t>(mesh.TextureHandles[0]));
+#endif
+            }
+            else
+                MeshShader::ObjectPass1Shader::getInstance()->SetTextureUnits(std::vector < GLuint > { getTextureGLuint(mesh.textures[0]) });
             MeshShader::ObjectPass1Shader::getInstance()->setUniforms(AbsoluteTransformation, invmodel);
             assert(mesh.vao);
             glBindVertexArray(mesh.vao);
@@ -235,54 +264,25 @@ void STKMeshSceneNode::render()
         return;
     }
 
-    if (irr_driver->getPhase() == SOLID_NORMAL_AND_DEPTH_PASS || irr_driver->getPhase() == SHADOW_PASS)
+    if (irr_driver->getPhase() == SOLID_LIT_PASS  && immediate_draw && !isTransparent)
     {
         core::matrix4 invmodel;
         AbsoluteTransformation.getInverse(invmodel);
 
-        GLMesh* mesh;
-        for_in(mesh, MeshSolidMaterial[MAT_DEFAULT])
-            pushVector(ListMatDefault::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
-
-        for_in(mesh, MeshSolidMaterial[MAT_ALPHA_REF])
-            pushVector(ListMatAlphaRef::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
-
-        for_in(mesh, MeshSolidMaterial[MAT_SPHEREMAP])
-            pushVector(ListMatSphereMap::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
-
-        for_in(mesh, MeshSolidMaterial[MAT_DETAIL])
-            pushVector(ListMatDetails::getInstance(), mesh, AbsoluteTransformation, invmodel, mesh->TextureMatrix);
-
-        windDir = getWind();
-        for_in(mesh, MeshSolidMaterial[MAT_GRASS])
-            pushVector(ListMatGrass::getInstance(), mesh, AbsoluteTransformation, invmodel, windDir);
-
-        for_in(mesh, MeshSolidMaterial[MAT_UNLIT])
-            pushVector(ListMatUnlit::getInstance(), mesh, AbsoluteTransformation, core::matrix4::EM4CONST_IDENTITY, mesh->TextureMatrix);
-
-        for_in(mesh, MeshSolidMaterial[MAT_SPLATTING])
-            pushVector(ListMatSplatting::getInstance(), mesh, AbsoluteTransformation, invmodel);
-
-        for_in(mesh, MeshSolidMaterial[MAT_NORMAL_MAP])
-            pushVector(ListMatNormalMap::getInstance(), mesh, AbsoluteTransformation, invmodel, core::matrix4::EM4CONST_IDENTITY);
-
-        return;
-    }
-
-    if (irr_driver->getPhase() == SOLID_LIT_PASS)
-    {
-        core::matrix4 invmodel;
-        AbsoluteTransformation.getInverse(invmodel);
-
-        if (immediate_draw)
+        glDisable(GL_CULL_FACE);
+        if (!spareWhiteTex)
+            spareWhiteTex = getUnicolorTexture(video::SColor(255, 255, 255, 255));
+        glUseProgram(MeshShader::ObjectPass2Shader::getInstance()->Program);
+        // Only untextured
+        for (unsigned i = 0; i < GLmeshes.size(); i++)
         {
-            return;
-            glDisable(GL_CULL_FACE);
-            if (!spareWhiteTex)
-                spareWhiteTex = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-            glUseProgram(MeshShader::ObjectPass2Shader::getInstance()->Program);
-            // Only untextured
-            for (unsigned i = 0; i < GLmeshes.size(); i++)
+            irr_driver->IncreaseObjectCount();
+            GLMesh &mesh = GLmeshes[i];
+            GLenum ptype = mesh.PrimitiveType;
+            GLenum itype = mesh.IndexType;
+            size_t count = mesh.IndexCount;
+
+            if (UserConfigParams::m_azdo)
             {
                 irr_driver->IncreaseObjectCount();
                 GLMesh &mesh = GLmeshes[i];
@@ -325,10 +325,19 @@ void STKMeshSceneNode::render()
                 glDrawElements(ptype, count, itype, 0);
                 glBindVertexArray(0);
             }
-            glEnable(GL_CULL_FACE);
-            return;
+            else
+                MeshShader::ObjectPass2Shader::getInstance()->SetTextureUnits(createVector<GLuint>(
+                irr_driver->getRenderTargetTexture(RTT_DIFFUSE),
+                irr_driver->getRenderTargetTexture(RTT_SPECULAR),
+                irr_driver->getRenderTargetTexture(RTT_HALF1_R),
+                getTextureGLuint(mesh.textures[0])));
+            MeshShader::ObjectPass2Shader::getInstance()->setUniforms(AbsoluteTransformation, mesh.TextureMatrix);
+            assert(mesh.vao);
+            glBindVertexArray(mesh.vao);
+            glDrawElements(ptype, count, itype, 0);
+            glBindVertexArray(0);
         }
-
+        glEnable(GL_CULL_FACE);
         return;
     }
 
@@ -348,7 +357,7 @@ void STKMeshSceneNode::render()
         }
     }
 
-    if (irr_driver->getPhase() == TRANSPARENT_PASS)
+    if (irr_driver->getPhase() == TRANSPARENT_PASS && isTransparent)
     {
         ModelViewProjectionMatrix = computeMVP(AbsoluteTransformation);
 
@@ -383,6 +392,8 @@ void STKMeshSceneNode::render()
                         tmpcol.getGreen() / 255.0f,
                         tmpcol.getBlue() / 255.0f);
 
+                    if (!mesh.textures[0])
+                        mesh.textures[0] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
                     compressTexture(mesh.textures[0], true);
                     if (UserConfigParams::m_azdo)
                     {
@@ -414,7 +425,8 @@ void STKMeshSceneNode::render()
                     GLenum ptype = mesh.PrimitiveType;
                     GLenum itype = mesh.IndexType;
                     size_t count = mesh.IndexCount;
-
+                    if (!mesh.textures[0])
+                        mesh.textures[0] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
                     compressTexture(mesh.textures[0], true);
                     if (UserConfigParams::m_azdo)
                     {
@@ -440,42 +452,6 @@ void STKMeshSceneNode::render()
         }
 
         GLMesh* mesh;
-
-        if (World::getWorld() && World::getWorld()->isFogEnabled())
-        {
-            const Track * const track = World::getWorld()->getTrack();
-
-            // Todo : put everything in a ubo
-            const float fogmax = track->getFogMax();
-            const float startH = track->getFogStartHeight();
-            const float endH = track->getFogEndHeight();
-            const float start = track->getFogStart();
-            const float end = track->getFogEnd();
-            const video::SColor tmpcol = track->getFogColor();
-
-            video::SColorf col(tmpcol.getRed() / 255.0f,
-                tmpcol.getGreen() / 255.0f,
-                tmpcol.getBlue() / 255.0f);
-
-            for_in(mesh, TransparentMesh[TM_DEFAULT])
-                pushVector(ListBlendTransparentFog::getInstance(), mesh, AbsoluteTransformation, mesh->TextureMatrix,
-                                                                fogmax, startH, endH, start, end, col);
-            for_in(mesh, TransparentMesh[TM_ADDITIVE])
-                pushVector(ListAdditiveTransparentFog::getInstance(), mesh, AbsoluteTransformation, mesh->TextureMatrix,
-                                                                   fogmax, startH, endH, start, end, col);
-        }
-        else
-        {
-            for_in(mesh, TransparentMesh[TM_DEFAULT])
-                pushVector(ListBlendTransparent::getInstance(), mesh, AbsoluteTransformation, mesh->TextureMatrix);
-
-            for_in(mesh, TransparentMesh[TM_ADDITIVE])
-                pushVector(ListAdditiveTransparent::getInstance(), mesh, AbsoluteTransformation, mesh->TextureMatrix);
-        }
-
-        for_in(mesh, TransparentMesh[TM_DISPLACEMENT])
-            pushVector(ListDisplacement::getInstance(), mesh, AbsoluteTransformation);
-
         if (!TransparentMesh[TM_BUBBLE].empty())
             glUseProgram(MeshShader::BubbleShader::Program);
         if (irr_driver->hasARB_base_instance())
diff --git a/src/graphics/stkmeshscenenode.hpp b/src/graphics/stkmeshscenenode.hpp
index 90f12007b..a8e8724ed 100644
--- a/src/graphics/stkmeshscenenode.hpp
+++ b/src/graphics/stkmeshscenenode.hpp
@@ -22,6 +22,8 @@ protected:
     bool immediate_draw;
     bool update_each_frame;
     bool isDisplacement;
+    bool isGlow;
+    video::SColor glowcolor;
 public:
     virtual void update();
     void setReloadEachFrame(bool);
@@ -46,6 +48,9 @@ public:
                 mb->getMaterial().MaterialType = irr_driver->getShader(ES_DISPLACE);
         }
     }
+    virtual bool glow() const { return isGlow; }
+    void setGlowColors(const video::SColor &c) { isGlow = true; glowcolor = c; }
+    video::SColor getGlowColor() const { return glowcolor; }
 };
 
 #endif
diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
new file mode 100644
index 000000000..5b58eec57
--- /dev/null
+++ b/src/graphics/stkscenemanager.cpp
@@ -0,0 +1,634 @@
+#include "stkscenemanager.hpp"
+#include "stkmesh.hpp"
+#include "stkinstancedscenenode.hpp"
+#include "irr_driver.hpp"
+#include <ISceneManager.h>
+#include <ISceneNode.h>
+#include "stkanimatedmesh.hpp"
+#include "stkmeshscenenode.hpp"
+#include "utils/ptr_vector.hpp"
+#include <ICameraSceneNode.h>
+#include <SViewFrustum.h>
+#include "callbacks.hpp"
+#include "utils/cpp2011.hpp"
+#include <omp.h>
+#include "modes/world.hpp"
+#include "tracks/track.hpp"
+#include "lod_node.hpp"
+
+static void
+FillInstances_impl(std::vector<std::pair<GLMesh *, scene::ISceneNode *> > InstanceList, InstanceData * InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer,
+    size_t &InstanceBufferOffset, size_t &CommandBufferOffset, int cascade)
+{
+    // Should never be empty
+    GLMesh *mesh = InstanceList.front().first;
+
+    DrawElementsIndirectCommand &CurrentCommand = CommandBuffer[CommandBufferOffset++];
+    CurrentCommand.baseVertex = mesh->vaoBaseVertex;
+    CurrentCommand.count = mesh->IndexCount;
+    CurrentCommand.firstIndex = mesh->vaoOffset / 2;
+    CurrentCommand.baseInstance = InstanceBufferOffset;
+    CurrentCommand.instanceCount = InstanceList.size();
+
+    irr_driver->IncreasePolyCount(InstanceList.size() * mesh->IndexCount / 3);
+
+    for (unsigned i = 0; i < InstanceList.size(); i++)
+    {
+        auto &Tp = InstanceList[i];
+        InstanceData &Instance = InstanceBuffer[InstanceBufferOffset++];
+        scene::ISceneNode *node = Tp.second;
+        const core::matrix4 &mat = node->getAbsoluteTransformation();
+        const core::vector3df &Origin = mat.getTranslation();
+        const core::vector3df &Orientation = mat.getRotationDegrees();
+        const core::vector3df &Scale = mat.getScale();
+        Instance.Origin.X = Origin.X;
+        Instance.Origin.Y = Origin.Y;
+        Instance.Origin.Z = Origin.Z;
+        Instance.Orientation.X = Orientation.X;
+        Instance.Orientation.Y = Orientation.Y;
+        Instance.Orientation.Z = Orientation.Z;
+        Instance.Scale.X = Scale.X;
+        Instance.Scale.Y = Scale.Y;
+        Instance.Scale.Z = Scale.Z;
+        Instance.Texture = mesh->TextureHandles[0];
+        Instance.SecondTexture = mesh->TextureHandles[1];
+    }
+}
+
+
+static void
+FillInstancesGlow_impl(std::vector<std::pair<GLMesh *, STKMeshCommon *> > InstanceList, GlowInstanceData * InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer,
+size_t &InstanceBufferOffset, size_t &CommandBufferOffset)
+{
+    // Should never be empty
+    GLMesh *mesh = InstanceList.front().first;
+
+    DrawElementsIndirectCommand &CurrentCommand = CommandBuffer[CommandBufferOffset++];
+    CurrentCommand.baseVertex = mesh->vaoBaseVertex;
+    CurrentCommand.count = mesh->IndexCount;
+    CurrentCommand.firstIndex = mesh->vaoOffset / 2;
+    CurrentCommand.baseInstance = InstanceBufferOffset;
+    CurrentCommand.instanceCount = InstanceList.size();
+
+    irr_driver->IncreasePolyCount(InstanceList.size() * mesh->IndexCount / 3);
+
+    for (unsigned i = 0; i < InstanceList.size(); i++)
+    {
+        STKMeshSceneNode *node = dynamic_cast<STKMeshSceneNode*>(InstanceList[i].second);
+        GlowInstanceData &Instance = InstanceBuffer[InstanceBufferOffset++];
+        const core::matrix4 &mat = node->getAbsoluteTransformation();
+        const core::vector3df &Origin = mat.getTranslation();
+        const core::vector3df &Orientation = mat.getRotationDegrees();
+        const core::vector3df &Scale = mat.getScale();
+        Instance.Color = node->getGlowColor().color;
+        Instance.Origin.X = Origin.X;
+        Instance.Origin.Y = Origin.Y;
+        Instance.Origin.Z = Origin.Z;
+        Instance.Orientation.X = Orientation.X;
+        Instance.Orientation.Y = Orientation.Y;
+        Instance.Orientation.Z = Orientation.Z;
+        Instance.Scale.X = Scale.X;
+        Instance.Scale.Y = Scale.Y;
+        Instance.Scale.Z = Scale.Z;
+    }
+}
+
+
+static
+void FillInstances(const std::map<scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > &GatheredGLMesh, std::vector<GLMesh *> &InstancedList,
+    InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, int cascade)
+{
+    auto It = GatheredGLMesh.begin(), E = GatheredGLMesh.end();
+    for (; It != E; ++It)
+    {
+        FillInstances_impl(It->second, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, cascade);
+        if (!UserConfigParams::m_azdo)
+            InstancedList.push_back(It->second.front().first);
+    }
+}
+
+static
+void FillInstancesGrass(const std::map<scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > &GatheredGLMesh, std::vector<GLMesh *> &InstancedList,
+    InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, int cascade, const core::vector3df &dir)
+{
+    auto It = GatheredGLMesh.begin(), E = GatheredGLMesh.end();
+    SunLightProvider * const cb = (SunLightProvider *)irr_driver->getCallback(ES_SUNLIGHT);
+    for (; It != E; ++It)
+    {
+        FillInstances_impl(It->second, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, cascade);
+        if (!UserConfigParams::m_azdo)
+            InstancedList.push_back(It->second.front().first);
+    }
+}
+
+static std::map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > MeshForSolidPass[MAT_COUNT];
+static std::map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > MeshForShadowPass[4][MAT_COUNT];
+static std::map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > MeshForRSMPass[MAT_COUNT];
+static std::map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, STKMeshCommon *> > > MeshForGlowPass;
+
+static core::vector3df windDir;
+
+static void
+handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *ImmediateDraw, bool IsCulledForSolid, bool IsCulledForShadow[4], bool IsCulledForRSM)
+{
+    STKMeshCommon *node = dynamic_cast<STKMeshCommon*>(Node);
+    if (!node)
+        return;
+    node->update();
+
+    if (node->isImmediateDraw())
+    {
+        ImmediateDraw->push_back(Node);
+        return;
+    }
+    for (unsigned Mat = 0; Mat < MAT_COUNT; ++Mat)
+    {
+        GLMesh *mesh;
+        if (!IsCulledForSolid)
+        {
+            if (irr_driver->hasARB_draw_indirect())
+            {
+                for_in(mesh, node->MeshSolidMaterial[Mat])
+                {
+                    if (node->glow())
+                        MeshForGlowPass[mesh->mb].push_back(std::make_pair(mesh, node));
+                    core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
+                    ModelMatrix.getInverse(InvModelMatrix);
+
+                    if (mesh->TextureMatrix.isIdentity())
+                        MeshForSolidPass[Mat][mesh->mb].push_back(std::make_pair(mesh, Node));
+                    else
+                    {
+                        switch (Mat)
+                        {
+                        case MAT_DEFAULT:
+                            ListMatDefault::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            break;
+                        case MAT_ALPHA_REF:
+                            ListMatAlphaRef::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            break;
+                        case MAT_UNLIT:
+                            ListMatUnlit::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            break;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
+                ModelMatrix.getInverse(InvModelMatrix);
+
+                for_in(mesh, node->MeshSolidMaterial[Mat])
+                {
+                    switch (Mat)
+                    {
+                    case MAT_DEFAULT:
+                        ListMatDefault::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        break;
+                    case MAT_ALPHA_REF:
+                        ListMatAlphaRef::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        break;
+                    case MAT_NORMAL_MAP:
+                        ListMatNormalMap::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        break;
+                    case MAT_DETAIL:
+                        ListMatDetails::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        break;
+                    case MAT_UNLIT:
+                        ListMatUnlit::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        break;
+                    case MAT_SPHEREMAP:
+                        ListMatSphereMap::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        break;
+                    case MAT_SPLATTING:
+                        ListMatSplatting::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix));
+                        break;
+                    case MAT_GRASS:
+                        ListMatGrass::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, windDir));
+                        break;
+                    }
+                }
+            }
+        }
+        for (unsigned cascade = 0; cascade < 4; ++cascade)
+        {
+            if (!IsCulledForShadow[cascade])
+            {
+                if (irr_driver->hasARB_draw_indirect())
+                {
+                    for_in(mesh, node->MeshSolidMaterial[Mat])
+                        MeshForShadowPass[cascade][Mat][mesh->mb].push_back(std::make_pair(mesh, Node));
+                }
+                else
+                {
+                    core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
+                    ModelMatrix.getInverse(InvModelMatrix);
+
+                    for_in(mesh, node->MeshSolidMaterial[Mat])
+                    {
+                        switch (Mat)
+                        {
+                        case MAT_DEFAULT:
+                            ListMatDefault::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            break;
+                        case MAT_ALPHA_REF:
+                            ListMatAlphaRef::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            break;
+                        case MAT_NORMAL_MAP:
+                            ListMatNormalMap::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            break;
+                        case MAT_DETAIL:
+                            ListMatDetails::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            break;
+                        case MAT_UNLIT:
+                            ListMatUnlit::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            break;
+                        case MAT_SPHEREMAP:
+                            ListMatSphereMap::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            break;
+                        case MAT_SPLATTING:
+                            ListMatSplatting::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix));
+                            break;
+                        case MAT_GRASS:
+                            ListMatGrass::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, windDir));
+                        }
+                    }
+                }
+            }
+        }
+        if (!IsCulledForRSM)
+        {
+            if (irr_driver->hasARB_draw_indirect())
+            {
+                for_in(mesh, node->MeshSolidMaterial[Mat])
+                    MeshForRSMPass[Mat][mesh->mb].push_back(std::make_pair(mesh, Node));
+            }
+            else
+            {
+                core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
+                ModelMatrix.getInverse(InvModelMatrix);
+
+                for_in(mesh, node->MeshSolidMaterial[Mat])
+                {
+                    switch (Mat)
+                    {
+                    case MAT_DEFAULT:
+                        ListMatDefault::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        break;
+                    case MAT_ALPHA_REF:
+                        ListMatAlphaRef::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        break;
+                    case MAT_NORMAL_MAP:
+                        ListMatNormalMap::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        break;
+                    case MAT_DETAIL:
+                        ListMatDetails::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        break;
+                    case MAT_UNLIT:
+                        ListMatUnlit::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        break;
+                    case MAT_SPHEREMAP:
+                        ListMatSphereMap::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        break;
+                    case MAT_SPLATTING:
+                        ListMatSplatting::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix));
+                        break;
+                    case MAT_GRASS:
+                        ListMatGrass::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, windDir));
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    // Transparent
+    if (!IsCulledForSolid)
+    {
+        GLMesh *mesh;
+        if (World::getWorld() && World::getWorld()->isFogEnabled())
+        {
+            const Track * const track = World::getWorld()->getTrack();
+
+            // Todo : put everything in a ubo
+            const float fogmax = track->getFogMax();
+            const float startH = track->getFogStartHeight();
+            const float endH = track->getFogEndHeight();
+            const float start = track->getFogStart();
+            const float end = track->getFogEnd();
+            const video::SColor tmpcol = track->getFogColor();
+
+            video::SColorf col(tmpcol.getRed() / 255.0f,
+                tmpcol.getGreen() / 255.0f,
+                tmpcol.getBlue() / 255.0f);
+
+            for_in(mesh, node->TransparentMesh[TM_DEFAULT])
+                pushVector(ListBlendTransparentFog::getInstance(), mesh, Node->getAbsoluteTransformation(), mesh->TextureMatrix,
+                fogmax, startH, endH, start, end, col);
+            for_in(mesh, node->TransparentMesh[TM_ADDITIVE])
+                pushVector(ListAdditiveTransparentFog::getInstance(), mesh, Node->getAbsoluteTransformation(), mesh->TextureMatrix,
+                fogmax, startH, endH, start, end, col);
+        }
+        else
+        {
+            for_in(mesh, node->TransparentMesh[TM_DEFAULT])
+                pushVector(ListBlendTransparent::getInstance(), mesh, Node->getAbsoluteTransformation(), mesh->TextureMatrix);
+            for_in(mesh, node->TransparentMesh[TM_ADDITIVE])
+                pushVector(ListAdditiveTransparent::getInstance(), mesh, Node->getAbsoluteTransformation(), mesh->TextureMatrix);
+        }
+        for_in(mesh, node->TransparentMesh[TM_DISPLACEMENT])
+            pushVector(ListDisplacement::getInstance(), mesh, Node->getAbsoluteTransformation());
+    }
+}
+
+static void
+parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::ISceneNode *> *ImmediateDraw,
+    scene::ICameraSceneNode *shadowCams[4], scene::ICameraSceneNode *RSM_cam)
+{
+    core::list<scene::ISceneNode*>::Iterator I = List.begin(), E = List.end();
+    for (; I != E; ++I)
+    {
+        if (LODNode *node = dynamic_cast<LODNode *>(*I))
+            node->updateVisibility();
+        if (!(*I)->isVisible())
+            continue;
+        (*I)->updateAbsolutePosition();
+        core::aabbox3d<f32> tbox = (*I)->getBoundingBox();
+        (*I)->getAbsoluteTransformation().transformBoxEx(tbox);
+
+        const scene::ICameraSceneNode* cam = irr_driver->getSceneManager()->getActiveCamera();
+        bool IsCulledForSolid = !(tbox.intersectsWithBox(cam->getViewFrustum()->getBoundingBox()));
+        bool IsCulledForShadow[4];
+        bool IsCulledForRSM = false;
+        for (unsigned i = 0; i < 4; ++i)
+        {
+            const scene::ICameraSceneNode* cam = shadowCams[i];
+            IsCulledForShadow[i] = !(tbox.intersectsWithBox(cam->getViewFrustum()->getBoundingBox()));
+        }
+
+        if (IsCulledForSolid && IsCulledForShadow[0] && IsCulledForShadow[1] && IsCulledForShadow[2] && IsCulledForShadow[3])
+            continue;
+
+        if (!IsCulledForSolid)
+        {
+            if (ParticleSystemProxy *node = dynamic_cast<ParticleSystemProxy *>(*I))
+            {
+                if (node->update())
+                    ParticlesList::getInstance()->push_back(node);
+                continue;
+            }
+        }
+
+        handleSTKCommon(*I, ImmediateDraw, IsCulledForSolid, IsCulledForShadow, false);
+
+        parseSceneManager((*I)->getChildren(), ImmediateDraw, shadowCams, RSM_cam);
+    }
+}
+
+template<MeshMaterial Mat> static void
+GenDrawCalls(unsigned cascade, std::vector<GLMesh *> &InstancedList,
+    InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset)
+{
+    if (irr_driver->hasARB_draw_indirect())
+        ShadowPassCmd::getInstance()->Offset[cascade][Mat] = CommandBufferOffset; // Store command buffer offset
+    FillInstances(MeshForShadowPass[cascade][Mat], InstancedList, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, cascade);
+    if (UserConfigParams::m_azdo)
+        ShadowPassCmd::getInstance()->Size[cascade][Mat] = CommandBufferOffset - ShadowPassCmd::getInstance()->Offset[cascade][Mat];
+}
+
+template<MeshMaterial Mat> static void
+GenDrawCallsGrass(unsigned cascade, std::vector<GLMesh *> &InstancedList,
+InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, const core::vector3df &dir)
+{
+    if (irr_driver->hasARB_draw_indirect())
+        ShadowPassCmd::getInstance()->Offset[cascade][Mat] = CommandBufferOffset; // Store command buffer offset
+    FillInstancesGrass(MeshForShadowPass[cascade][Mat], InstancedList, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, cascade, dir);
+    if (UserConfigParams::m_azdo)
+        ShadowPassCmd::getInstance()->Size[cascade][Mat] = CommandBufferOffset - ShadowPassCmd::getInstance()->Offset[cascade][Mat];
+}
+
+void IrrDriver::PrepareDrawCalls()
+{
+    windDir = getWindDir();
+    ListBlendTransparent::getInstance()->clear();
+    ListAdditiveTransparent::getInstance()->clear();
+    ListBlendTransparentFog::getInstance()->clear();
+    ListAdditiveTransparentFog::getInstance()->clear();
+    ListDisplacement::getInstance()->clear();
+
+    ListMatDefault::getInstance()->clear();
+    ListMatAlphaRef::getInstance()->clear();
+    ListMatSphereMap::getInstance()->clear();
+    ListMatDetails::getInstance()->clear();
+    ListMatUnlit::getInstance()->clear();
+    ListMatNormalMap::getInstance()->clear();
+    ListMatGrass::getInstance()->clear();
+    ListMatSplatting::getInstance()->clear();
+
+    ImmediateDrawList::getInstance()->clear();
+    ParticlesList::getInstance()->clear();
+    ListInstancedGlow::getInstance()->clear();
+
+    for (unsigned Mat = 0; Mat < MAT_COUNT; ++Mat)
+    {
+        MeshForSolidPass[Mat].clear();
+        MeshForRSMPass[Mat].clear();
+        for (unsigned cascade = 0; cascade < 4; ++cascade)
+            MeshForShadowPass[cascade][Mat].clear();
+    }
+    MeshForGlowPass.clear();
+    core::list<scene::ISceneNode*> List = m_scene_manager->getRootSceneNode()->getChildren();
+
+    bool isCulled[4] = {};
+    parseSceneManager(List, ImmediateDrawList::getInstance(), m_shadow_camnodes, m_suncam);
+    if (!irr_driver->hasARB_draw_indirect())
+        return;
+    InstanceData *InstanceBuffer;
+    InstanceData *ShadowInstanceBuffer;
+    InstanceData *RSMInstanceBuffer;
+    GlowInstanceData *GlowInstanceBuffer;
+    DrawElementsIndirectCommand *CmdBuffer;
+    DrawElementsIndirectCommand *ShadowCmdBuffer;
+    DrawElementsIndirectCommand *RSMCmdBuffer;
+    DrawElementsIndirectCommand *GlowCmdBuffer;
+
+    if (irr_driver->hasBufferStorageExtension())
+    {
+        InstanceBuffer = (InstanceData*)VAOManager::getInstance()->getInstanceBufferPtr(InstanceTypeDefault);
+        ShadowInstanceBuffer = (InstanceData*)VAOManager::getInstance()->getInstanceBufferPtr(InstanceTypeShadow);
+        RSMInstanceBuffer = (InstanceData*)VAOManager::getInstance()->getInstanceBufferPtr(InstanceTypeRSM);
+        GlowInstanceBuffer = (GlowInstanceData*)VAOManager::getInstance()->getInstanceBufferPtr(InstanceTypeGlow);
+        CmdBuffer = SolidPassCmd::getInstance()->Ptr;
+        ShadowCmdBuffer = ShadowPassCmd::getInstance()->Ptr;
+        GlowCmdBuffer = GlowPassCmd::getInstance()->Ptr;
+        RSMCmdBuffer = RSMPassCmd::getInstance()->Ptr;
+    }
+
+    ListInstancedMatDefault::getInstance()->clear();
+    ListInstancedMatAlphaRef::getInstance()->clear();
+    ListInstancedMatGrass::getInstance()->clear();
+    ListInstancedMatNormalMap::getInstance()->clear();
+    ListInstancedMatSphereMap::getInstance()->clear();
+    ListInstancedMatDetails::getInstance()->clear();
+    ListInstancedMatUnlit::getInstance()->clear();
+
+#pragma omp parallel sections
+    {
+#pragma omp section
+        {
+            size_t offset = 0, current_cmd = 0;
+            if (!irr_driver->hasBufferStorageExtension())
+            {
+                glBindBuffer(GL_ARRAY_BUFFER, VAOManager::getInstance()->getInstanceBuffer(InstanceTypeDefault));
+                InstanceBuffer = (InstanceData*)glMapBufferRange(GL_ARRAY_BUFFER, 0, 10000 * sizeof(InstanceData), GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
+                glBindBuffer(GL_DRAW_INDIRECT_BUFFER, SolidPassCmd::getInstance()->drawindirectcmd);
+                CmdBuffer = (DrawElementsIndirectCommand*)glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0, 10000 * sizeof(DrawElementsIndirectCommand), GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
+            }
+
+            // Default Material
+            SolidPassCmd::getInstance()->Offset[MAT_DEFAULT] = current_cmd;
+            FillInstances(MeshForSolidPass[MAT_DEFAULT], ListInstancedMatDefault::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, -1);
+            SolidPassCmd::getInstance()->Size[MAT_DEFAULT] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_DEFAULT];
+            // Alpha Ref
+            SolidPassCmd::getInstance()->Offset[MAT_ALPHA_REF] = current_cmd;
+            FillInstances(MeshForSolidPass[MAT_ALPHA_REF], ListInstancedMatAlphaRef::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, -1);
+            SolidPassCmd::getInstance()->Size[MAT_ALPHA_REF] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_ALPHA_REF];
+            // Unlit
+            SolidPassCmd::getInstance()->Offset[MAT_UNLIT] = current_cmd;
+            FillInstances(MeshForSolidPass[MAT_UNLIT], ListInstancedMatUnlit::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, -1);
+            SolidPassCmd::getInstance()->Size[MAT_UNLIT] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_UNLIT];
+            // Spheremap
+            SolidPassCmd::getInstance()->Offset[MAT_SPHEREMAP] = current_cmd;
+            FillInstances(MeshForSolidPass[MAT_SPHEREMAP], ListInstancedMatSphereMap::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, -1);
+            SolidPassCmd::getInstance()->Size[MAT_SPHEREMAP] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_SPHEREMAP];
+            // Detail
+            SolidPassCmd::getInstance()->Offset[MAT_DETAIL] = current_cmd;
+            FillInstances(MeshForSolidPass[MAT_DETAIL], ListInstancedMatDetails::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, -1);
+            SolidPassCmd::getInstance()->Size[MAT_DETAIL] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_DETAIL];
+            // Normal Map
+            SolidPassCmd::getInstance()->Offset[MAT_NORMAL_MAP] = current_cmd;
+            FillInstances(MeshForSolidPass[MAT_NORMAL_MAP], ListInstancedMatNormalMap::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, -1);
+            SolidPassCmd::getInstance()->Size[MAT_NORMAL_MAP] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_NORMAL_MAP];
+
+            // Grass
+            SolidPassCmd::getInstance()->Offset[MAT_GRASS] = current_cmd;
+            FillInstancesGrass(MeshForSolidPass[MAT_GRASS], ListInstancedMatGrass::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, -1, windDir);
+            SolidPassCmd::getInstance()->Size[MAT_GRASS] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_GRASS];
+
+            if (!irr_driver->hasBufferStorageExtension())
+            {
+                glUnmapBuffer(GL_ARRAY_BUFFER);
+                glUnmapBuffer(GL_DRAW_INDIRECT_BUFFER);
+            }
+        }
+#pragma omp section
+        {
+            size_t offset = 0, current_cmd = 0;
+
+            if (!irr_driver->hasBufferStorageExtension())
+            {
+                glBindBuffer(GL_ARRAY_BUFFER, VAOManager::getInstance()->getInstanceBuffer(InstanceTypeGlow));
+                GlowInstanceBuffer = (GlowInstanceData*)glMapBufferRange(GL_ARRAY_BUFFER, 0, 10000 * sizeof(InstanceData), GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
+                glBindBuffer(GL_DRAW_INDIRECT_BUFFER, GlowPassCmd::getInstance()->drawindirectcmd);
+                GlowCmdBuffer = (DrawElementsIndirectCommand*)glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0, 10000 * sizeof(DrawElementsIndirectCommand), GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
+            }
+
+            // Glow
+            if (irr_driver->hasARB_draw_indirect())
+                GlowPassCmd::getInstance()->Offset = offset; // Store command buffer offset
+
+            auto It = MeshForGlowPass.begin(), E = MeshForGlowPass.end();
+            for (; It != E; ++It)
+            {
+                FillInstancesGlow_impl(It->second, GlowInstanceBuffer, GlowCmdBuffer, offset, current_cmd);
+                if (!UserConfigParams::m_azdo)
+                    ListInstancedGlow::getInstance()->push_back(It->second.front().first);
+            }
+
+            if (UserConfigParams::m_azdo)
+                GlowPassCmd::getInstance()->Size = current_cmd - GlowPassCmd::getInstance()->Offset;
+
+            if (!irr_driver->hasBufferStorageExtension())
+            {
+                glUnmapBuffer(GL_ARRAY_BUFFER);
+                glUnmapBuffer(GL_DRAW_INDIRECT_BUFFER);
+            }
+        }
+#pragma omp section
+        {
+            irr_driver->setPhase(SHADOW_PASS);
+
+            size_t offset = 0, current_cmd = 0;
+            if (!irr_driver->hasBufferStorageExtension())
+            {
+                glBindBuffer(GL_ARRAY_BUFFER, VAOManager::getInstance()->getInstanceBuffer(InstanceTypeShadow));
+                ShadowInstanceBuffer = (InstanceData*)glMapBufferRange(GL_ARRAY_BUFFER, 0, 10000 * sizeof(InstanceData), GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
+                glBindBuffer(GL_DRAW_INDIRECT_BUFFER, ShadowPassCmd::getInstance()->drawindirectcmd);
+                ShadowCmdBuffer = (DrawElementsIndirectCommand*)glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0, 10000 * sizeof(DrawElementsIndirectCommand), GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
+            }
+
+            for (unsigned i = 0; i < 4; i++)
+            {
+                // Mat default
+                GenDrawCalls<MAT_DEFAULT>(i, ListInstancedMatDefault::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd);
+                // Mat AlphaRef
+                GenDrawCalls<MAT_ALPHA_REF>(i, ListInstancedMatAlphaRef::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd);
+                // Mat Unlit
+                GenDrawCalls<MAT_UNLIT>(i, ListInstancedMatUnlit::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd);
+                // Mat NormalMap
+                GenDrawCalls<MAT_NORMAL_MAP>(i, ListInstancedMatNormalMap::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd);
+                // Mat Spheremap
+                GenDrawCalls<MAT_SPHEREMAP>(i, ListInstancedMatSphereMap::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd);
+                // Mat Detail
+                GenDrawCalls<MAT_DETAIL>(i, ListInstancedMatDetails::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd);
+                // Mat Grass
+                GenDrawCallsGrass<MAT_GRASS>(i, ListInstancedMatGrass::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd, windDir);
+            }
+            if (!irr_driver->hasBufferStorageExtension())
+            {
+                glUnmapBuffer(GL_ARRAY_BUFFER);
+                glUnmapBuffer(GL_DRAW_INDIRECT_BUFFER);
+            }
+        }
+#pragma omp section
+        {
+            size_t offset = 0, current_cmd = 0;
+            if (!irr_driver->hasBufferStorageExtension())
+            {
+                glBindBuffer(GL_ARRAY_BUFFER, VAOManager::getInstance()->getInstanceBuffer(InstanceTypeRSM));
+                RSMInstanceBuffer = (InstanceData*)glMapBufferRange(GL_ARRAY_BUFFER, 0, 10000 * sizeof(InstanceData), GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
+                glBindBuffer(GL_DRAW_INDIRECT_BUFFER, RSMPassCmd::getInstance()->drawindirectcmd);
+                RSMCmdBuffer = (DrawElementsIndirectCommand*)glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0, 10000 * sizeof(DrawElementsIndirectCommand), GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
+            }
+
+            // Default Material
+            RSMPassCmd::getInstance()->Offset[MAT_DEFAULT] = current_cmd;
+            FillInstances(MeshForRSMPass[MAT_DEFAULT], ListInstancedMatDefault::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, -1);
+            RSMPassCmd::getInstance()->Size[MAT_DEFAULT] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_DEFAULT];
+            // Alpha Ref
+            RSMPassCmd::getInstance()->Offset[MAT_ALPHA_REF] = current_cmd;
+            FillInstances(MeshForRSMPass[MAT_ALPHA_REF], ListInstancedMatAlphaRef::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, -1);
+            RSMPassCmd::getInstance()->Size[MAT_ALPHA_REF] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_ALPHA_REF];
+            // Unlit
+            RSMPassCmd::getInstance()->Offset[MAT_UNLIT] = current_cmd;
+            FillInstances(MeshForRSMPass[MAT_UNLIT], ListInstancedMatUnlit::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, -1);
+            RSMPassCmd::getInstance()->Size[MAT_UNLIT] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_UNLIT];
+            // Detail
+            RSMPassCmd::getInstance()->Offset[MAT_DETAIL] = current_cmd;
+            FillInstances(MeshForRSMPass[MAT_DETAIL], ListInstancedMatDetails::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, -1);
+            RSMPassCmd::getInstance()->Size[MAT_DETAIL] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_DETAIL];
+            // Normal Map
+            RSMPassCmd::getInstance()->Offset[MAT_NORMAL_MAP] = current_cmd;
+            FillInstances(MeshForRSMPass[MAT_NORMAL_MAP], ListInstancedMatNormalMap::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, -1);
+            RSMPassCmd::getInstance()->Size[MAT_NORMAL_MAP] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_NORMAL_MAP];
+
+            if (!irr_driver->hasBufferStorageExtension())
+            {
+                glUnmapBuffer(GL_ARRAY_BUFFER);
+                glUnmapBuffer(GL_DRAW_INDIRECT_BUFFER);
+            }
+        }
+    }
+
+    glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
+}
\ No newline at end of file
diff --git a/src/graphics/stkscenemanager.hpp b/src/graphics/stkscenemanager.hpp
index fa924e05d..998fe2a72 100644
--- a/src/graphics/stkscenemanager.hpp
+++ b/src/graphics/stkscenemanager.hpp
@@ -7,6 +7,7 @@
 #include "utils/singleton.hpp"
 #include "gl_headers.hpp"
 #include "stkmesh.hpp"
+#include "gpuparticles.hpp"
 
 template<typename T>
 class CommandBuffer : public Singleton<T>
@@ -16,15 +17,28 @@ public:
     DrawElementsIndirectCommand *Ptr;
     CommandBuffer()
     {
-#ifdef Buffer_Storage
         glGenBuffers(1, &drawindirectcmd);
         glBindBuffer(GL_DRAW_INDIRECT_BUFFER, drawindirectcmd);
-        glBufferStorage(GL_DRAW_INDIRECT_BUFFER, 10000 * sizeof(DrawElementsIndirectCommand), 0, GL_MAP_PERSISTENT_BIT | GL_MAP_WRITE_BIT);
-        Ptr = (DrawElementsIndirectCommand *)glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0, 10000 * sizeof(DrawElementsIndirectCommand), GL_MAP_PERSISTENT_BIT | GL_MAP_WRITE_BIT);
+#ifdef Buffer_Storage
+        if (irr_driver->hasBufferStorageExtension())
+        {
+            glBufferStorage(GL_DRAW_INDIRECT_BUFFER, 10000 * sizeof(DrawElementsIndirectCommand), 0, GL_MAP_PERSISTENT_BIT | GL_MAP_WRITE_BIT);
+            Ptr = (DrawElementsIndirectCommand *)glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0, 10000 * sizeof(DrawElementsIndirectCommand), GL_MAP_PERSISTENT_BIT | GL_MAP_WRITE_BIT);
+        }
+        else
 #endif
+        {
+            glBufferData(GL_DRAW_INDIRECT_BUFFER, 10000 * sizeof(DrawElementsIndirectCommand), 0, GL_STREAM_DRAW);
+        }
     }
 };
 
+class ImmediateDrawList : public Singleton<ImmediateDrawList>, public std::vector<scene::ISceneNode *>
+{};
+
+class ParticlesList : public Singleton<ParticlesList>, public std::vector<ParticleSystemProxy *>
+{};
+
 
 class SolidPassCmd : public CommandBuffer<SolidPassCmd>
 {
@@ -38,5 +52,17 @@ public:
     size_t Offset[4][MAT_COUNT], Size[4][MAT_COUNT];
 };
 
+class RSMPassCmd : public CommandBuffer<RSMPassCmd>
+{
+public:
+    size_t Offset[MAT_COUNT], Size[MAT_COUNT];
+};
+
+class GlowPassCmd : public CommandBuffer<GlowPassCmd>
+{
+public:
+    size_t Offset, Size;
+};
+
 
 #endif
\ No newline at end of file

From ccdc90f029e1c3f70bda2097eb114147678c8b75 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 3 Sep 2014 08:08:41 +1000
Subject: [PATCH 169/248] Removed while loop with a 'random' abort condition -
 while it works it could result in STK hanging if a broken random generator
 should be used.

---
 src/race/grand_prix_data.cpp          | 28 +++++++++++++++-------
 src/states_screens/gp_info_screen.cpp | 34 +++++++++++----------------
 src/tracks/track.hpp                  |  8 +++++++
 src/tracks/track_manager.cpp          | 13 ++++++++++
 src/tracks/track_manager.hpp          |  4 +---
 5 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/src/race/grand_prix_data.cpp b/src/race/grand_prix_data.cpp
index f23c26987..31d4ba53e 100644
--- a/src/race/grand_prix_data.cpp
+++ b/src/race/grand_prix_data.cpp
@@ -81,9 +81,14 @@ void GrandPrixData::createRandomGP(const unsigned int number_of_tracks,
 
     changeTrackNumber(number_of_tracks, track_group);
     changeReverse(use_reverse);
-}
+}   // createRandomGP
 
 // ----------------------------------------------------------------------------
+/** Either adds or removes tracks to get the requested numder of tracks in
+ *  a random GP.
+ *  \param number_of_tracks How many tracks should be in the random list.
+ *  \param track_group From which group to select the tracks.
+ */
 void GrandPrixData::changeTrackNumber(const unsigned int number_of_tracks,
                                       const std::string& track_group)
 {
@@ -95,7 +100,13 @@ void GrandPrixData::changeTrackNumber(const unsigned int number_of_tracks,
         for(unsigned int i=0; i<track_manager->getNumberOfTracks(); i++)
         {
             const Track *track = track_manager->getTrack(i);
-            if(!track->isArena() && !track->isSoccer() && !track->isInternal())
+            // Ignore no-racing tracks:
+            if(track->isArena() || track->isSoccer() || track->isInternal())
+                continue;
+
+            // Only add tracks that are not already picked.
+            if(std::find(m_tracks.begin(), m_tracks.end(), track->getIdent())==
+                m_tracks.end())
                 track_indices.push_back(i);
         }
     }
@@ -103,24 +114,23 @@ void GrandPrixData::changeTrackNumber(const unsigned int number_of_tracks,
     {
         track_indices = track_manager->getTracksInGroup(track_group);
     }
-    assert(number_of_tracks <= track_indices.size());
+    assert(number_of_tracks <= track_indices.size() + m_tracks.size());
 
     // add or remove the right number of tracks
     if (m_tracks.size() < number_of_tracks)
     {
         while (m_tracks.size() < number_of_tracks)
         {
-            int index = track_indices[rand() % track_indices.size()];
+            int index       = rand() % track_indices.size();
+            int track_index = track_indices[index];
 
-            const Track *track = track_manager->getTrack(index);
+            const Track *track = track_manager->getTrack(track_index);
             std::string id = track->getIdent();
-            // Avoid duplicate tracks
-            if (std::find(m_tracks.begin(), m_tracks.end(), id) != m_tracks.end())
-                continue;
 
             m_tracks.push_back(id);
             m_laps.push_back(track->getDefaultNumberOfLaps());
             m_reversed.push_back(false); // This will be changed later in the code
+            track_indices.erase(track_indices.begin()+index);
         }
     }
     else if (m_tracks.size() > number_of_tracks)
@@ -135,7 +145,7 @@ void GrandPrixData::changeTrackNumber(const unsigned int number_of_tracks,
 
     assert(m_tracks.size() == m_laps.size()    );
     assert(m_laps.size()   == m_reversed.size());
-}
+}   // changeTrackNumber
 
 // ----------------------------------------------------------------------------
 /** Updates the GP data with newly decided reverse requirements.
diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index fe04d1268..dd0e979ab 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -83,7 +83,7 @@ void BaseGPInfoScreen::loadedFromFile()
     m_num_tracks_spinner = getWidget<SpinnerWidget>("track-spinner");
     // Only init the number of tracks here, this way the previously selected
     // number of tracks will be the default.
-    m_num_tracks_spinner->setValue(4);
+    m_num_tracks_spinner->setValue(1);
     int number_of_tracks = m_num_tracks_spinner->getValue();
 }   // loadedFromFile
 
@@ -163,9 +163,10 @@ void BaseGPInfoScreen::init()
         // If there are more tracks selected atm as in the group (which can 
         // happen if the group has been changed since last time this screen
         // was shown), adjust it:
-        int max_num_tracks = 
-            m_group_name=="all" ? track_manager->getNumberOfTracks()
-                                : track_manager->getTracksInGroup(m_group_name).size();
+        int max_num_tracks = m_group_name=="all" 
+                           ? track_manager->getNumberOfRaceTracks()
+                           : track_manager->getTracksInGroup(m_group_name).size();
+        m_num_tracks_spinner->setMax(max_num_tracks);
         if(m_num_tracks_spinner->getValue() > max_num_tracks)
         {
             m_num_tracks_spinner->setValue(max_num_tracks);
@@ -287,14 +288,7 @@ void BaseGPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &nam
 
         if (button == "start" || button=="continue")
         {
-            // Save GP identifier, since dismiss will delete this object.
-            GrandPrixData gp_data = m_gp;
-            // Also create a copy of the string: it is a reference to data
-            // in a widget in the dialog - so if we call dismiss, this reference
-            // becomes invalid!
-            std::string save_source = name;
-            // FIXME ModalDialog::dismiss();
-            race_manager->startGP(gp_data, false, (save_source == "continue"));
+            race_manager->startGP(m_gp, false, (name == "continue"));
         }
     }   // name=="buttons"
     else if (name=="group-spinner")
@@ -305,20 +299,20 @@ void BaseGPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &nam
         // the current track. The current value in the Number-of-tracks-spinner
         // has to be updated, since otherwise the displayed (and used) value
         // can be bigger than the maximum. (Might be a TODO to fix this)
-        unsigned int max = (m_group_name == "all") ?
-                           track_manager->getNumberOfTracks() :
-                           track_manager->getTracksInGroup(m_group_name).size();
-        m_num_tracks_spinner->setMax(max);
-        int number_of_tracks = std::min((int)max, m_num_tracks_spinner->getValue());
-        if (m_num_tracks_spinner->getValue() > (signed)max)
-            m_num_tracks_spinner->setValue(max);
+        int max_num_tracks = m_group_name=="all" 
+                           ? track_manager->getNumberOfRaceTracks()
+                           : track_manager->getTracksInGroup(m_group_name).size();
+        m_num_tracks_spinner->setMax(max_num_tracks);
+        int number_of_tracks = std::min(max_num_tracks,
+                                        m_num_tracks_spinner->getValue());
+        if (m_num_tracks_spinner->getValue() > max_num_tracks)
+            m_num_tracks_spinner->setValue(max_num_tracks);
         // Create a new (i.e. with new tracks) random gp, since the old
         // tracks might not all belong to the newly selected group.
         
         m_gp.createRandomGP(m_num_tracks_spinner->getValue(), m_group_name,
                             getReverse(),  /*new_tracks*/true);
         addTracks();
-
     }
     else if (name=="track-spinner")
     {
diff --git a/src/tracks/track.hpp b/src/tracks/track.hpp
index 424598de4..894280d36 100644
--- a/src/tracks/track.hpp
+++ b/src/tracks/track.hpp
@@ -464,8 +464,16 @@ public:
     /** Returns true if this track has an arena mode. */
     bool isArena() const { return m_is_arena; }
     // ------------------------------------------------------------------------
+    /** Returns true if this track is a racing track. This means it is not an
+     *  internal track (like cut scenes), arena, or soccer field. */
+    bool isRaceTrack() const 
+    {
+        return !m_internal && !m_is_arena && !m_is_soccer;
+    }   // isRaceTrack
+    // ------------------------------------------------------------------------
     /** Returns true if this track has easter eggs. */
     bool hasEasterEggs() const { return m_has_easter_eggs; }
+    // ------------------------------------------------------------------------
     bool               isSoccer             () const { return m_is_soccer; }
     // ------------------------------------------------------------------------
     void               loadTrackModel  (World* parent,
diff --git a/src/tracks/track_manager.cpp b/src/tracks/track_manager.cpp
index b2092b13e..94c9a5637 100644
--- a/src/tracks/track_manager.cpp
+++ b/src/tracks/track_manager.cpp
@@ -57,6 +57,19 @@ void TrackManager::addTrackSearchDir(const std::string &dir)
     m_track_search_path.push_back(dir);
 }   // addTrackDir
 
+//-----------------------------------------------------------------------------
+/** Returns the number of racing tracks. Those are tracks that are not 
+ *  internal (like cut scenes), arenas, or soccer fields.
+ */
+int TrackManager::getNumberOfRaceTracks() const
+{
+    int n=0;
+    for(unsigned int i=0; i<m_tracks.size(); i++)
+        if(m_tracks[i]->isRaceTrack())
+            n++;
+    return n;
+}   // getNumberOfRaceTracks
+
 //-----------------------------------------------------------------------------
 /** Get TrackData by the track identifier.
  *  \param ident Identifier = basename of the directory the track is in.
diff --git a/src/tracks/track_manager.hpp b/src/tracks/track_manager.hpp
index 3faf53921..7d2b86ed1 100644
--- a/src/tracks/track_manager.hpp
+++ b/src/tracks/track_manager.hpp
@@ -53,9 +53,6 @@ private:
     /** List of all soccer arena groups. */
     Group2Indices                            m_soccer_arena_groups;
 
-    /** List of all groups (for both normal tracks and arenas) */
-    //std::vector<std::string>                 m_all_group_names;
-
     /** List of the names of all groups containing tracks */
     std::vector<std::string>                 m_track_group_names;
 
@@ -85,6 +82,7 @@ public:
     void  removeTrack(const std::string &ident);
     bool  loadTrack(const std::string& dirname);
     void  removeAllCachedData();
+    int   getNumberOfRaceTracks() const;
     Track* getTrack(const std::string& ident) const;
     // ------------------------------------------------------------------------
     /** Sets a list of track as being unavailable (e.g. in network mode the

From ae01eaf5953a9d46e30d0a020fa4434cda29cfa8 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 3 Sep 2014 08:16:52 +1000
Subject: [PATCH 170/248] Use track->isRaceTrack().

---
 src/race/grand_prix_data.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/race/grand_prix_data.cpp b/src/race/grand_prix_data.cpp
index 31d4ba53e..7ff76b590 100644
--- a/src/race/grand_prix_data.cpp
+++ b/src/race/grand_prix_data.cpp
@@ -101,7 +101,7 @@ void GrandPrixData::changeTrackNumber(const unsigned int number_of_tracks,
         {
             const Track *track = track_manager->getTrack(i);
             // Ignore no-racing tracks:
-            if(track->isArena() || track->isSoccer() || track->isInternal())
+            if(!track->isRaceTrack())
                 continue;
 
             // Only add tracks that are not already picked.

From 0a0609d91fb54d720331f2c2544e89b9aa012ca8 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 3 Sep 2014 08:24:11 +1000
Subject: [PATCH 171/248] Added GrandPrixData::isRandomGP.

---
 src/race/grand_prix_data.hpp          | 3 +++
 src/states_screens/gp_info_screen.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/race/grand_prix_data.hpp b/src/race/grand_prix_data.hpp
index ea8422e43..36530b84c 100644
--- a/src/race/grand_prix_data.hpp
+++ b/src/race/grand_prix_data.hpp
@@ -135,6 +135,9 @@ public:
     /** @return the internal indentifier of the Grand Prix (not translated) */
     const std::string& getId()       const { return m_id;                 }
 
+    // ------------------------------------------------------------------------
+    /** Returns true if this GP is a random GP. */
+    bool isRandomGP() const { return m_id=="random"; }
     // ------------------------------------------------------------------------
     /** Returns the filename of the grand prix xml file. */
     const std::string& getFilename() const { return m_filename;           }
diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index dd0e979ab..e5d61c7d7 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -125,7 +125,7 @@ void BaseGPInfoScreen::init()
     Screen::init();
     m_curr_time = 0.0f;
 
-    bool random = m_gp.getId()=="random";
+    bool random = m_gp.isRandomGP();
 
     SpinnerWidget *reverse_spinner = getWidget<SpinnerWidget>("reverse-spinner");
     getWidget<LabelWidget  >("track-text"   )->setVisible(random);

From 102e5174970d69c3417c605a42d82df41dd45067 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 2 Sep 2014 18:54:38 -0400
Subject: [PATCH 172/248] Remove manual LOD code, it's now automatic

---
 src/physics/physical_object.cpp          | 10 ----
 src/tracks/model_definition_loader.cpp   | 29 ------------
 src/tracks/model_definition_loader.hpp   |  4 --
 src/tracks/track.cpp                     | 60 +-----------------------
 src/tracks/track_object.cpp              | 12 +----
 src/tracks/track_object_presentation.cpp | 53 ---------------------
 src/tracks/track_object_presentation.hpp | 14 ------
 7 files changed, 3 insertions(+), 179 deletions(-)

diff --git a/src/physics/physical_object.cpp b/src/physics/physical_object.cpp
index 9c2bae169..8c750aa22 100644
--- a/src/physics/physical_object.cpp
+++ b/src/physics/physical_object.cpp
@@ -241,16 +241,6 @@ void PhysicalObject::init()
             Log::fatal("PhysicalObject", "Unknown node type");
         }
     }
-    else if (dynamic_cast<TrackObjectPresentationInstancing*>(presentation) != NULL)
-    {
-        TrackObjectPresentationInstancing* instancing = dynamic_cast<TrackObjectPresentationInstancing*>(presentation);
-        STKInstancedSceneNode* instancing_group = instancing->getInstancingGroup();
-        if (instancing_group != NULL)
-        {
-            scene::IMesh* mesh = instancing_group->getMesh();
-            MeshTools::minMax3D(mesh, &min, &max);
-        }
-    }
     else
     {
         Log::fatal("PhysicalObject", "Unknown node type");
diff --git a/src/tracks/model_definition_loader.cpp b/src/tracks/model_definition_loader.cpp
index 0e0303ced..75a1575c0 100644
--- a/src/tracks/model_definition_loader.cpp
+++ b/src/tracks/model_definition_loader.cpp
@@ -111,35 +111,6 @@ LODNode* ModelDefinitionLoader::instanciateAsLOD(const XMLNode* node, scene::ISc
 
 // ----------------------------------------------------------------------------
 
-STKInstancedSceneNode* ModelDefinitionLoader::instanciate(const irr::core::vector3df& position,
-                                const irr::core::vector3df& rotation,
-                                const irr::core::vector3df scale,
-                                const std::string& name)
-{
-    if (m_instancing_nodes.find(name) == m_instancing_nodes.end())
-    {
-        if (m_lod_groups.find(name) == m_lod_groups.end())
-        {
-            Log::warn("Instancing", "Cannot find instancing model <%s>", name.c_str());
-            return NULL;
-        }
-
-        scene::IMesh* mesh = irr_driver->getMesh(m_lod_groups[name][0].m_model_file);
-        mesh = MeshTools::createMeshWithTangents(mesh, &MeshTools::isNormalMap);
-        irr_driver->setAllMaterialFlags(mesh);
-
-        m_instancing_nodes[name] = new STKInstancedSceneNode(mesh,
-            irr_driver->getSceneManager()->getRootSceneNode(), irr_driver->getSceneManager(), -1);
-        m_track->addNode(m_instancing_nodes[name]);
-    }
-
-    m_instancing_nodes[name]->addInstance(position, rotation, scale);
-    m_instancing_nodes[name]->instanceGrab();
-    return m_instancing_nodes[name];
-}
-
-// ----------------------------------------------------------------------------
-
 void ModelDefinitionLoader::clear()
 {
     m_lod_groups.clear();
diff --git a/src/tracks/model_definition_loader.hpp b/src/tracks/model_definition_loader.hpp
index 3c750348d..b3bf75694 100644
--- a/src/tracks/model_definition_loader.hpp
+++ b/src/tracks/model_definition_loader.hpp
@@ -83,10 +83,6 @@ public:
 
     void addModelDefinition(const XMLNode* xml);
     LODNode* instanciateAsLOD(const XMLNode* xml_node, scene::ISceneNode* parent);
-    STKInstancedSceneNode* instanciate(const core::vector3df& position,
-                                       const irr::core::vector3df& rotation,
-                                       const irr::core::vector3df scale,
-                                       const std::string& name);
 
     void clear();
 
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 02e10b9a6..a5347b626 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -742,24 +742,10 @@ void Track::convertTrackToBullet(scene::ISceneNode *node)
     node->updateAbsolutePosition();
 
     std::vector<core::matrix4> matrices;
-
-    STKInstancedSceneNode* instancing_node = NULL;// dynamic_cast<STKInstancedSceneNode*>(node);
-    if (instancing_node != NULL)
-    {
-        int count = instancing_node->getInstanceCount();
-        for (int i = 0; i < count; i++)
-        {
-            matrices.push_back(instancing_node->getInstanceTransform(i));
-        }
-    }
-    else
-    {
-        matrices.push_back(node->getAbsoluteTransformation());
-    }
+    matrices.push_back(node->getAbsoluteTransformation());
 
     const core::vector3df &pos   = node->getAbsolutePosition();
 
-
     scene::IMesh *mesh;
     // In case of readonly materials we have to get the material from
     // the mesh, otherwise from the node. This is esp. important for
@@ -1063,20 +1049,6 @@ bool Track::loadMainTrack(const XMLNode &root)
         }
     }
 
-    // Load instancing models (for the moment they are loaded the same way as LOD to simplify implementation)
-    const XMLNode *instancing_xml_node = NULL;// root.getNode("instancing");
-    if (instancing_xml_node != NULL)
-    {
-        for (unsigned int i = 0; i < instancing_xml_node->getNumNodes(); i++)
-        {
-            const XMLNode* lod_group_xml = instancing_xml_node->getNode(i);
-            for (unsigned int j = 0; j < lod_group_xml->getNumNodes(); j++)
-            {
-                lodLoader.addModelDefinition(lod_group_xml->getNode(j));
-            }
-        }
-    }
-
     for (unsigned int i=0; i<track_node->getNumNodes(); i++)
     {
         const XMLNode *n=track_node->getNode(i);
@@ -1756,20 +1728,6 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
         }
     }
 
-    // Load instancing models (for the moment they are loaded the same way as LOD to simplify implementation)
-    const XMLNode *instancing_xml_node = NULL;// root->getNode("instancing");
-    if (instancing_xml_node != NULL)
-    {
-        for (unsigned int i = 0; i < instancing_xml_node->getNumNodes(); i++)
-        {
-            const XMLNode* lod_group_xml = instancing_xml_node->getNode(i);
-            for (unsigned int j = 0; j < lod_group_xml->getNumNodes(); j++)
-            {
-                model_def_loader.addModelDefinition(lod_group_xml->getNode(j));
-            }
-        }
-    }
-
     std::map<std::string, XMLNode*> library_nodes;
     loadObjects(root, path, model_def_loader, true, NULL, library_nodes);
 
@@ -2010,20 +1968,6 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
                         }
                     }
                 }
-
-                // Load instancing definitions
-                const XMLNode *instancing_xml_node = NULL;// libroot->getNode("instancing");
-                if (instancing_xml_node != NULL)
-                {
-                    for (unsigned int i = 0; i < instancing_xml_node->getNumNodes(); i++)
-                    {
-                        const XMLNode* instancing_group_xml = instancing_xml_node->getNode(i);
-                        for (unsigned int j = 0; j < instancing_group_xml->getNumNodes(); j++)
-                        {
-                            model_def_loader.addModelDefinition(instancing_group_xml->getNode(j));
-                        }
-                    }
-                }
             }
             else
             {
@@ -2128,7 +2072,7 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
         }
         else if (name == "instancing")
         {
-            // handled above
+            // TODO: eventually remove, this is now automatic
         }
         else if (name == "subtitles")
         {
diff --git a/src/tracks/track_object.cpp b/src/tracks/track_object.cpp
index 4053ca239..476941137 100644
--- a/src/tracks/track_object.cpp
+++ b/src/tracks/track_object.cpp
@@ -103,9 +103,6 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
     bool lod_instance = false;
     xml_node.get("lod_instance", &lod_instance);
 
-    bool instancing = false;
-//    xml_node.get("instancing", &instancing);
-
     m_soccer_ball = false;
     xml_node.get("soccer_ball", &m_soccer_ball);
     
@@ -159,14 +156,7 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
     {
         scene::ISceneNode *glownode = NULL;
 
-        if (instancing)
-        {
-            m_type = "lod";
-            TrackObjectPresentationInstancing* instancing_node =
-                new TrackObjectPresentationInstancing(xml_node, parent, model_def_loader);
-            m_presentation = instancing_node;
-        }
-        else if (lod_instance)
+        if (lod_instance)
         {
             m_type = "lod";
             TrackObjectPresentationLOD* lod_node =
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 6aef4dcc7..0b535447c 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -168,59 +168,6 @@ TrackObjectPresentationLOD::~TrackObjectPresentationLOD()
 
 // ----------------------------------------------------------------------------
 
-TrackObjectPresentationInstancing::TrackObjectPresentationInstancing(const XMLNode& xml_node,
-    scene::ISceneNode* parent,
-    ModelDefinitionLoader& model_def_loader) : TrackObjectPresentationSceneNode(xml_node)
-{
-    m_instancing_group = NULL;
-    m_fallback_scene_node = NULL;
-
-    std::string instancing_model;
-    xml_node.get("instancing_model", &instancing_model);
-
-    m_node = irr_driver->getSceneManager()->addEmptySceneNode(parent);
-    m_node->setPosition(m_init_xyz);
-    m_node->setRotation(m_init_hpr);
-    m_node->setScale(m_init_scale);
-    m_node->updateAbsolutePosition();
-    if (irr_driver->isGLSL())
-    {
-        m_instancing_group = model_def_loader.instanciate(m_node->getAbsolutePosition(),
-            m_node->getAbsoluteTransformation().getRotationDegrees(), m_node->getAbsoluteTransformation().getScale(),
-            instancing_model);
-    }
-    else
-    {
-        scene::IMesh* mesh = model_def_loader.getFirstMeshFor(instancing_model);
-        scene::IMeshSceneNode* node = irr_driver->addMesh(mesh, m_node);
-        node->grab();
-        irr_driver->grabAllTextures(mesh);
-        mesh->grab();
-        World::getWorld()->getTrack()->addNode(node);
-
-        m_fallback_scene_node = node;
-    }
-}
-
-TrackObjectPresentationInstancing::~TrackObjectPresentationInstancing()
-{
-    if (m_instancing_group != NULL)
-        m_instancing_group->instanceDrop();
-
-    if (m_fallback_scene_node != NULL)
-    {
-        scene::IMesh* mesh = m_fallback_scene_node->getMesh();
-        irr_driver->dropAllTextures(mesh);
-        mesh->drop();
-        if (mesh->getReferenceCount() == 1)
-            irr_driver->removeMeshFromCache(mesh);
-
-        m_fallback_scene_node->drop();
-    }
-}
-
-// ----------------------------------------------------------------------------
-
 TrackObjectPresentationMesh::TrackObjectPresentationMesh(const XMLNode& xml_node,
     bool enabled, scene::ISceneNode* parent) :
     TrackObjectPresentationSceneNode(xml_node)
diff --git a/src/tracks/track_object_presentation.hpp b/src/tracks/track_object_presentation.hpp
index ff43d850c..219c98c5e 100644
--- a/src/tracks/track_object_presentation.hpp
+++ b/src/tracks/track_object_presentation.hpp
@@ -167,20 +167,6 @@ public:
     virtual ~TrackObjectPresentationLOD();
 };
 
-class TrackObjectPresentationInstancing : public TrackObjectPresentationSceneNode
-{
-    STKInstancedSceneNode* m_instancing_group;
-    scene::IMeshSceneNode* m_fallback_scene_node;
-public:
-
-    TrackObjectPresentationInstancing(const XMLNode& xml_node,
-        scene::ISceneNode* parent,
-        ModelDefinitionLoader& model_def_loader);
-    virtual ~TrackObjectPresentationInstancing();
-
-    STKInstancedSceneNode* getInstancingGroup() { return m_instancing_group;  }
-};
-
 /**
  * \ingroup tracks
  * A track object representation that consists of a mesh scene node.

From cf85f973151e2bf880f46d9baa04d77e3db955e8 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 3 Sep 2014 01:29:24 +0200
Subject: [PATCH 173/248] Fix crash with RSM

---
 src/graphics/render_geometry.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index a5192585d..cd07fc976 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -959,7 +959,7 @@ void IrrDriver::renderRSM()
         renderRSMShadow<MeshShader::InstancedRSMShader, MAT_DEFAULT, video::EVT_STANDARD>(std::vector < GLuint > { 0 }, ListInstancedMatDefault::getInstance()->RSM, rsm_matrix);
         renderRSMShadow<MeshShader::InstancedRSMShader, MAT_ALPHA_REF, video::EVT_STANDARD>(std::vector < GLuint > { 0 }, ListInstancedMatAlphaRef::getInstance()->RSM, rsm_matrix);
         renderRSMShadow<MeshShader::InstancedRSMShader, MAT_UNLIT, video::EVT_STANDARD>(std::vector < GLuint > { 0 }, ListInstancedMatUnlit::getInstance()->RSM, rsm_matrix);
-        renderRSMShadow<MeshShader::InstancedRSMShader, MAT_NORMAL_MAP, video::EVT_TANGENTS>(std::vector<GLuint>(), ListInstancedMatNormalMap::getInstance()->RSM, rsm_matrix);
+        renderRSMShadow<MeshShader::InstancedRSMShader, MAT_NORMAL_MAP, video::EVT_TANGENTS>(std::vector < GLuint > { 0 }, ListInstancedMatNormalMap::getInstance()->RSM, rsm_matrix);
         renderRSMShadow<MeshShader::InstancedRSMShader, MAT_DETAIL, video::EVT_2TCOORDS>(std::vector < GLuint > { 0 }, ListInstancedMatDetails::getInstance()->RSM, rsm_matrix);
     }
 #endif

From 13e1a40b7b522a12aceee7ac6619e796a93b7e3d Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 3 Sep 2014 01:33:52 +0200
Subject: [PATCH 174/248] Remove stkinstancedscenenode.h/cpp

---
 src/graphics/render.cpp                  |   1 -
 src/graphics/render_geometry.cpp         |   1 -
 src/graphics/render_lighting.cpp         |   1 -
 src/graphics/render_skybox.cpp           |   1 -
 src/graphics/stkinstancedscenenode.cpp   | 220 -----------------------
 src/graphics/stkinstancedscenenode.hpp   |  47 -----
 src/graphics/stkscenemanager.cpp         |   1 -
 src/physics/physical_object.cpp          |   1 -
 src/tracks/model_definition_loader.cpp   |   1 -
 src/tracks/track.cpp                     |   1 -
 src/tracks/track_object_presentation.cpp |   1 -
 11 files changed, 276 deletions(-)
 delete mode 100644 src/graphics/stkinstancedscenenode.cpp
 delete mode 100644 src/graphics/stkinstancedscenenode.hpp

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 18c97b305..46854a8fa 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -34,7 +34,6 @@
 #include "graphics/screenquad.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/stkmeshscenenode.hpp"
-#include "graphics/stkinstancedscenenode.hpp"
 #include "graphics/wind.hpp"
 #include "io/file_manager.hpp"
 #include "items/item.hpp"
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index cd07fc976..81bfc249f 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -16,7 +16,6 @@
 #include "graphics/screenquad.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/stkmeshscenenode.hpp"
-#include "graphics/stkinstancedscenenode.hpp"
 #include "graphics/wind.hpp"
 #include "io/file_manager.hpp"
 #include "items/item.hpp"
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index fa3c3ec7f..d69c7a843 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -16,7 +16,6 @@
 #include "graphics/screenquad.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/stkmeshscenenode.hpp"
-#include "graphics/stkinstancedscenenode.hpp"
 #include "graphics/wind.hpp"
 #include "io/file_manager.hpp"
 #include "items/item.hpp"
diff --git a/src/graphics/render_skybox.cpp b/src/graphics/render_skybox.cpp
index 8ae0bdeaf..d11cf8f4c 100644
--- a/src/graphics/render_skybox.cpp
+++ b/src/graphics/render_skybox.cpp
@@ -16,7 +16,6 @@
 #include "graphics/screenquad.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/stkmeshscenenode.hpp"
-#include "graphics/stkinstancedscenenode.hpp"
 #include "graphics/wind.hpp"
 #include "io/file_manager.hpp"
 #include "items/item.hpp"
diff --git a/src/graphics/stkinstancedscenenode.cpp b/src/graphics/stkinstancedscenenode.cpp
deleted file mode 100644
index ce6b5a907..000000000
--- a/src/graphics/stkinstancedscenenode.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-#include "stkinstancedscenenode.hpp"
-#include "graphics/irr_driver.hpp"
-#include "graphics/callbacks.hpp"
-
-STKInstancedSceneNode::STKInstancedSceneNode(irr::scene::IMesh* mesh, ISceneNode* parent, irr::scene::ISceneManager* mgr, irr::s32 id,
-    const irr::core::vector3df& position,
-    const irr::core::vector3df& rotation,
-    const irr::core::vector3df& scale) :
-    CMeshSceneNode(mesh, parent, mgr, id, position, rotation, scale)
-{
-    m_ref_count = 0;
-    irr_driver->grabAllTextures(mesh);
-
-    if (irr_driver->isGLSL())
-    {
-        createGLMeshes();
-        setAutomaticCulling(0);
-    }
-}
-
-void STKInstancedSceneNode::cleanGL()
-{
-    for (u32 i = 0; i < GLmeshes.size(); ++i)
-    {
-        GLMesh mesh = GLmeshes[i];
-        if (!mesh.vertex_buffer)
-            continue;
-        if (mesh.vao)
-            glDeleteVertexArrays(1, &(mesh.vao));
-        if (mesh.vertex_buffer)
-            glDeleteBuffers(1, &(mesh.vertex_buffer));
-        if (mesh.index_buffer)
-            glDeleteBuffers(1, &(mesh.index_buffer));
-        if (mesh.instance_buffer)
-            glDeleteBuffers(1, &(mesh.instance_buffer));
-#ifdef Bindless_Texture_Support
-        for (unsigned j = 0; i < 6; i++)
-        {
-            if (mesh.TextureHandles[j] && glIsTextureHandleResidentARB(mesh.TextureHandles[j]))
-                glMakeTextureHandleNonResidentARB(mesh.TextureHandles[j]);
-        }
-#endif
-    }
-}
-
-STKInstancedSceneNode::~STKInstancedSceneNode()
-{
-    irr_driver->dropAllTextures(getMesh());
-    irr_driver->removeMeshFromCache(getMesh());
-
-    if (irr_driver->isGLSL())
-        cleanGL();
-}
-
-void STKInstancedSceneNode::createGLMeshes()
-{
-    for (u32 i = 0; i<Mesh->getMeshBufferCount(); ++i)
-    {
-        scene::IMeshBuffer* mb = Mesh->getMeshBuffer(i);
-        GLmeshes.push_back(allocateMeshBuffer(mb));
-        GLMesh &mesh = GLmeshes.back();
-        if (irr_driver->hasARB_base_instance())
-        {
-            std::pair<unsigned, unsigned> p = VAOManager::getInstance()->getBase(mb);
-            mesh.vaoBaseVertex = p.first;
-            mesh.vaoOffset = p.second;
-        }
-        else
-            fillLocalBuffer(mesh, mb);
-        instanceData.push_back(std::vector<InstanceData>());
-    }
-    isMaterialInitialized = false;
-}
-
-void STKInstancedSceneNode::initinstancedvaostate(GLMesh &mesh, const std::vector<InstanceData> &instances)
-{
-    if (!irr_driver->hasARB_base_instance())
-    {
-        mesh.vao = createVAO(mesh.vertex_buffer, mesh.index_buffer, getVTXTYPEFromStride(mesh.Stride));
-        glGenBuffers(1, &(mesh.instance_buffer));
-        glBindBuffer(GL_ARRAY_BUFFER, mesh.instance_buffer);
-        glBufferData(GL_ARRAY_BUFFER, instances.size() * sizeof(InstanceData), instances.data(), GL_STATIC_DRAW);
-
-        glEnableVertexAttribArray(7);
-        glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), 0);
-        glVertexAttribDivisor(7, 1);
-        glEnableVertexAttribArray(8);
-        glVertexAttribPointer(8, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(3 * sizeof(float)));
-        glVertexAttribDivisor(8, 1);
-        glEnableVertexAttribArray(9);
-        glVertexAttribPointer(9, 3, GL_FLOAT, GL_FALSE, sizeof(InstanceData), (GLvoid*)(6 * sizeof(float)));
-        glVertexAttribDivisor(9, 1);
-        glBindVertexArray(0);
-    }
-}
-
-void STKInstancedSceneNode::setFirstTimeMaterial()
-{
-    if (isMaterialInitialized)
-        return;
-    for (u32 i = 0; i<Mesh->getMeshBufferCount(); ++i)
-    {
-        scene::IMeshBuffer* mb = Mesh->getMeshBuffer(i);
-        if (!mb)
-            continue;
-        video::E_MATERIAL_TYPE type = mb->getMaterial().MaterialType;
-
-        GLMesh &mesh = GLmeshes[i];
-        MeshMaterial MatType = MaterialTypeToMeshMaterial(type, mb->getVertexType());
-        initinstancedvaostate(mesh, instanceData[i]);
-        MeshSolidMaterial[MatType].push_back(&mesh);
-        InitTextures(mesh, MatType);
-    }
-    isMaterialInitialized = true;
-}
-
-void STKInstancedSceneNode::addInstance(const core::vector3df &origin, const core::vector3df &orientation, const core::vector3df &scale)
-{
-    for (unsigned i = 0; i < GLmeshes.size(); i++)
-    {
-        GLMesh &mesh = GLmeshes[i];
-#ifdef Bindless_Texture_Support
-        if (UserConfigParams::m_azdo)
-        {
-            for (unsigned j = 0; j < 2; j++)
-            {
-                if (!mesh.textures[j])
-                    mesh.textures[j] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
-                compressTexture(mesh.textures[j], true);
-
-                if (!mesh.TextureHandles[j])
-                    mesh.TextureHandles[j] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[j]), MeshShader::InstancedNormalMapShader::getInstance()->SamplersId[j]);
-                if (!glIsTextureHandleResidentARB(mesh.TextureHandles[j]))
-                    glMakeTextureHandleResidentARB(mesh.TextureHandles[j]);
-            }
-        }
-#endif
-        InstanceData instance = {
-            {
-                origin.X,
-                origin.Y,
-                origin.Z
-            },
-            {
-                orientation.X,
-                orientation.Y,
-                orientation.Z
-            },
-            {
-                scale.X,
-                scale.Y,
-                scale.Z
-            },
-            mesh.TextureHandles[0],
-            mesh.TextureHandles[1]
-        };
-        instanceData[i].push_back(instance);
-    }
-}
-
-core::matrix4 STKInstancedSceneNode::getInstanceTransform(int id)
-{
-    core::matrix4 mat;
-
-    const InstanceData &instance = instanceData[0][id];
-    mat.setTranslation(core::vector3df(
-        instance.Origin.X,
-        instance.Origin.Y,
-        instance.Origin.Z));
-    mat.setRotationDegrees(core::vector3df(
-        instance.Orientation.X,
-        instance.Orientation.Y,
-        instance.Orientation.Z));
-    mat.setScale(core::vector3df(
-        instance.Scale.X,
-        instance.Scale.Y,
-        instance.Scale.Z));
-
-    return mat;
-}
-
-void STKInstancedSceneNode::render()
-{
-    if (!irr_driver->isGLSL())
-    {
-        CMeshSceneNode::render();
-        return;
-    }
-
-    setFirstTimeMaterial();
-
-/*    if (irr_driver->getPhase() == SOLID_NORMAL_AND_DEPTH_PASS || irr_driver->getPhase() == SHADOW_PASS)
-    {
-        for (unsigned i = 0; i < MeshSolidMaterial[MAT_DEFAULT].size(); i++)
-        {
-            GLMesh *mesh = MeshSolidMaterial[MAT_DEFAULT][i];
-            ListInstancedMatDefault::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
-        }
-
-        for (unsigned i = 0; i < MeshSolidMaterial[MAT_ALPHA_REF].size(); i++)
-        {
-            GLMesh *mesh = MeshSolidMaterial[MAT_ALPHA_REF][i];
-            ListInstancedMatAlphaRef::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
-        }
-
-        windDir = getWind();
-        SunLightProvider * const cb = (SunLightProvider *)irr_driver->getCallback(ES_SUNLIGHT);
-        for (unsigned i = 0; i < MeshSolidMaterial[MAT_GRASS].size(); i++)
-        {
-            GLMesh *mesh = MeshSolidMaterial[MAT_GRASS][i];
-            ListInstancedMatGrass::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size(), windDir, cb->getPosition()));
-        }
-
-        for (unsigned i = 0; i < MeshSolidMaterial[MAT_NORMAL_MAP].size(); i++)
-        {
-            GLMesh *mesh = MeshSolidMaterial[MAT_NORMAL_MAP][i];
-            ListInstancedMatNormalMap::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
-        }
-    }*/
-}
diff --git a/src/graphics/stkinstancedscenenode.hpp b/src/graphics/stkinstancedscenenode.hpp
deleted file mode 100644
index 0766b1c02..000000000
--- a/src/graphics/stkinstancedscenenode.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef STKINSTANCEDSCENENODE_HPP
-#define STKINSTANCEDSCENENODE_HPP
-
-#include "stkmesh.hpp"
-#include "utils/leak_check.hpp"
-
-class STKInstancedSceneNode : public irr::scene::CMeshSceneNode
-{
-protected:
-    int m_ref_count;
-    std::vector<GLMesh *> MeshSolidMaterial[MAT_COUNT];
-    std::vector<GLMesh> GLmeshes;
-    std::vector<std::vector<InstanceData> > instanceData;
-    core::matrix4 ModelViewProjectionMatrix, TransposeInverseModelView;
-    void createGLMeshes();
-    bool isMaterialInitialized;
-    void setFirstTimeMaterial();
-    void initinstancedvaostate(GLMesh &mesh, const std::vector<InstanceData> &);
-    void cleanGL();
-    core::vector3df windDir;
-public:
-    STKInstancedSceneNode(irr::scene::IMesh* mesh, ISceneNode* parent, irr::scene::ISceneManager* mgr, irr::s32 id,
-        const irr::core::vector3df& position = irr::core::vector3df(0, 0, 0),
-        const irr::core::vector3df& rotation = irr::core::vector3df(0, 0, 0),
-        const irr::core::vector3df& scale = irr::core::vector3df(1.0f, 1.0f, 1.0f));
-    ~STKInstancedSceneNode();
-    virtual void render();
-    void addInstance(const core::vector3df &origin, const core::vector3df &orientation, const core::vector3df &scale);
-
-    int getInstanceCount() const { return instanceData[0].size(); }
-
-    core::matrix4 getInstanceTransform(int id);
-
-    void instanceGrab() { m_ref_count++; }
-    void instanceDrop()
-    {
-        m_ref_count--;
-        if (m_ref_count <= 0)
-        {
-            delete this;
-        }
-    }
-
-    LEAK_CHECK();
-};
-
-#endif
diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 5b58eec57..da61dc53b 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -1,6 +1,5 @@
 #include "stkscenemanager.hpp"
 #include "stkmesh.hpp"
-#include "stkinstancedscenenode.hpp"
 #include "irr_driver.hpp"
 #include <ISceneManager.h>
 #include <ISceneNode.h>
diff --git a/src/physics/physical_object.cpp b/src/physics/physical_object.cpp
index 8c750aa22..30e65576b 100644
--- a/src/physics/physical_object.cpp
+++ b/src/physics/physical_object.cpp
@@ -25,7 +25,6 @@ using namespace irr;
 
 #include "graphics/material_manager.hpp"
 #include "graphics/mesh_tools.hpp"
-#include "graphics/stkinstancedscenenode.hpp"
 #include "io/file_manager.hpp"
 #include "io/xml_node.hpp"
 #include "modes/world.hpp"
diff --git a/src/tracks/model_definition_loader.cpp b/src/tracks/model_definition_loader.cpp
index 75a1575c0..98159e961 100644
--- a/src/tracks/model_definition_loader.cpp
+++ b/src/tracks/model_definition_loader.cpp
@@ -22,7 +22,6 @@ using namespace irr;
 #include "graphics/irr_driver.hpp"
 #include "graphics/lod_node.hpp"
 #include "graphics/mesh_tools.hpp"
-#include "graphics/stkinstancedscenenode.hpp"
 #include "io/xml_node.hpp"
 #include "tracks/track.hpp"
 
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index a5347b626..8fa6512d5 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -37,7 +37,6 @@
 #include "graphics/particle_emitter.hpp"
 #include "graphics/particle_kind.hpp"
 #include "graphics/particle_kind_manager.hpp"
-#include "graphics/stkinstancedscenenode.hpp"
 #include "graphics/stk_text_billboard.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "io/file_manager.hpp"
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 0b535447c..f6fdc0876 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -28,7 +28,6 @@
 #include "graphics/particle_emitter.hpp"
 #include "graphics/particle_kind_manager.hpp"
 #include "graphics/stkmeshscenenode.hpp"
-#include "graphics/stkinstancedscenenode.hpp"
 #include "io/file_manager.hpp"
 #include "io/xml_node.hpp"
 #include "input/device_manager.hpp"

From 0bc8befc5773a3abb01162e79c122c796ecb8e81 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 3 Sep 2014 01:49:39 +0200
Subject: [PATCH 175/248] Use Irrlicht culling function

---
 src/graphics/stkscenemanager.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index da61dc53b..580508f94 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -352,19 +352,20 @@ parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::IScene
         if (!(*I)->isVisible())
             continue;
         (*I)->updateAbsolutePosition();
-        core::aabbox3d<f32> tbox = (*I)->getBoundingBox();
-        (*I)->getAbsoluteTransformation().transformBoxEx(tbox);
 
         const scene::ICameraSceneNode* cam = irr_driver->getSceneManager()->getActiveCamera();
-        bool IsCulledForSolid = !(tbox.intersectsWithBox(cam->getViewFrustum()->getBoundingBox()));
+        bool IsCulledForSolid = irr_driver->getSceneManager()->isCulled(*I);
         bool IsCulledForShadow[4];
-        bool IsCulledForRSM = false;
         for (unsigned i = 0; i < 4; ++i)
         {
-            const scene::ICameraSceneNode* cam = shadowCams[i];
-            IsCulledForShadow[i] = !(tbox.intersectsWithBox(cam->getViewFrustum()->getBoundingBox()));
+            scene::ICameraSceneNode* cam = shadowCams[i];
+            irr_driver->getSceneManager()->setActiveCamera(cam);
+            IsCulledForShadow[i] = irr_driver->getSceneManager()->isCulled(*I);
         }
 
+        irr_driver->getSceneManager()->setActiveCamera(RSM_cam);
+        bool IsCulledForRSM = irr_driver->getSceneManager()->isCulled(*I);
+
         if (IsCulledForSolid && IsCulledForShadow[0] && IsCulledForShadow[1] && IsCulledForShadow[2] && IsCulledForShadow[3])
             continue;
 
@@ -378,7 +379,7 @@ parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::IScene
             }
         }
 
-        handleSTKCommon(*I, ImmediateDraw, IsCulledForSolid, IsCulledForShadow, false);
+        handleSTKCommon(*I, ImmediateDraw, IsCulledForSolid, IsCulledForShadow, IsCulledForRSM);
 
         parseSceneManager((*I)->getChildren(), ImmediateDraw, shadowCams, RSM_cam);
     }

From d617e36f22994186858b1fdea6e76542dbc5a660 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 3 Sep 2014 02:27:47 +0200
Subject: [PATCH 176/248] Fix poly counter with OpenMP

---
 src/graphics/stkscenemanager.cpp | 64 ++++++++++++++++----------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 580508f94..612329bad 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -17,7 +17,7 @@
 
 static void
 FillInstances_impl(std::vector<std::pair<GLMesh *, scene::ISceneNode *> > InstanceList, InstanceData * InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer,
-    size_t &InstanceBufferOffset, size_t &CommandBufferOffset, int cascade)
+    size_t &InstanceBufferOffset, size_t &CommandBufferOffset, size_t &PolyCount)
 {
     // Should never be empty
     GLMesh *mesh = InstanceList.front().first;
@@ -29,7 +29,7 @@ FillInstances_impl(std::vector<std::pair<GLMesh *, scene::ISceneNode *> > Instan
     CurrentCommand.baseInstance = InstanceBufferOffset;
     CurrentCommand.instanceCount = InstanceList.size();
 
-    irr_driver->IncreasePolyCount(InstanceList.size() * mesh->IndexCount / 3);
+    PolyCount += InstanceList.size() * mesh->IndexCount / 3;
 
     for (unsigned i = 0; i < InstanceList.size(); i++)
     {
@@ -69,8 +69,6 @@ size_t &InstanceBufferOffset, size_t &CommandBufferOffset)
     CurrentCommand.baseInstance = InstanceBufferOffset;
     CurrentCommand.instanceCount = InstanceList.size();
 
-    irr_driver->IncreasePolyCount(InstanceList.size() * mesh->IndexCount / 3);
-
     for (unsigned i = 0; i < InstanceList.size(); i++)
     {
         STKMeshSceneNode *node = dynamic_cast<STKMeshSceneNode*>(InstanceList[i].second);
@@ -95,12 +93,12 @@ size_t &InstanceBufferOffset, size_t &CommandBufferOffset)
 
 static
 void FillInstances(const std::map<scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > &GatheredGLMesh, std::vector<GLMesh *> &InstancedList,
-    InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, int cascade)
+    InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, size_t &Polycount)
 {
     auto It = GatheredGLMesh.begin(), E = GatheredGLMesh.end();
     for (; It != E; ++It)
     {
-        FillInstances_impl(It->second, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, cascade);
+        FillInstances_impl(It->second, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, Polycount);
         if (!UserConfigParams::m_azdo)
             InstancedList.push_back(It->second.front().first);
     }
@@ -108,13 +106,13 @@ void FillInstances(const std::map<scene::IMeshBuffer *, std::vector<std::pair<GL
 
 static
 void FillInstancesGrass(const std::map<scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > &GatheredGLMesh, std::vector<GLMesh *> &InstancedList,
-    InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, int cascade, const core::vector3df &dir)
+    InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, const core::vector3df &dir, size_t &PolyCount)
 {
     auto It = GatheredGLMesh.begin(), E = GatheredGLMesh.end();
     SunLightProvider * const cb = (SunLightProvider *)irr_driver->getCallback(ES_SUNLIGHT);
     for (; It != E; ++It)
     {
-        FillInstances_impl(It->second, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, cascade);
+        FillInstances_impl(It->second, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, PolyCount);
         if (!UserConfigParams::m_azdo)
             InstancedList.push_back(It->second.front().first);
     }
@@ -387,22 +385,22 @@ parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::IScene
 
 template<MeshMaterial Mat> static void
 GenDrawCalls(unsigned cascade, std::vector<GLMesh *> &InstancedList,
-    InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset)
+    InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, size_t &PolyCount)
 {
     if (irr_driver->hasARB_draw_indirect())
         ShadowPassCmd::getInstance()->Offset[cascade][Mat] = CommandBufferOffset; // Store command buffer offset
-    FillInstances(MeshForShadowPass[cascade][Mat], InstancedList, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, cascade);
+    FillInstances(MeshForShadowPass[cascade][Mat], InstancedList, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, PolyCount);
     if (UserConfigParams::m_azdo)
         ShadowPassCmd::getInstance()->Size[cascade][Mat] = CommandBufferOffset - ShadowPassCmd::getInstance()->Offset[cascade][Mat];
 }
 
 template<MeshMaterial Mat> static void
 GenDrawCallsGrass(unsigned cascade, std::vector<GLMesh *> &InstancedList,
-InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, const core::vector3df &dir)
+InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, const core::vector3df &dir, size_t &PolyCount)
 {
     if (irr_driver->hasARB_draw_indirect())
         ShadowPassCmd::getInstance()->Offset[cascade][Mat] = CommandBufferOffset; // Store command buffer offset
-    FillInstancesGrass(MeshForShadowPass[cascade][Mat], InstancedList, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, cascade, dir);
+    FillInstancesGrass(MeshForShadowPass[cascade][Mat], InstancedList, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, dir, PolyCount);
     if (UserConfigParams::m_azdo)
         ShadowPassCmd::getInstance()->Size[cascade][Mat] = CommandBufferOffset - ShadowPassCmd::getInstance()->Offset[cascade][Mat];
 }
@@ -472,6 +470,8 @@ void IrrDriver::PrepareDrawCalls()
     ListInstancedMatDetails::getInstance()->clear();
     ListInstancedMatUnlit::getInstance()->clear();
 
+    size_t SolidPoly = 0, ShadowPoly = 0, MiscPoly = 0;
+
 #pragma omp parallel sections
     {
 #pragma omp section
@@ -487,32 +487,32 @@ void IrrDriver::PrepareDrawCalls()
 
             // Default Material
             SolidPassCmd::getInstance()->Offset[MAT_DEFAULT] = current_cmd;
-            FillInstances(MeshForSolidPass[MAT_DEFAULT], ListInstancedMatDefault::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, -1);
+            FillInstances(MeshForSolidPass[MAT_DEFAULT], ListInstancedMatDefault::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly);
             SolidPassCmd::getInstance()->Size[MAT_DEFAULT] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_DEFAULT];
             // Alpha Ref
             SolidPassCmd::getInstance()->Offset[MAT_ALPHA_REF] = current_cmd;
-            FillInstances(MeshForSolidPass[MAT_ALPHA_REF], ListInstancedMatAlphaRef::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, -1);
+            FillInstances(MeshForSolidPass[MAT_ALPHA_REF], ListInstancedMatAlphaRef::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly);
             SolidPassCmd::getInstance()->Size[MAT_ALPHA_REF] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_ALPHA_REF];
             // Unlit
             SolidPassCmd::getInstance()->Offset[MAT_UNLIT] = current_cmd;
-            FillInstances(MeshForSolidPass[MAT_UNLIT], ListInstancedMatUnlit::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, -1);
+            FillInstances(MeshForSolidPass[MAT_UNLIT], ListInstancedMatUnlit::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly);
             SolidPassCmd::getInstance()->Size[MAT_UNLIT] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_UNLIT];
             // Spheremap
             SolidPassCmd::getInstance()->Offset[MAT_SPHEREMAP] = current_cmd;
-            FillInstances(MeshForSolidPass[MAT_SPHEREMAP], ListInstancedMatSphereMap::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, -1);
+            FillInstances(MeshForSolidPass[MAT_SPHEREMAP], ListInstancedMatSphereMap::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly);
             SolidPassCmd::getInstance()->Size[MAT_SPHEREMAP] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_SPHEREMAP];
             // Detail
             SolidPassCmd::getInstance()->Offset[MAT_DETAIL] = current_cmd;
-            FillInstances(MeshForSolidPass[MAT_DETAIL], ListInstancedMatDetails::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, -1);
+            FillInstances(MeshForSolidPass[MAT_DETAIL], ListInstancedMatDetails::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly);
             SolidPassCmd::getInstance()->Size[MAT_DETAIL] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_DETAIL];
             // Normal Map
             SolidPassCmd::getInstance()->Offset[MAT_NORMAL_MAP] = current_cmd;
-            FillInstances(MeshForSolidPass[MAT_NORMAL_MAP], ListInstancedMatNormalMap::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, -1);
+            FillInstances(MeshForSolidPass[MAT_NORMAL_MAP], ListInstancedMatNormalMap::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly);
             SolidPassCmd::getInstance()->Size[MAT_NORMAL_MAP] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_NORMAL_MAP];
 
             // Grass
             SolidPassCmd::getInstance()->Offset[MAT_GRASS] = current_cmd;
-            FillInstancesGrass(MeshForSolidPass[MAT_GRASS], ListInstancedMatGrass::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, -1, windDir);
+            FillInstancesGrass(MeshForSolidPass[MAT_GRASS], ListInstancedMatGrass::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, windDir, SolidPoly);
             SolidPassCmd::getInstance()->Size[MAT_GRASS] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_GRASS];
 
             if (!irr_driver->hasBufferStorageExtension())
@@ -570,19 +570,19 @@ void IrrDriver::PrepareDrawCalls()
             for (unsigned i = 0; i < 4; i++)
             {
                 // Mat default
-                GenDrawCalls<MAT_DEFAULT>(i, ListInstancedMatDefault::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd);
+                GenDrawCalls<MAT_DEFAULT>(i, ListInstancedMatDefault::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd, ShadowPoly);
                 // Mat AlphaRef
-                GenDrawCalls<MAT_ALPHA_REF>(i, ListInstancedMatAlphaRef::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd);
+                GenDrawCalls<MAT_ALPHA_REF>(i, ListInstancedMatAlphaRef::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd, ShadowPoly);
                 // Mat Unlit
-                GenDrawCalls<MAT_UNLIT>(i, ListInstancedMatUnlit::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd);
+                GenDrawCalls<MAT_UNLIT>(i, ListInstancedMatUnlit::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd, ShadowPoly);
                 // Mat NormalMap
-                GenDrawCalls<MAT_NORMAL_MAP>(i, ListInstancedMatNormalMap::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd);
+                GenDrawCalls<MAT_NORMAL_MAP>(i, ListInstancedMatNormalMap::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd, ShadowPoly);
                 // Mat Spheremap
-                GenDrawCalls<MAT_SPHEREMAP>(i, ListInstancedMatSphereMap::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd);
+                GenDrawCalls<MAT_SPHEREMAP>(i, ListInstancedMatSphereMap::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd, ShadowPoly);
                 // Mat Detail
-                GenDrawCalls<MAT_DETAIL>(i, ListInstancedMatDetails::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd);
+                GenDrawCalls<MAT_DETAIL>(i, ListInstancedMatDetails::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd, ShadowPoly);
                 // Mat Grass
-                GenDrawCallsGrass<MAT_GRASS>(i, ListInstancedMatGrass::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd, windDir);
+                GenDrawCallsGrass<MAT_GRASS>(i, ListInstancedMatGrass::getInstance()->Shadows[i], ShadowInstanceBuffer, ShadowCmdBuffer, offset, current_cmd, windDir, ShadowPoly);
             }
             if (!irr_driver->hasBufferStorageExtension())
             {
@@ -603,23 +603,23 @@ void IrrDriver::PrepareDrawCalls()
 
             // Default Material
             RSMPassCmd::getInstance()->Offset[MAT_DEFAULT] = current_cmd;
-            FillInstances(MeshForRSMPass[MAT_DEFAULT], ListInstancedMatDefault::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, -1);
+            FillInstances(MeshForRSMPass[MAT_DEFAULT], ListInstancedMatDefault::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly);
             RSMPassCmd::getInstance()->Size[MAT_DEFAULT] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_DEFAULT];
             // Alpha Ref
             RSMPassCmd::getInstance()->Offset[MAT_ALPHA_REF] = current_cmd;
-            FillInstances(MeshForRSMPass[MAT_ALPHA_REF], ListInstancedMatAlphaRef::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, -1);
+            FillInstances(MeshForRSMPass[MAT_ALPHA_REF], ListInstancedMatAlphaRef::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly);
             RSMPassCmd::getInstance()->Size[MAT_ALPHA_REF] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_ALPHA_REF];
             // Unlit
             RSMPassCmd::getInstance()->Offset[MAT_UNLIT] = current_cmd;
-            FillInstances(MeshForRSMPass[MAT_UNLIT], ListInstancedMatUnlit::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, -1);
+            FillInstances(MeshForRSMPass[MAT_UNLIT], ListInstancedMatUnlit::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly);
             RSMPassCmd::getInstance()->Size[MAT_UNLIT] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_UNLIT];
             // Detail
             RSMPassCmd::getInstance()->Offset[MAT_DETAIL] = current_cmd;
-            FillInstances(MeshForRSMPass[MAT_DETAIL], ListInstancedMatDetails::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, -1);
+            FillInstances(MeshForRSMPass[MAT_DETAIL], ListInstancedMatDetails::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly);
             RSMPassCmd::getInstance()->Size[MAT_DETAIL] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_DETAIL];
             // Normal Map
             RSMPassCmd::getInstance()->Offset[MAT_NORMAL_MAP] = current_cmd;
-            FillInstances(MeshForRSMPass[MAT_NORMAL_MAP], ListInstancedMatNormalMap::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, -1);
+            FillInstances(MeshForRSMPass[MAT_NORMAL_MAP], ListInstancedMatNormalMap::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly);
             RSMPassCmd::getInstance()->Size[MAT_NORMAL_MAP] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_NORMAL_MAP];
 
             if (!irr_driver->hasBufferStorageExtension())
@@ -629,6 +629,8 @@ void IrrDriver::PrepareDrawCalls()
             }
         }
     }
+    poly_count[SOLID_NORMAL_AND_DEPTH_PASS] += SolidPoly;
+    poly_count[SHADOW_PASS] += ShadowPoly;
 
     glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
 }
\ No newline at end of file

From 55b51946730bf61a82f44837575794e675e99c3a Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 3 Sep 2014 02:41:32 +0200
Subject: [PATCH 177/248] Fix culling

---
 src/graphics/stkscenemanager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 612329bad..5fc5af187 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -351,7 +351,7 @@ parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::IScene
             continue;
         (*I)->updateAbsolutePosition();
 
-        const scene::ICameraSceneNode* cam = irr_driver->getSceneManager()->getActiveCamera();
+        scene::ICameraSceneNode* cam = irr_driver->getSceneManager()->getActiveCamera();
         bool IsCulledForSolid = irr_driver->getSceneManager()->isCulled(*I);
         bool IsCulledForShadow[4];
         for (unsigned i = 0; i < 4; ++i)
@@ -363,6 +363,7 @@ parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::IScene
 
         irr_driver->getSceneManager()->setActiveCamera(RSM_cam);
         bool IsCulledForRSM = irr_driver->getSceneManager()->isCulled(*I);
+        irr_driver->getSceneManager()->setActiveCamera(cam);
 
         if (IsCulledForSolid && IsCulledForShadow[0] && IsCulledForShadow[1] && IsCulledForShadow[2] && IsCulledForShadow[3])
             continue;

From d51754c237e9f96dd57bf5b00bb9cd419414a53d Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 3 Sep 2014 02:54:33 +0200
Subject: [PATCH 178/248] Fix culling of solid node for good

---
 src/graphics/render.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 46854a8fa..4508ce47d 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -737,6 +737,7 @@ void IrrDriver::computeCameraMatrix(scene::ICameraSceneNode * const camnode, siz
         assert(sun_ortho_matrix.size() == 4);
         camnode->setNearValue(oldnear);
         camnode->setFarValue(oldfar);
+        camnode->render();
 
         size_t size = irr_driver->getShadowViewProj().size();
         for (unsigned i = 0; i < size; i++)

From 2b1c5be3158a9ca31ddd185692a887a82975f871 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 3 Sep 2014 03:07:45 +0200
Subject: [PATCH 179/248] Use more aggressive culling.

---
 src/graphics/stkscenemanager.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 5fc5af187..8b60038c6 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -350,10 +350,11 @@ parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::IScene
         if (!(*I)->isVisible())
             continue;
         (*I)->updateAbsolutePosition();
-
+        (*I)->setAutomaticCulling(scene::EAC_FRUSTUM_BOX);
         scene::ICameraSceneNode* cam = irr_driver->getSceneManager()->getActiveCamera();
         bool IsCulledForSolid = irr_driver->getSceneManager()->isCulled(*I);
         bool IsCulledForShadow[4];
+
         for (unsigned i = 0; i < 4; ++i)
         {
             scene::ICameraSceneNode* cam = shadowCams[i];
@@ -365,9 +366,6 @@ parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::IScene
         bool IsCulledForRSM = irr_driver->getSceneManager()->isCulled(*I);
         irr_driver->getSceneManager()->setActiveCamera(cam);
 
-        if (IsCulledForSolid && IsCulledForShadow[0] && IsCulledForShadow[1] && IsCulledForShadow[2] && IsCulledForShadow[3])
-            continue;
-
         if (!IsCulledForSolid)
         {
             if (ParticleSystemProxy *node = dynamic_cast<ParticleSystemProxy *>(*I))

From 709583ead52fa52c9c4cb31745a9d77f584df2c5 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 3 Sep 2014 17:01:36 +1000
Subject: [PATCH 180/248] Removed Random GP dialog.

---
 sources.cmake                                 |   2 +-
 src/race/grand_prix_data.cpp                  |   1 -
 .../dialogs/random_gp_dialog.cpp              | 196 ------------------
 .../dialogs/random_gp_dialog.hpp              |  51 -----
 src/states_screens/tracks_screen.cpp          |   1 -
 5 files changed, 1 insertion(+), 250 deletions(-)
 delete mode 100644 src/states_screens/dialogs/random_gp_dialog.cpp
 delete mode 100644 src/states_screens/dialogs/random_gp_dialog.hpp

diff --git a/sources.cmake b/sources.cmake
index ddc029d4f..f484b15d5 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,5 +1,5 @@
 # Modify this file to change the last-modified date when you add/remove a file. 
-# This will then trigger a new cmake run automatically.
+# This will then trigger a new cmake run automatically. 
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")
diff --git a/src/race/grand_prix_data.cpp b/src/race/grand_prix_data.cpp
index 7ff76b590..32faafa9b 100644
--- a/src/race/grand_prix_data.cpp
+++ b/src/race/grand_prix_data.cpp
@@ -24,7 +24,6 @@
 #include "config/player_manager.hpp"
 #include "io/file_manager.hpp"
 #include "io/utf_writer.hpp"
-#include "states_screens/dialogs/random_gp_dialog.hpp"
 #include "tracks/track_manager.hpp"
 #include "tracks/track.hpp"
 #include "utils/string_utils.hpp"
diff --git a/src/states_screens/dialogs/random_gp_dialog.cpp b/src/states_screens/dialogs/random_gp_dialog.cpp
deleted file mode 100644
index 690afda1d..000000000
--- a/src/states_screens/dialogs/random_gp_dialog.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 konstin
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 3
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "guiengine/engine.hpp"
-#include "guiengine/widgets/icon_button_widget.hpp"
-#include "guiengine/widgets/spinner_widget.hpp"
-#include "race/grand_prix_manager.hpp"
-#include "race/race_manager.hpp"
-#include "states_screens/dialogs/random_gp_dialog.hpp"
-#include "tracks/track_manager.hpp"
-
-#include <IGUIEnvironment.h>
-#include <IGUIStaticText.h>
-
-using irr::core::stringc;
-using irr::core::stringw;
-using irr::gui::IGUIStaticText;
-
-typedef GUIEngine::SpinnerWidget Spinner;
-
-RandomGPInfoDialog::RandomGPInfoDialog()
-{
-    // Defaults - loading selection from last time frrom a file would be better
-    m_number_of_tracks = 2; // We can assume that there are at least 2 standard tracks
-    m_trackgroup = "standard";
-    m_use_reverse = GrandPrixData::GP_NO_REVERSE;
-
-    doInit();
-    m_curr_time = 0.0f;
-
-    m_under_title = m_area.getHeight()/7;
-    m_over_body = m_area.getHeight()/7 + SPINNER_HEIGHT + 10; // 10px space
-    m_lower_bound = m_area.getHeight()*6/7;
-
-    m_gp.createRandomGP(m_number_of_tracks, m_trackgroup, m_use_reverse);
-
-    addTitle();
-    addSpinners();
-    addTracks();
-    addScreenshot();
-    addButtons();
-    addRestartButton();
-}
-
-// ----------------------------------------------------------------------------
-
-void RandomGPInfoDialog::addSpinners()
-{
-    const int laps_width = 150;
-    // "20*4" because there a 4 separators between the spinners with 20px each
-    int label_spinner_width = m_area.getWidth() - laps_width - 20*4;
-    // This scaling ensures that the spinners are smaller than the available
-    // area, look well and are (hopefully) big enough for their labels
-    if (m_area.getWidth() < 700)
-        label_spinner_width /= 2;
-    else if (m_area.getWidth() < 1500)
-        label_spinner_width /= 3;
-    else
-        label_spinner_width /= 4;
-    const int left = (m_area.getWidth() - label_spinner_width*2 - laps_width)/2;
-
-    // Trackgroup chooser
-    Spinner* spinner = new Spinner(false);
-    spinner->m_properties[GUIEngine::PROP_ID] = "Trackgroup";
-    spinner->m_properties[GUIEngine::PROP_WRAP_AROUND] = "true";
-    spinner->setParent(m_irrlicht_window);
-    m_widgets.push_back(spinner);
-    spinner->add();
-    spinner->move(left, m_under_title, label_spinner_width, SPINNER_HEIGHT);
-    // Fill it with all the track group names
-    spinner->addLabel("all");
-    int index_standard;
-    const std::vector<std::string>& groups = track_manager->getAllTrackGroups();
-    for (unsigned int i = 0; i < groups.size(); i++)
-    {
-        spinner->addLabel(stringw(groups[i].c_str()));
-        if(groups[i] == "standard")
-            index_standard  = i+1;
-    }
-    // The value can only be set here because SpinnerWidget resets the value
-    // every time a label is added
-    spinner->setValue(index_standard);
-
-    // Number of laps chooser
-    spinner = new Spinner(false);
-    spinner->setValue(m_number_of_tracks);
-    spinner->setMin(1);
-    spinner->setMax(track_manager->getTracksInGroup("standard").size());
-    spinner->setParent(m_irrlicht_window);
-    spinner->m_properties[GUIEngine::PROP_ID] = "Number of tracks";
-    spinner->m_properties[GUIEngine::PROP_WRAP_AROUND] = "true";
-    m_widgets.push_back(spinner);
-    spinner->add();
-    spinner->move(left + label_spinner_width + 20/2, m_under_title, laps_width, SPINNER_HEIGHT);
-
-    // reverse choose
-    spinner = new Spinner(false);
-    spinner->setParent(m_irrlicht_window);
-    spinner->m_properties[GUIEngine::PROP_ID] = "reverse";
-    spinner->m_properties[GUIEngine::PROP_WRAP_AROUND] = "true";
-    m_widgets.push_back(spinner);
-    spinner->add();
-    spinner->move(left + label_spinner_width + laps_width + 20/2, m_under_title, label_spinner_width, SPINNER_HEIGHT);
-    spinner->addLabel("no reverse");
-    spinner->addLabel("all reverse");
-    spinner->addLabel("mixed");
-}
-
-// ----------------------------------------------------------------------------
-
-void RandomGPInfoDialog::addRestartButton()
-{
-    GUIEngine::IconButtonWidget* button = new GUIEngine::IconButtonWidget();
-    button->setImage("gui/restart.png");
-    button->setParent(m_irrlicht_window);
-    button->m_properties[GUIEngine::PROP_ID] = "reload";
-    m_widgets.push_back(button);
-    button->add();
-    button->move(m_area.getWidth() - 20 - 32, 20, 32, 32);
-}
-
-// ----------------------------------------------------------------------------
-
-GUIEngine::EventPropagation RandomGPInfoDialog::processEvent(
-                                                 const std::string& eventSource)
-{
-    if (eventSource == "start")
-    {
-        // Save GP data, since dismiss will delete this object.
-        GrandPrixData gp = m_gp;
-        ModalDialog::dismiss();
-        race_manager->startGP(gp, false, false);
-        return GUIEngine::EVENT_BLOCK;
-    }
-    else if (eventSource == "Number of tracks")
-    {
-        // The old gp can be reused because there's only track deletion/adding
-        m_number_of_tracks = getWidget<Spinner>("Number of tracks")->getValue();
-        m_gp.changeTrackNumber(m_number_of_tracks, m_trackgroup);
-        addTracks();
-    }
-    else if (eventSource == "Trackgroup")
-    {
-        Spinner* t = getWidget<Spinner>("Trackgroup");
-        Spinner* s = getWidget<Spinner>("Number of tracks");
-
-        m_trackgroup = stringc(t->getStringValue()).c_str();
-
-        // Update the maximum for the number of tracks since it's depending on
-        // the current track. The current value in the Number-of-tracks-spinner
-        // has to be updated, since otherwise the displayed (and used) value
-        // can be bigger than the maximum. (Might be a TODO to fix this)
-        unsigned int max = (m_trackgroup == "all") ?
-                           track_manager->getNumberOfTracks() :
-                           track_manager->getTracksInGroup(m_trackgroup).size();
-        m_number_of_tracks = std::min(max, m_number_of_tracks);
-        s->setMax(max);
-        if (s->getValue() > (signed)max)
-            s->setValue(max);
-
-        // Create a new (i.e. with new tracks) random gp, since the old
-        // tracks might not all belong to the newly selected group.
-        m_gp.createRandomGP(m_number_of_tracks, m_trackgroup, m_use_reverse,
-                            /*new_tracks*/true);
-        addTracks();
-    }
-    else if (eventSource == "reverse")
-    {
-        Spinner* r = getWidget<Spinner>("reverse");
-        m_use_reverse = static_cast<GrandPrixData::GPReverseType>(r->getValue());
-        m_gp.changeReverse(m_use_reverse);
-    }
-    else if (eventSource == "reload")
-    {
-        m_gp.createRandomGP(m_number_of_tracks, m_trackgroup, m_use_reverse,
-                           /*new_tracks*/true);
-        addTracks();
-    }
-
-    return GUIEngine::EVENT_LET;
-}
-
diff --git a/src/states_screens/dialogs/random_gp_dialog.hpp b/src/states_screens/dialogs/random_gp_dialog.hpp
deleted file mode 100644
index 35a058825..000000000
--- a/src/states_screens/dialogs/random_gp_dialog.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 konstin
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 3
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef HEADER_RANDOM_GP_INFO_DIALOG_HPP
-#define HEADER_RANDOM_GP_INFO_DIALOG_HPP
-
-#include "states_screens/dialogs/gp_info_dialog.hpp"
-
-#include <string>
-
-class RandomGPInfoDialog : public GPInfoDialog
-{
-private:
-    /** How many tracks to pick. */
-    unsigned int m_number_of_tracks;
-
-    /** Name of the track group from which to pick tracks. */
-    std::string m_trackgroup;
-
-    /** How reverse settings should be determined. */
-    GrandPrixData::GPReverseType m_use_reverse;
-
-public:
-    static const int SPINNER_HEIGHT = 40;
-
-    RandomGPInfoDialog();
-
-    /** Adds a SpinnerWidgets to choose the track groups, one to choose the
-     * number of tracks and one to choose if  the tracks should be raced in
-     * reverse. The Spinners are centered. */
-    void addSpinners();
-    void addRestartButton();
-
-    GUIEngine::EventPropagation processEvent(const std::string& eventSource);
-};
-
-#endif
diff --git a/src/states_screens/tracks_screen.cpp b/src/states_screens/tracks_screen.cpp
index 2491176c5..4d018feec 100644
--- a/src/states_screens/tracks_screen.cpp
+++ b/src/states_screens/tracks_screen.cpp
@@ -30,7 +30,6 @@
 #include "states_screens/state_manager.hpp"
 #include "states_screens/track_info_screen.hpp"
 #include "states_screens/gp_info_screen.hpp"
-#include "states_screens/dialogs/random_gp_dialog.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_manager.hpp"
 #include "utils/translation.hpp"

From a591ba6778b90d0743491fe2f96f7c0e66c0ea2e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 3 Sep 2014 17:13:20 +1000
Subject: [PATCH 181/248] Fixed setting of reverse in random GPs.

---
 src/states_screens/gp_info_screen.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index e5d61c7d7..7ca5cf8ce 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -319,6 +319,10 @@ void BaseGPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &nam
         m_gp.changeTrackNumber(m_num_tracks_spinner->getValue(), m_group_name);
         addTracks();
     }
+    else if (name=="reverse-spinner")
+    {
+        m_gp.changeReverse(getReverse());
+    }
 
 }   // eventCallback
 

From 12e403b909372988c8b90230f4fc20e0415bd6ea Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 3 Sep 2014 17:19:30 +1000
Subject: [PATCH 182/248] Fixed setting of number of AI karts.

---
 src/states_screens/gp_info_screen.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index 7ca5cf8ce..b14459fe6 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -288,6 +288,9 @@ void BaseGPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &nam
 
         if (button == "start" || button=="continue")
         {
+            int n = getWidget<SpinnerWidget>("ai-spinner")->getValue();
+
+            race_manager->setNumKarts(race_manager->getNumLocalPlayers() + n);
             race_manager->startGP(m_gp, false, (name == "continue"));
         }
     }   // name=="buttons"

From e57b927c962c64fc04b7bbec89c3e6f9b41b1add Mon Sep 17 00:00:00 2001
From: deve <deveee@gmail.com>
Date: Wed, 3 Sep 2014 14:05:34 +0200
Subject: [PATCH 183/248] Allow to compile STK on Windows using MinGW compiler.
 It needs vorbis dll's as additional dependencies.

TODO: add an alternative to inet_ntop function.
TODO: link wiimote library
---
 CMakeLists.txt                                |  43 ++++--
 .../CollisionDispatch/btCollisionObject.h     |  48 ++++---
 .../src/BulletDynamics/Dynamics/btRigidBody.h | 133 +++++++++---------
 lib/enet/CMakeLists.txt                       |   4 +
 lib/irrlicht/CMakeLists.txt                   |  11 +-
 src/network/protocols/get_public_address.cpp  |   6 +
 src/network/stk_host.cpp                      |   9 +-
 src/utils/vs.hpp                              |   4 +
 8 files changed, 153 insertions(+), 105 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c447a46d..7f64a9366 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,12 +15,12 @@ option(USE_WIIUSE "Support for wiimote input devices" ON)
 option(USE_FRIBIDI "Support for right-to-left languages" ON)
 option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON)
 
-if(UNIX)
+if(UNIX OR MINGW)
     option(USE_CPP2011 "Activate C++ 2011 mode (GCC only)" OFF)
 endif()
-if(MSVC)
+if(MSVC OR MINGW)
     # Normally hide the option to build wiiuse on VS, since it depends
-    # on the installation of the Windows DDK (Driver Developer Kit), 
+    # on the installation of the Windows DDK (Driver Developer Kit),
     # which also needs an absolute path :(
     option(WIIUSE_BUILD "Build wiiuse lib (only for developers)" OFF)
     mark_as_advanced(WIIUSE_BUILD)
@@ -28,6 +28,10 @@ else()
     set(WIIUSE_BUILD ON)
 endif()
 
+if(MINGW)
+    set(USE_WIIUSE OFF)
+endif()
+
 if(UNIX AND NOT APPLE)
     option(USE_XRANDR "Use xrandr instead of vidmode" ON)
     option(USE_ASAN   "Build with Leak/Address sanitizer" OFF)
@@ -78,6 +82,11 @@ if(MSVC)
     add_definitions(/D_IRR_STATIC_LIB_)
 endif()
 
+if(MINGW)
+    set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/dependencies)
+    add_definitions(-D_IRR_STATIC_LIB_)
+endif()
+
 if(APPLE)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch i386")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch i386 -F/Library/Frameworks")
@@ -123,7 +132,7 @@ if(USE_FRIBIDI)
 endif()
 
 
-if(UNIX)
+if(UNIX OR MINGW)
 #    if(USE_CPP2011)
         add_definitions("-std=gnu++0x")
 #    endif()
@@ -145,7 +154,7 @@ if(UNIX AND NOT APPLE)
     endif()
 endif()
 
-    
+
 # Set some compiler options
 if(UNIX)
     add_definitions(-Wall)
@@ -173,7 +182,7 @@ endif()
 # TODO: remove this switch
 add_definitions(-DHAVE_OGGVORBIS)
 
-if(WIN32)
+if(WIN32 AND NOT MINGW)
     configure_file("${STK_SOURCE_DIR}/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc")
 endif()
 
@@ -254,7 +263,7 @@ target_link_libraries(supertuxkart
     ${OGGVORBIS_LIBRARIES}
     ${OPENAL_LIBRARY}
     ${OPENGL_LIBRARIES})
-    
+
 if(UNIX AND NOT APPLE)
     if(USE_XRANDR)
         target_link_libraries(supertuxkart ${XRANDR_LIBRARIES})
@@ -288,8 +297,12 @@ if(USE_WIIUSE)
     if(APPLE)
         find_library(BLUETOOTH_LIBRARY NAMES IOBluetooth PATHS /Developer/Library/Frameworks/IOBluetooth.framework)
         target_link_libraries(supertuxkart wiiuse ${BLUETOOTH_LIBRARY})
-    elseif(MSVC)
-        add_definitions("/DWIIUSE_STATIC")
+    elseif(WIN32)
+        if(MSVC)
+            add_definitions("/DWIIUSE_STATIC")
+        else()
+            add_definitions("-DWIIUSE_STATIC")
+        endif()
         if(WIIUSE_BUILD)
             target_link_libraries(supertuxkart wiiuse)
         else()
@@ -302,12 +315,12 @@ if(USE_WIIUSE)
 
 endif()
 
-if(MSVC)
+if(MSVC OR MINGW)
   target_link_libraries(supertuxkart iphlpapi.lib)
   add_custom_command(TARGET supertuxkart POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory
         "${PROJECT_SOURCE_DIR}/dependencies/dll"
-        $<TARGET_FILE_DIR:supertuxkart>) 
+        $<TARGET_FILE_DIR:supertuxkart>)
   add_custom_target(stkshaders SOURCES ${STK_SHADERS})
 endif()
 
@@ -316,7 +329,7 @@ add_subdirectory(tools/font_tool)
 
 
 # ==== Make dist target ====
-if(MSVC)
+if(MSVC OR MINGW)
   # Don't create a dist target for VS
 else()
   add_custom_target(dist
@@ -340,9 +353,9 @@ endif()
 
 # ==== Checking if stk-assets folder exists ====
 if(CHECK_ASSETS)
-  if((IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/karts) AND 
-       (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/library) AND 
-       (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/music) AND 
+  if((IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/karts) AND
+       (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/library) AND
+       (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/music) AND
        (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/sfx) AND
        (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/textures) AND
        (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/tracks))
diff --git a/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h b/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h
index 6140458e4..6e76828d4 100644
--- a/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h
+++ b/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h
@@ -4,8 +4,8 @@ Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
 subject to the following restrictions:
 
 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
@@ -24,6 +24,12 @@ subject to the following restrictions:
 #  include <math.h>
 #endif
 
+#if defined(__MINGW32__) && __cplusplus >= 201103
+	#include <cmath>
+	using std::isinf;
+	using std::isnan;
+#endif
+
 #include "LinearMath/btTransform.h"
 
 //island management, m_activationState1
@@ -51,7 +57,7 @@ typedef btAlignedObjectArray<class btCollisionObject*> btCollisionObjectArray;
 #endif
 
 
-/// btCollisionObject can be used to manage collision detection objects. 
+/// btCollisionObject can be used to manage collision detection objects.
 /// btCollisionObject maintains all information that is needed for a collision detection: Shape, Transform and AABB proxy.
 /// They can be added to the btCollisionWorld.
 ATTRIBUTE_ALIGNED16(class)	btCollisionObject
@@ -64,20 +70,20 @@ protected:
 	///m_interpolationWorldTransform is used for CCD and interpolation
 	///it can be either previous or future (predicted) transform
 	btTransform	m_interpolationWorldTransform;
-	//those two are experimental: just added for bullet time effect, so you can still apply impulses (directly modifying velocities) 
+	//those two are experimental: just added for bullet time effect, so you can still apply impulses (directly modifying velocities)
 	//without destroying the continuous interpolated motion (which uses this interpolation velocities)
 	btVector3	m_interpolationLinearVelocity;
 	btVector3	m_interpolationAngularVelocity;
-	
+
 	btVector3	m_anisotropicFriction;
 	int			m_hasAnisotropicFriction;
-	btScalar	m_contactProcessingThreshold;	
+	btScalar	m_contactProcessingThreshold;
 
 	btBroadphaseProxy*		m_broadphaseHandle;
 	btCollisionShape*		m_collisionShape;
 	///m_extensionPointer is used by some internal low-level Bullet extensions.
 	void*					m_extensionPointer;
-	
+
 	///m_rootCollisionShape is temporarily used to store the original collision shape
 	///The m_collisionShape might be temporarily replaced by a child collision shape during collision detection purposes
 	///If it is NULL, the m_collisionShape is not temporarily replaced.
@@ -102,14 +108,14 @@ protected:
 	void*			m_userObjectPointer;
 
 	///time of impact calculation
-	btScalar		m_hitFraction; 
-	
+	btScalar		m_hitFraction;
+
 	///Swept sphere radius (0.0 by default), see btConvexConvexAlgorithm::
 	btScalar		m_ccdSweptSphereRadius;
 
 	/// Don't do continuous collision detection if the motion (in one step) is less then m_ccdMotionThreshold
 	btScalar		m_ccdMotionThreshold;
-	
+
 	/// If some object should have elaborate collision filtering by sub-classes
 	int			m_checkCollideWith;
 
@@ -194,7 +200,7 @@ public:
 		return (m_collisionFlags & CF_NO_CONTACT_RESPONSE)==0;
 	}
 
-	
+
 	btCollisionObject();
 
 	virtual ~btCollisionObject();
@@ -232,7 +238,7 @@ public:
 		m_collisionShape = collisionShape;
 	}
 
-	///Avoid using this internal API call, the extension pointer is used by some Bullet extensions. 
+	///Avoid using this internal API call, the extension pointer is used by some Bullet extensions.
 	///If you need to store your own user pointer, use 'setUserPointer/getUserPointer' instead.
 	void*		internalGetExtensionPointer() const
 	{
@@ -246,7 +252,7 @@ public:
 	}
 
 	SIMD_FORCE_INLINE	int	getActivationState() const { return m_activationState1;}
-	
+
 	void setActivationState(int newState);
 
 	void	setDeactivationTime(btScalar time)
@@ -385,7 +391,7 @@ public:
 
 	SIMD_FORCE_INLINE btScalar			getHitFraction() const
 	{
-		return m_hitFraction; 
+		return m_hitFraction;
 	}
 
 	void	setHitFraction(btScalar hitFraction)
@@ -393,7 +399,7 @@ public:
 		m_hitFraction = hitFraction;
 	}
 
-	
+
 	SIMD_FORCE_INLINE int	getCollisionFlags() const
 	{
 		return m_collisionFlags;
@@ -403,7 +409,7 @@ public:
 	{
 		m_collisionFlags = flags;
 	}
-	
+
 	///Swept sphere radius (0.0 by default), see btConvexConvexAlgorithm::
 	btScalar			getCcdSweptSphereRadius() const
 	{
@@ -439,7 +445,7 @@ public:
 	{
 		return m_userObjectPointer;
 	}
-	
+
 	///users can point to their objects, userPointer is not used by Bullet
 	void	setUserPointer(void* userPointer)
 	{
@@ -477,11 +483,11 @@ struct	btCollisionObjectDoubleData
 	btVector3DoubleData		m_interpolationLinearVelocity;
 	btVector3DoubleData		m_interpolationAngularVelocity;
 	btVector3DoubleData		m_anisotropicFriction;
-	double					m_contactProcessingThreshold;	
+	double					m_contactProcessingThreshold;
 	double					m_deactivationTime;
 	double					m_friction;
 	double					m_restitution;
-	double					m_hitFraction; 
+	double					m_hitFraction;
 	double					m_ccdSweptSphereRadius;
 	double					m_ccdMotionThreshold;
 
@@ -509,11 +515,11 @@ struct	btCollisionObjectFloatData
 	btVector3FloatData		m_interpolationLinearVelocity;
 	btVector3FloatData		m_interpolationAngularVelocity;
 	btVector3FloatData		m_anisotropicFriction;
-	float					m_contactProcessingThreshold;	
+	float					m_contactProcessingThreshold;
 	float					m_deactivationTime;
 	float					m_friction;
 	float					m_restitution;
-	float					m_hitFraction; 
+	float					m_hitFraction;
 	float					m_ccdSweptSphereRadius;
 	float					m_ccdMotionThreshold;
 
diff --git a/lib/bullet/src/BulletDynamics/Dynamics/btRigidBody.h b/lib/bullet/src/BulletDynamics/Dynamics/btRigidBody.h
index 6028a19cb..1036c576c 100644
--- a/lib/bullet/src/BulletDynamics/Dynamics/btRigidBody.h
+++ b/lib/bullet/src/BulletDynamics/Dynamics/btRigidBody.h
@@ -4,8 +4,8 @@ Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
 subject to the following restrictions:
 
 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
@@ -26,6 +26,11 @@ subject to the following restrictions:
 #endif
 #include <math.h>
 
+#if defined(__MINGW32__) && __cplusplus >= 201103
+	#include <cmath>
+	using std::isnan;
+#endif
+
 class btCollisionShape;
 class btMotionState;
 class btTypedConstraint;
@@ -51,7 +56,7 @@ enum	btRigidBodyFlags
 
 ///The btRigidBody is the main class for rigid body objects. It is derived from btCollisionObject, so it keeps a pointer to a btCollisionShape.
 ///It is recommended for performance and memory use to share btCollisionShape objects whenever possible.
-///There are 3 types of rigid bodies: 
+///There are 3 types of rigid bodies:
 ///- A) Dynamic rigid bodies, with positive mass. Motion is controlled by rigid body dynamics.
 ///- B) Fixed objects with zero mass. They are not moving (basically collision objects)
 ///- C) Kinematic objects, which are objects without mass, but the user can move them. There is on-way interaction, and Bullet calculates a velocity based on the timestep and previous and current world transform.
@@ -66,12 +71,12 @@ class btRigidBody  : public btCollisionObject
 	btScalar		m_inverseMass;
 	btVector3		m_linearFactor;
 
-	btVector3		m_gravity;	
+	btVector3		m_gravity;
 	btVector3		m_gravity_acceleration;
 	btVector3		m_invInertiaLocal;
 	btVector3		m_totalForce;
 	btVector3		m_totalTorque;
-	
+
 	btScalar		m_linearDamping;
 	btScalar		m_angularDamping;
 
@@ -92,9 +97,9 @@ class btRigidBody  : public btCollisionObject
 	btAlignedObjectArray<btTypedConstraint*> m_constraintRefs;
 
 	int				m_rigidbodyFlags;
-	
+
 	int				m_debugBodyId;
-	
+
 
 protected:
 
@@ -111,7 +116,7 @@ public:
 
 	///The btRigidBodyConstructionInfo structure provides information to create a rigid body. Setting mass to zero creates a fixed (non-dynamic) rigid body.
 	///For dynamic objects, you can use the collision shape to approximate the local inertia tensor, otherwise use the zero vector (default argument)
-	///You can use the motion state to synchronize the world transform between physics and graphics objects. 
+	///You can use the motion state to synchronize the world transform between physics and graphics objects.
 	///And if the motion state is provided, the rigid body will initialize its initial world transform from the motion state,
 	///m_startWorldTransform is only used when you don't provide a motion state.
 	struct	btRigidBodyConstructionInfo
@@ -168,16 +173,16 @@ public:
 	///btRigidBody constructor using construction info
 	btRigidBody(	const btRigidBodyConstructionInfo& constructionInfo);
 
-	///btRigidBody constructor for backwards compatibility. 
+	///btRigidBody constructor for backwards compatibility.
 	///To specify friction (etc) during rigid body construction, please use the other constructor (using btRigidBodyConstructionInfo)
 	btRigidBody(	btScalar mass, btMotionState* motionState, btCollisionShape* collisionShape, const btVector3& localInertia=btVector3(0,0,0));
 
 
 	virtual ~btRigidBody()
-        { 
+        {
                 //No constraints should point to this rigidbody
-		//Remove constraints from the dynamics world before you delete the related rigidbodies. 
-                btAssert(m_constraintRefs.size()==0); 
+		//Remove constraints from the dynamics world before you delete the related rigidbodies.
+                btAssert(m_constraintRefs.size()==0);
         }
 
 protected:
@@ -187,8 +192,8 @@ protected:
 
 public:
 
-	void			proceedToTransform(const btTransform& newTrans); 
-	
+	void			proceedToTransform(const btTransform& newTrans);
+
 	///to keep collision detection and dynamics separate we don't store a rigidbody pointer
 	///but a rigidbody is derived from btCollisionObject, so we can safely perform an upcast
 	static const btRigidBody*	upcast(const btCollisionObject* colObj)
@@ -203,15 +208,15 @@ public:
 			return (btRigidBody*)colObj;
 		return 0;
 	}
-	
+
 	/// continuous collision detection needs prediction
 	void			predictIntegratedTransform(btScalar step, btTransform& predictedTransform) ;
-	
+
 	void			saveKinematicState(btScalar step);
-	
+
 	void			applyGravity();
-	
-	void			setGravity(const btVector3& acceleration);  
+
+	void			setGravity(const btVector3& acceleration);
 
 	const btVector3&	getGravity() const
 	{
@@ -249,9 +254,9 @@ public:
 	SIMD_FORCE_INLINE btCollisionShape*	getCollisionShape() {
 			return m_collisionShape;
 	}
-	
+
 	void			setMassProps(btScalar mass, const btVector3& inertia);
-	
+
 	const btVector3& getLinearFactor() const
 	{
 		return m_linearFactor;
@@ -265,10 +270,10 @@ public:
 		m_invMass = m_linearFactor*m_inverseMass;
 	}
 	btScalar		getInvMass() const { return m_inverseMass; }
-	const btMatrix3x3& getInvInertiaTensorWorld() const { 
-		return m_invInertiaTensorWorld; 
+	const btMatrix3x3& getInvInertiaTensorWorld() const {
+		return m_invInertiaTensorWorld;
 	}
-		
+
 	void			integrateVelocities(btScalar step);
 
 	void			setCenterOfMassTransform(const btTransform& xform);
@@ -290,7 +295,7 @@ public:
 	{
 		return m_totalTorque;
 	};
-    
+
 	const btVector3& getInvInertiaDiagLocal() const
 	{
 		return m_invInertiaLocal;
@@ -314,8 +319,8 @@ public:
         btAssert(!isnan(torque.getZ()));
 		m_totalTorque += torque*m_angularFactor;
 	}
-	
-	void	applyForce(const btVector3& force, const btVector3& rel_pos) 
+
+	void	applyForce(const btVector3& force, const btVector3& rel_pos)
 	{
         btAssert(!isnan(force.getX()));
         btAssert(!isnan(force.getY()));
@@ -326,7 +331,7 @@ public:
 		applyCentralForce(force);
 		applyTorque(rel_pos.cross(force*m_linearFactor));
 	}
-	
+
 	void applyCentralImpulse(const btVector3& impulse)
 	{
         btAssert(!isnan(impulse.getX()));
@@ -334,7 +339,7 @@ public:
         btAssert(!isnan(impulse.getZ()));
 		m_linearVelocity += impulse *m_linearFactor * m_inverseMass;
 	}
-	
+
   	void applyTorqueImpulse(const btVector3& torque)
 	{
             btAssert(!isnan(torque.getX()));
@@ -342,8 +347,8 @@ public:
             btAssert(!isnan(torque.getZ()));
 			m_angularVelocity += m_invInertiaTensorWorld * torque * m_angularFactor;
 	}
-	
-	void applyImpulse(const btVector3& impulse, const btVector3& rel_pos) 
+
+	void applyImpulse(const btVector3& impulse, const btVector3& rel_pos)
 	{
         btAssert(!isnan(impulse.getX()));
         btAssert(!isnan(impulse.getY()));
@@ -361,44 +366,44 @@ public:
 		}
 	}
 
-	void clearForces() 
+	void clearForces()
 	{
 		m_totalForce.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
 		m_totalTorque.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
 	}
-	
-	void updateInertiaTensor();    
-	
-	const btVector3&     getCenterOfMassPosition() const { 
-		return m_worldTransform.getOrigin(); 
+
+	void updateInertiaTensor();
+
+	const btVector3&     getCenterOfMassPosition() const {
+		return m_worldTransform.getOrigin();
 	}
 	btQuaternion getOrientation() const;
-	
-	const btTransform&  getCenterOfMassTransform() const { 
-		return m_worldTransform; 
+
+	const btTransform&  getCenterOfMassTransform() const {
+		return m_worldTransform;
 	}
-	const btVector3&   getLinearVelocity() const { 
-		return m_linearVelocity; 
+	const btVector3&   getLinearVelocity() const {
+		return m_linearVelocity;
 	}
-	const btVector3&    getAngularVelocity() const { 
-		return m_angularVelocity; 
+	const btVector3&    getAngularVelocity() const {
+		return m_angularVelocity;
 	}
-	
+
 
 	inline void setLinearVelocity(const btVector3& lin_vel)
-	{ 
+	{
         btAssert(!isnan(lin_vel.getX()));
         btAssert(!isnan(lin_vel.getY()));
         btAssert(!isnan(lin_vel.getZ()));
-		m_linearVelocity = lin_vel; 
+		m_linearVelocity = lin_vel;
 	}
 
-	inline void setAngularVelocity(const btVector3& ang_vel) 
-	{ 
+	inline void setAngularVelocity(const btVector3& ang_vel)
+	{
         btAssert(!isnan(ang_vel.getX()));
         btAssert(!isnan(ang_vel.getY()));
         btAssert(!isnan(ang_vel.getZ()));
-		m_angularVelocity = ang_vel; 
+		m_angularVelocity = ang_vel;
 	}
 
 	btVector3 getVelocityInLocalPoint(const btVector3& rel_pos) const
@@ -410,18 +415,18 @@ public:
 		//		return 	(m_worldTransform(rel_pos) - m_interpolationWorldTransform(rel_pos)) / m_kinematicTimeStep;
 	}
 
-	void translate(const btVector3& v) 
+	void translate(const btVector3& v)
 	{
-		m_worldTransform.getOrigin() += v; 
+		m_worldTransform.getOrigin() += v;
 	}
 
-	
+
 	void	getAabb(btVector3& aabbMin,btVector3& aabbMax) const;
 
 
 
 
-	
+
 	SIMD_FORCE_INLINE btScalar computeImpulseDenominator(const btVector3& pos, const btVector3& normal) const
 	{
 		btVector3 r0 = pos - getCenterOfMassPosition();
@@ -478,12 +483,12 @@ public:
 	}
 
 
-	
+
 	const btBroadphaseProxy*	getBroadphaseProxy() const
 	{
 		return m_broadphaseHandle;
 	}
-	btBroadphaseProxy*	getBroadphaseProxy() 
+	btBroadphaseProxy*	getBroadphaseProxy()
 	{
 		return m_broadphaseHandle;
 	}
@@ -567,12 +572,12 @@ public:
 		return m_deltaAngularVelocity;
 	}
 
-	const btVector3& getPushVelocity() const 
+	const btVector3& getPushVelocity() const
 	{
 		return m_pushVelocity;
 	}
 
-	const btVector3& getTurnVelocity() const 
+	const btVector3& getTurnVelocity() const
 	{
 		return m_turnVelocity;
 	}
@@ -580,7 +585,7 @@ public:
 
 	////////////////////////////////////////////////
 	///some internal methods, don't use them
-		
+
 	btVector3& internalGetDeltaLinearVelocity()
 	{
 		return m_deltaLinearVelocity;
@@ -600,7 +605,7 @@ public:
 	{
 		return m_invMass;
 	}
-	
+
 	btVector3& internalGetPushVelocity()
 	{
 		return m_pushVelocity;
@@ -640,7 +645,7 @@ public:
 			m_turnVelocity += angularComponent*(impulseMagnitude*m_angularFactor);
 		}
 	}
-	
+
 	void	internalWritebackVelocity()
 	{
 		if (m_inverseMass)
@@ -656,7 +661,7 @@ public:
 
 	void	internalWritebackVelocity(btScalar timeStep);
 
-	
+
 
 	///////////////////////////////////////////////
 
@@ -679,7 +684,7 @@ struct	btRigidBodyFloatData
 	btVector3FloatData		m_angularVelocity;
 	btVector3FloatData		m_angularFactor;
 	btVector3FloatData		m_linearFactor;
-	btVector3FloatData		m_gravity;	
+	btVector3FloatData		m_gravity;
 	btVector3FloatData		m_gravity_acceleration;
 	btVector3FloatData		m_invInertiaLocal;
 	btVector3FloatData		m_totalForce;
@@ -705,7 +710,7 @@ struct	btRigidBodyDoubleData
 	btVector3DoubleData		m_angularVelocity;
 	btVector3DoubleData		m_angularFactor;
 	btVector3DoubleData		m_linearFactor;
-	btVector3DoubleData		m_gravity;	
+	btVector3DoubleData		m_gravity;
 	btVector3DoubleData		m_gravity_acceleration;
 	btVector3DoubleData		m_invInertiaLocal;
 	btVector3DoubleData		m_totalForce;
diff --git a/lib/enet/CMakeLists.txt b/lib/enet/CMakeLists.txt
index 9cae95a6b..719d2b9ea 100644
--- a/lib/enet/CMakeLists.txt
+++ b/lib/enet/CMakeLists.txt
@@ -21,6 +21,10 @@ add_library(enet STATIC
 	win32.c
 )
 
+if(MINGW)
+  target_link_libraries(enet wsock32 ws2_32 Winmm)
+endif()
+
 #if(WIN32)
 #  find_library(WS2_LIBRARY NAMES "ws2_32" PATHS "C:/Windows/System32")
 #  target_link_libraries(enet ${WS2_LIBRARY})
diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
index 17b96e62e..8b5b2132a 100644
--- a/lib/irrlicht/CMakeLists.txt
+++ b/lib/irrlicht/CMakeLists.txt
@@ -16,6 +16,9 @@ add_definitions(-DNDEBUG=1 -DIRRLICHT_EXPORTS=1 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_
 if(MSVC)
   add_definitions(/D_IRR_STATIC_LIB_)
   add_definitions(/D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
+elseif(MINGW)
+  add_definitions(-D_IRR_STATIC_LIB_)
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
 else()
   set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing -fexpensive-optimizations -I/usr/X11R6/include")
   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing -fexpensive-optimizations -I/usr/X11R6/include")
@@ -766,16 +769,16 @@ if(APPLE)
         source/Irrlicht/MacOSX/AppDelegate.mm
         source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
         source/Irrlicht/MacOSX/OSXClipboard.mm)
-    
+
     #list(APPEND CMAKE_C_SOURCE_FILE_EXTENSIONS mm)
     #set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS cpp)
-    
+
     set_source_files_properties(source/Irrlicht/MacOSX/AppDelegate.mm PROPERTIES COMPILE_FLAGS "-x objective-c++ -O3  -fno-rtti")
     set_source_files_properties(source/Irrlicht/MacOSX/AppDelegate.mm PROPERTIES LANGUAGE C)
-    
+
     set_source_files_properties(source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm PROPERTIES COMPILE_FLAGS "-x objective-c++ -O3  -fno-rtti")
     set_source_files_properties(source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm PROPERTIES LANGUAGE C)
-    
+
     set_source_files_properties(source/Irrlicht/MacOSX/OSXClipboard.mm PROPERTIES COMPILE_FLAGS "-x objective-c++ -O3 -fno-rtti")
     set_source_files_properties(source/Irrlicht/MacOSX/OSXClipboard.mm PROPERTIES LANGUAGE C)
 endif()
diff --git a/src/network/protocols/get_public_address.cpp b/src/network/protocols/get_public_address.cpp
index 33379e71b..8e4095065 100644
--- a/src/network/protocols/get_public_address.cpp
+++ b/src/network/protocols/get_public_address.cpp
@@ -28,6 +28,11 @@
 #include "utils/random_generator.hpp"
 
 #include <assert.h>
+
+#ifdef __MINGW32__
+#  define _WIN32_WINNT 0x501
+#endif
+
 #ifdef WIN32
 #  include <winsock2.h>
 #  include <ws2tcpip.h>
@@ -36,6 +41,7 @@
 #endif
 #include <sys/types.h>
 
+
 int stunRand()
 {
     static bool init = false;
diff --git a/src/network/stk_host.cpp b/src/network/stk_host.cpp
index aef89c96f..e22a8fcb3 100644
--- a/src/network/stk_host.cpp
+++ b/src/network/stk_host.cpp
@@ -24,9 +24,16 @@
 #include "utils/time.hpp"
 
 #include <string.h>
-#ifdef WIN32
+#if defined(WIN32) && !defined(__MINGW32__)
 #  include "Ws2tcpip.h"
 #  define   inet_ntop  InetNtop
+
+// TODO: It's very ugly hack which allows to compile STK on windows using gcc.
+// Solution would be nice seen.
+#elif defined(__MINGW32__)
+#  include "Ws2tcpip.h"
+#  define   inet_ntop
+
 #else
 #  include <arpa/inet.h>
 #  include <errno.h>
diff --git a/src/utils/vs.hpp b/src/utils/vs.hpp
index ffc47ba16..017f07400 100644
--- a/src/utils/vs.hpp
+++ b/src/utils/vs.hpp
@@ -11,3 +11,7 @@
 #  define round(x)  (floorf(x + 0.5))
 #endif
 
+#ifdef __MINGW32__
+	#include <cmath>
+	using std::isnan;
+#endif

From 9866ecea298bb68ea386e46112518a320fb7d249 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 3 Sep 2014 17:18:49 +0200
Subject: [PATCH 184/248] Enable openMP flags in cmake

---
 CMakeLists.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f64a9366..19ad08fbf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,6 +131,13 @@ if(USE_FRIBIDI)
     endif()
 endif()
 
+# OpenMP
+find_package(OpenMP)
+if (OPENMP_FOUND)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+endif()
+
 
 if(UNIX OR MINGW)
 #    if(USE_CPP2011)

From df1e87b934c8033f4b6e7b26d8eb2e0aa00b532a Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Wed, 3 Sep 2014 22:38:50 +0200
Subject: [PATCH 185/248] Factorise Skybox shader

---
 src/graphics/render_skybox.cpp | 15 +++++--------
 src/graphics/shaders.cpp       | 40 ++++++++++++++++------------------
 src/graphics/shaders.hpp       | 35 ++++++++++++++++++++++-------
 3 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/src/graphics/render_skybox.cpp b/src/graphics/render_skybox.cpp
index d11cf8f4c..3e3c37809 100644
--- a/src/graphics/render_skybox.cpp
+++ b/src/graphics/render_skybox.cpp
@@ -552,7 +552,7 @@ void IrrDriver::renderSkybox(const scene::ICameraSceneNode *camera)
         return;
     if (!SkyboxCubeMap)
         generateSkyboxCubemap();
-    glBindVertexArray(MeshShader::SkyboxShader::cubevao);
+    glBindVertexArray(MeshShader::SkyboxShader::getInstance()->cubevao);
     glDisable(GL_CULL_FACE);
     assert(SkyboxTextures.size() == 6);
 
@@ -567,15 +567,10 @@ void IrrDriver::renderSkybox(const scene::ICameraSceneNode *camera)
     core::matrix4 invtransform;
     transform.getInverse(invtransform);
 
-    glActiveTexture(GL_TEXTURE0);
-    glBindTexture(GL_TEXTURE_CUBE_MAP, SkyboxCubeMap);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glUseProgram(MeshShader::SkyboxShader::Program);
-    MeshShader::SkyboxShader::setUniforms(transform,
-        core::vector2df(float(UserConfigParams::m_width),
-        float(UserConfigParams::m_height)),
-        0);
+    glUseProgram(MeshShader::SkyboxShader::getInstance()->Program);
+    MeshShader::SkyboxShader::getInstance()->setUniforms(transform);
+    MeshShader::SkyboxShader::getInstance()->SetTextureUnits(createVector<GLuint>(SkyboxCubeMap));
+
     glDrawElements(GL_TRIANGLES, 6 * 6, GL_UNSIGNED_INT, 0);
     glBindVertexArray(0);
 }
\ No newline at end of file
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index c6d3d6958..d95ccdf4f 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -408,7 +408,6 @@ void Shaders::loadShaders()
     initShadowVPMUBO();
     initParticleQuadVBO();
     MeshShader::BubbleShader::init();
-    MeshShader::SkyboxShader::init();
     MeshShader::ViewFrustrumShader::init();
     UtilShader::ColoredLine::init();
 }
@@ -713,6 +712,20 @@ void BindTextureTrilinearAnisotropic(GLuint TU, GLuint tex)
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
 }
 
+void BindCubemapTrilinear(unsigned TU, unsigned tex)
+{
+    glActiveTexture(GL_TEXTURE0 + TU);
+    glBindTexture(GL_TEXTURE_CUBE_MAP, tex);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+    int aniso = UserConfigParams::m_anisotropic;
+    if (aniso == 0) aniso = 1;
+    glTexParameterf(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
+}
+
 GLuint createShadowSampler()
 {
 #ifdef GL_VERSION_3_3
@@ -1369,20 +1382,13 @@ namespace MeshShader
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
     }
 
-    GLuint SkyboxShader::Program;
-    GLuint SkyboxShader::attrib_position;
-    GLuint SkyboxShader::uniform_MM;
-    GLuint SkyboxShader::uniform_tex;
-    GLuint SkyboxShader::cubevao;
-
-    void SkyboxShader::init()
+    SkyboxShader::SkyboxShader()
     {
         Program = LoadProgram(
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/sky.frag").c_str());
-        attrib_position = glGetAttribLocation(Program, "Position");
-        uniform_MM = glGetUniformLocation(Program, "ModelMatrix");
-        uniform_tex = glGetUniformLocation(Program, "tex");
+        AssignUniforms("ModelMatrix");
+        AssignSamplerNames(Program, 0, "tex");
 
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
@@ -1390,20 +1396,12 @@ namespace MeshShader
         glGenVertexArrays(1, &cubevao);
         glBindVertexArray(cubevao);
         glBindBuffer(GL_ARRAY_BUFFER, SharedObject::cubevbo);
-        glEnableVertexAttribArray(attrib_position);
-        glVertexAttribPointer(attrib_position, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
+        glEnableVertexAttribArray(0);
+        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
         glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, SharedObject::cubeindexes);
         glBindVertexArray(0);
     }
 
-    void SkyboxShader::setUniforms(const core::matrix4 &ModelMatrix, const core::vector2df &screen, unsigned TU_tex)
-    {
-        if (irr_driver->needUBOWorkaround())
-            bypassUBO(Program);
-        glUniformMatrix4fv(uniform_MM, 1, GL_FALSE, ModelMatrix.pointer());
-        glUniform1i(uniform_tex, TU_tex);
-    }
-
     NormalVisualizer::NormalVisualizer()
     {
         Program = LoadProgram(
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 9baae2679..3642f32c9 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -186,6 +186,7 @@ enum SamplerType {
     Nearest_Filtered,
     Shadow_Sampler,
     Volume_Linear_Filtered,
+    Trilinear_cubemap,
 };
 
 void setTextureSampler(GLenum, GLuint, GLuint, GLuint);
@@ -325,6 +326,29 @@ struct CreateSamplers<Trilinear_Anisotropic_Filtered, tp...>
 
 void BindTextureTrilinearAnisotropic(unsigned TU, unsigned tex);
 
+template<SamplerType...tp>
+struct CreateSamplers<Trilinear_cubemap, tp...>
+{
+    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
+    {
+        v.push_back(createTrilinearSampler());
+        e.push_back(GL_TEXTURE_CUBE_MAP);
+        CreateSamplers<tp...>::exec(v, e);
+    }
+};
+
+void BindCubemapTrilinear(unsigned TU, unsigned tex);
+
+template<SamplerType...tp>
+struct BindTexture<Trilinear_cubemap, tp...>
+{
+    static void exec(const std::vector<unsigned> &TU, const std::vector<unsigned> &TexId, unsigned N)
+    {
+        BindCubemapTrilinear(TU[N], TexId[N]);
+        BindTexture<tp...>::exec(TU, TexId, N + 1);
+    }
+};
+
 template<SamplerType...tp>
 struct BindTexture<Trilinear_Anisotropic_Filtered, tp...>
 {
@@ -688,16 +712,11 @@ public:
     DisplaceShader();
 };
 
-class SkyboxShader
+class SkyboxShader : public ShaderHelperSingleton<SkyboxShader, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
-    static GLuint Program;
-    static GLuint attrib_position;
-    static GLuint uniform_MM, uniform_tex;
-    static GLuint cubevao;
-
-    static void init();
-    static void setUniforms(const core::matrix4 &ModelMatrix, const core::vector2df &screen, unsigned TU_tex);
+    SkyboxShader();
+    GLuint cubevao;
 };
 
 class NormalVisualizer : public ShaderHelperSingleton<NormalVisualizer, core::matrix4, core::matrix4, video::SColor>

From 6f9820b82b0cd752db80817456293a0aea5e0bfb Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Wed, 3 Sep 2014 22:42:18 +0200
Subject: [PATCH 186/248] Fix skybox filtering

---
 src/graphics/render_skybox.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/graphics/render_skybox.cpp b/src/graphics/render_skybox.cpp
index 3e3c37809..8fcd5c9a6 100644
--- a/src/graphics/render_skybox.cpp
+++ b/src/graphics/render_skybox.cpp
@@ -448,6 +448,7 @@ GLuint generateCubeMapFromTextures(const std::vector<video::ITexture *> &texture
         else
             glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, GL_SRGB_ALPHA, size, size, 0, GL_BGRA, GL_UNSIGNED_BYTE, (GLvoid*)rgba[i]);
     }
+    glGenerateMipmap(GL_TEXTURE_CUBE_MAP);
     for (unsigned i = 0; i < 6; i++)
         delete[] rgba[i];
     return result;

From b3b6b05765f27a96a316217b504c8cb48c43deb9 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Wed, 3 Sep 2014 22:52:16 +0200
Subject: [PATCH 187/248] Add profiler counter for rsm

---
 src/graphics/irr_driver.hpp      |  1 +
 src/graphics/render.cpp          | 10 +++++++---
 src/graphics/render_geometry.cpp |  3 +++
 src/utils/profiler.cpp           |  1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 3e5a671e9..2e9fb888e 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -112,6 +112,7 @@ enum QueryPerf
 {
     Q_SOLID_PASS1,
     Q_SHADOWS,
+    Q_RSM,
     Q_RH,
     Q_GI,
     Q_ENVMAP,
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 4508ce47d..47c31232e 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -300,19 +300,23 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
     PROFILER_POP_CPU_MARKER();
     // Shadows
     {
-        PROFILER_PUSH_CPU_MARKER("- Shadow", 0x30, 0x6F, 0x90);
-        ScopedGPUTimer Timer(getGPUTimer(Q_SHADOWS));
         // To avoid wrong culling, use the largest view possible
         m_scene_manager->setActiveCamera(m_suncam);
         if (!m_mipviz && !m_wireframe && UserConfigParams::m_dynamic_lights &&
             UserConfigParams::m_shadows && !irr_driver->needUBOWorkaround() && hasShadow)
         {
+            PROFILER_PUSH_CPU_MARKER("- Shadow", 0x30, 0x6F, 0x90);
             renderShadows();
+            PROFILER_POP_CPU_MARKER();
             if (UserConfigParams::m_gi)
+            {
+                PROFILER_PUSH_CPU_MARKER("- RSM", 0xFF, 0x0, 0xFF);
                 renderRSM();
+                PROFILER_POP_CPU_MARKER();
+            }
         }
         m_scene_manager->setActiveCamera(camnode);
-        PROFILER_POP_CPU_MARKER();
+
     }
 
     PROFILER_PUSH_CPU_MARKER("- Solid Pass 1", 0xFF, 0x00, 0x00);
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 81bfc249f..85bac8ed1 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -791,6 +791,8 @@ static void multidrawShadow(unsigned i, Args ...args)
 
 void IrrDriver::renderShadows()
 {
+    ScopedGPUTimer Timer(getGPUTimer(Q_SHADOWS));
+
     glDepthFunc(GL_LEQUAL);
     glDepthMask(GL_TRUE);
     glEnable(GL_DEPTH_TEST);
@@ -929,6 +931,7 @@ void multidrawRSM(Args...args)
 
 void IrrDriver::renderRSM()
 {
+    ScopedGPUTimer Timer(getGPUTimer(Q_RSM));
     m_rtts->getRSM().Bind();
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
diff --git a/src/utils/profiler.cpp b/src/utils/profiler.cpp
index 11eb7ba63..a1af59aa1 100644
--- a/src/utils/profiler.cpp
+++ b/src/utils/profiler.cpp
@@ -33,6 +33,7 @@ static const char* GPU_Phase[Q_LAST] =
 {
     "Solid Pass 1",
     "Shadows",
+    "RSM",
     "RH",
     "GI",
     "Env Map",

From 25926caef50e0a6a8829eba2614a4bccdfb3210c Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 3 Sep 2014 18:49:23 +0200
Subject: [PATCH 188/248] Fix GLuint instead of GLuint64 for some handles.

---
 src/graphics/stkmeshscenenode.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 291b5617f..c3a08e50e 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -293,15 +293,15 @@ void STKMeshSceneNode::render()
                 if (UserConfigParams::m_azdo)
                 {
 #ifdef Bindless_Texture_Support
-                    GLuint DiffuseHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_DIFFUSE), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[0]);
+                    GLuint64 DiffuseHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_DIFFUSE), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[0]);
                     if (!glIsTextureHandleResidentARB(DiffuseHandle))
                         glMakeTextureHandleResidentARB(DiffuseHandle);
 
-                    GLuint SpecularHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_SPECULAR), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[1]);
+                    GLuint64 SpecularHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_SPECULAR), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[1]);
                     if (!glIsTextureHandleResidentARB(SpecularHandle))
                         glMakeTextureHandleResidentARB(SpecularHandle);
 
-                    GLuint SSAOHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_HALF1_R), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[2]);
+                    GLuint64 SSAOHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_HALF1_R), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[2]);
                     if (!glIsTextureHandleResidentARB(SSAOHandle))
                         glMakeTextureHandleResidentARB(SSAOHandle);
 

From 059a707196b265631cb084c68414a8224aaa75db Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 3 Sep 2014 18:52:04 +0200
Subject: [PATCH 189/248] Fix some uint->float conversion warning.

---
 src/graphics/stk_text_billboard.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/graphics/stk_text_billboard.cpp b/src/graphics/stk_text_billboard.cpp
index 1365d0ee6..c3e4e54ad 100644
--- a/src/graphics/stk_text_billboard.cpp
+++ b/src/graphics/stk_text_billboard.cpp
@@ -75,12 +75,12 @@ scene::IMesh* STKTextBillboard::getTextMesh(core::stringw text, gui::ScalableFon
 
     for (unsigned int i = 0; i < m_chars.size(); i++)
     {
-        core::vector3df char_pos(m_chars[i].m_destRect.UpperLeftCorner.X,
-            m_chars[i].m_destRect.UpperLeftCorner.Y, 0);
+        core::vector3df char_pos((float) m_chars[i].m_destRect.UpperLeftCorner.X,
+            (float) m_chars[i].m_destRect.UpperLeftCorner.Y, 0);
         char_pos *= scale;
 
-        core::vector3df char_pos2(m_chars[i].m_destRect.LowerRightCorner.X,
-            m_chars[i].m_destRect.LowerRightCorner.Y, 0);
+        core::vector3df char_pos2((float)m_chars[i].m_destRect.LowerRightCorner.X,
+            (float) m_chars[i].m_destRect.LowerRightCorner.Y, 0);
         char_pos2 *= scale;
 
         core::dimension2di char_size_i = m_chars[i].m_destRect.getSize();
@@ -100,8 +100,8 @@ scene::IMesh* STKTextBillboard::getTextMesh(core::stringw text, gui::ScalableFon
             buffer = map_itr->second;
         }
 
-        float tex_width = m_chars[i].m_texture->getSize().Width;
-        float tex_height = m_chars[i].m_texture->getSize().Height;
+        float tex_width = (float) m_chars[i].m_texture->getSize().Width;
+        float tex_height = (float)m_chars[i].m_texture->getSize().Height;
 
 
         video::S3DVertex vertices[] =

From b3ad8179990045010e46ca268f069c8c77bcee6f Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Thu, 4 Sep 2014 01:32:40 +0200
Subject: [PATCH 190/248] Remove unnecessary memory barrier

---
 src/graphics/stkscenemanager.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 8b60038c6..f4528eb36 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -630,6 +630,4 @@ void IrrDriver::PrepareDrawCalls()
     }
     poly_count[SOLID_NORMAL_AND_DEPTH_PASS] += SolidPoly;
     poly_count[SHADOW_PASS] += ShadowPoly;
-
-    glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
 }
\ No newline at end of file

From 05f01c70ea94c84d2d3c92c60e9a8c0296fb86e7 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Thu, 4 Sep 2014 01:35:08 +0200
Subject: [PATCH 191/248] Make m_sync part of irr_driver.

---
 src/graphics/irr_driver.hpp      |  1 +
 src/graphics/render.cpp          | 21 ---------------------
 src/graphics/stkscenemanager.cpp | 21 +++++++++++++++++++++
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 2e9fb888e..e91d6a924 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -206,6 +206,7 @@ private:
     bool m_need_ubo_workaround;
     bool m_need_rh_workaround;
     bool m_need_srgb_workaround;
+    GLsync m_sync;
     /** The irrlicht device. */
     IrrlichtDevice             *m_device;
     /** Irrlicht scene manager. */
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 47c31232e..b908eb23b 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -269,32 +269,11 @@ void IrrDriver::renderGLSL(float dt)
     getPostProcessing()->update(dt);
 }
 
-static GLsync m_sync;
-
 void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned pointlightcount, std::vector<GlowData>& glows, float dt, bool hasShadow, bool forceRTT)
 {
     glBindBufferBase(GL_UNIFORM_BUFFER, 0, SharedObject::ViewProjectionMatrixesUBO);
     m_scene_manager->setActiveCamera(camnode);
 
-    // Add a 1 s timeout
-    if (!m_sync)
-        m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-    GLenum reason = glClientWaitSync(m_sync, GL_SYNC_FLUSH_COMMANDS_BIT, 1000000000);
-    /*    switch (reason)
-    {
-    case GL_ALREADY_SIGNALED:
-    printf("Already Signaled\n");
-    break;
-    case GL_TIMEOUT_EXPIRED:
-    printf("Timeout Expired\n");
-    break;
-    case GL_CONDITION_SATISFIED:
-    printf("Condition Satisfied\n");
-    break;
-    case GL_WAIT_FAILED:
-    printf("Wait Failed\n");
-    break;
-    }*/
     PROFILER_PUSH_CPU_MARKER("- Draw Call Generation", 0xFF, 0xFF, 0xFF);
     PrepareDrawCalls();
     PROFILER_POP_CPU_MARKER();
diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index f4528eb36..8e1580902 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -440,6 +440,27 @@ void IrrDriver::PrepareDrawCalls()
     parseSceneManager(List, ImmediateDrawList::getInstance(), m_shadow_camnodes, m_suncam);
     if (!irr_driver->hasARB_draw_indirect())
         return;
+
+    // Add a 20 ms timeout
+    if (!m_sync)
+        m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+    GLenum reason = glClientWaitSync(m_sync, GL_SYNC_FLUSH_COMMANDS_BIT, 20000000);
+    /*    switch (reason)
+    {
+    case GL_ALREADY_SIGNALED:
+    printf("Already Signaled\n");
+    break;
+    case GL_TIMEOUT_EXPIRED:
+    printf("Timeout Expired\n");
+    break;
+    case GL_CONDITION_SATISFIED:
+    printf("Condition Satisfied\n");
+    break;
+    case GL_WAIT_FAILED:
+    printf("Wait Failed\n");
+    break;
+    }*/
+
     InstanceData *InstanceBuffer;
     InstanceData *ShadowInstanceBuffer;
     InstanceData *RSMInstanceBuffer;

From 7c3164a9c1a5a63128f1b0f0c63c794cc49a15c4 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 4 Sep 2014 09:38:25 +1000
Subject: [PATCH 192/248] Added 'reload' random GP support, fixed 'back' icon
 on screen.

---
 data/gui/random_gp_info.stkgui        |  6 ++--
 src/states_screens/gp_info_screen.cpp | 41 +++++++++++++++++++++------
 src/states_screens/gp_info_screen.hpp |  8 ++++++
 3 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/data/gui/random_gp_info.stkgui b/data/gui/random_gp_info.stkgui
index 871a97546..45d90944a 100644
--- a/data/gui/random_gp_info.stkgui
+++ b/data/gui/random_gp_info.stkgui
@@ -2,9 +2,9 @@
 <stkgui>
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
-    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row">
+    <div x="1%" y="1%" width="96%" height="98%" layout="vertical-row">
 
-        <header id="name" width="100%" text_align="center"/>
+        <header id="name" width="80%" align="center" text_align="center"/>
 
         <spacer width="1" height="5%"/>
 
@@ -62,7 +62,7 @@
                     I18N="Start race" text="Start Race"/>
 
             <icon-button id="continue" width="64" height="64" icon="gui/green_check.png"
-                    I18N="Continue race" text="Continue Race"/>
+                    I18N="Continue saved GP" text="Continue saved GP"/>
         </buttonbar>
 
     </div>
diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index b14459fe6..196d8428a 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -73,7 +73,7 @@ void BaseGPInfoScreen::loadedFromFile()
     // The group spinner is filled in init every time the screen is shown
     // (since the groups can change if addons are added/deleted).
     m_group_spinner      = getWidget<SpinnerWidget>("group-spinner");
-
+    m_continue_button    = getWidget<IconButtonWidget>("continue");
     m_reverse_spinner    = getWidget<SpinnerWidget>("reverse-spinner");
     m_reverse_spinner->addLabel(_("No"));
     m_reverse_spinner->addLabel(_("Yes"));
@@ -136,8 +136,12 @@ void BaseGPInfoScreen::init()
 
     if(random)
     {
+        RibbonWidget *rb = getWidget<RibbonWidget>("buttons");
+        rb->setLabel(1,_(L"Reload") );
         getWidget<LabelWidget>("name")->setText(_("Random Grand Prix"), false);
-        getWidget<IconButtonWidget>("continue")->setVisible(false);
+        std::string restart = file_manager->getAsset(FileManager::GUI, "restart.png");
+        m_continue_button->setImage(restart, IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
+        m_continue_button->setVisible(true);
 
         // We have to recreate the group spinner, but a new group might have
         // been added or deleted since the last time this screen was shown.
@@ -190,7 +194,9 @@ void BaseGPInfoScreen::init()
                                        race_manager->getNumberOfKarts(),
                                        race_manager->getNumLocalPlayers());
 
-        getWidget<IconButtonWidget>("continue")->setVisible(saved_gp != NULL);
+        //I18N: Continue a previously saved Grand Prix.
+        m_continue_button->setText(_(L"Continue saved GP"));
+        m_continue_button->setVisible(saved_gp != NULL);
     }
 
     addTracks();
@@ -198,7 +204,8 @@ void BaseGPInfoScreen::init()
 }   // init
 
 // ----------------------------------------------------------------------------
-
+/** Updates the list of tracks shown.
+ */
 void BaseGPInfoScreen::addTracks()
 {
     const std::vector<std::string> tracks = m_gp.getTrackNames();
@@ -214,7 +221,8 @@ void BaseGPInfoScreen::addTracks()
 }   // addTracks
 
 // ----------------------------------------------------------------------------
-
+/** Creates a screenshot widget in the placeholder of the GUI.
+ */
 void BaseGPInfoScreen::addScreenshot()
 {
     Widget* screenshot_div = getWidget("screenshot_div");
@@ -277,7 +285,8 @@ void BaseGPInfoScreen::updateRandomGP()
 }   // updateRandomGP
 
 // ----------------------------------------------------------------------------
-
+/** Handle user input.
+ */
 void BaseGPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &name,
                                  const int player_id)
 {
@@ -286,8 +295,18 @@ void BaseGPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &nam
         const std::string &button = getWidget<GUIEngine::RibbonWidget>("buttons")
                                   ->getSelectionIDString(PLAYER_ID_GAME_MASTER);
 
-        if (button == "start" || button=="continue")
+        // The continue button becomes a 'reload' button in random GP:
+        if(button=="continue" && m_gp.isRandomGP())
         {
+            // Create a new GP:
+            m_gp.createRandomGP(m_num_tracks_spinner->getValue(),
+                                m_group_name, getReverse(),
+                                /*new tracks*/ true );
+            addTracks();
+        }
+        else if (button == "start" || button=="continue")
+        {
+            // Normal GP: start/continue a saved GP
             int n = getWidget<SpinnerWidget>("ai-spinner")->getValue();
 
             race_manager->setNumKarts(race_manager->getNumLocalPlayers() + n);
@@ -326,11 +345,17 @@ void BaseGPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &nam
     {
         m_gp.changeReverse(getReverse());
     }
+    else if(name=="back")
+    {
+        StateManager::get()->escapePressed();
+    }
 
 }   // eventCallback
 
 // ----------------------------------------------------------------------------
-
+/** Called every update. Used to cycle the screenshots.
+ *  \param dt Time step size.
+ */
 void BaseGPInfoScreen::onUpdate(float dt)
 {
     if (dt == 0)
diff --git a/src/states_screens/gp_info_screen.hpp b/src/states_screens/gp_info_screen.hpp
index 1e8a0f5e9..cb9776fba 100644
--- a/src/states_screens/gp_info_screen.hpp
+++ b/src/states_screens/gp_info_screen.hpp
@@ -38,10 +38,18 @@ namespace GUIEngine
 class BaseGPInfoScreen : public GUIEngine::Screen
 {
 private:
+    /** Spinner for the different track groups. */
     GUIEngine::SpinnerWidget *m_group_spinner;
+
+    /** Spinner for reverse mode. */
     GUIEngine::SpinnerWidget *m_reverse_spinner;
+
+    /** Spinner for number of tracks (in case of random GP). */
     GUIEngine::SpinnerWidget *m_num_tracks_spinner;
 
+    /** The continue/reload (in case of random GP) icon. */
+    GUIEngine::IconButtonWidget *m_continue_button;
+
     /** The currently selected group name. */
     std::string m_group_name;
 

From b28df0f4d0c367fdb8d2a8b28b9764d225e1bf2c Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Thu, 4 Sep 2014 01:41:10 +0200
Subject: [PATCH 193/248] Fix skybox shader sampler type.

---
 src/graphics/shaders.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 3642f32c9..96d686b16 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -712,7 +712,7 @@ public:
     DisplaceShader();
 };
 
-class SkyboxShader : public ShaderHelperSingleton<SkyboxShader, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class SkyboxShader : public ShaderHelperSingleton<SkyboxShader, core::matrix4>, public TextureRead<Trilinear_cubemap>
 {
 public:
     SkyboxShader();

From 0cf6345bc28d32221c341157f1983af564cb21b3 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Thu, 4 Sep 2014 02:09:11 +0200
Subject: [PATCH 194/248] Revert "Remove unnecessary memory barrier"

This reverts commit b3ad8179990045010e46ca268f069c8c77bcee6f.
---
 src/graphics/stkscenemanager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 8e1580902..4b1879449 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -651,4 +651,6 @@ void IrrDriver::PrepareDrawCalls()
     }
     poly_count[SOLID_NORMAL_AND_DEPTH_PASS] += SolidPoly;
     poly_count[SHADOW_PASS] += ShadowPoly;
+
+    glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
 }
\ No newline at end of file

From 4482ed6fc8934164b6e7d2d11dfb3f1dca83da64 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Thu, 4 Sep 2014 02:41:13 +0200
Subject: [PATCH 195/248] Remove aggressive culling

---
 src/graphics/stkscenemanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 4b1879449..56e4f16c5 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -350,7 +350,7 @@ parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::IScene
         if (!(*I)->isVisible())
             continue;
         (*I)->updateAbsolutePosition();
-        (*I)->setAutomaticCulling(scene::EAC_FRUSTUM_BOX);
+
         scene::ICameraSceneNode* cam = irr_driver->getSceneManager()->getActiveCamera();
         bool IsCulledForSolid = irr_driver->getSceneManager()->isCulled(*I);
         bool IsCulledForShadow[4];

From 0a6735a6ecc6e8c8423010ec13958045996f30bc Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Thu, 4 Sep 2014 03:07:00 +0200
Subject: [PATCH 196/248] Simplify culling.

---
 src/graphics/irr_driver.hpp      |  2 +-
 src/graphics/render.cpp          |  2 +-
 src/graphics/stkscenemanager.cpp | 32 ++++++++++++++------------------
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index e91d6a924..8a233227f 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -410,7 +410,7 @@ private:
     void renderLights(unsigned pointlightCount);
     void renderShadowsDebug();
     void doScreenShot();
-    void PrepareDrawCalls();
+    void PrepareDrawCalls(scene::ICameraSceneNode *camnode);
 public:
          IrrDriver();
         ~IrrDriver();
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index b908eb23b..8a1a561f4 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -275,7 +275,7 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
     m_scene_manager->setActiveCamera(camnode);
 
     PROFILER_PUSH_CPU_MARKER("- Draw Call Generation", 0xFF, 0xFF, 0xFF);
-    PrepareDrawCalls();
+    PrepareDrawCalls(camnode);
     PROFILER_POP_CPU_MARKER();
     // Shadows
     {
diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 56e4f16c5..0fbfe882d 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -340,7 +340,7 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
 
 static void
 parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::ISceneNode *> *ImmediateDraw,
-    scene::ICameraSceneNode *shadowCams[4], scene::ICameraSceneNode *RSM_cam)
+    scene::ICameraSceneNode* cam, scene::ICameraSceneNode *shadowCams[4], scene::ICameraSceneNode *RSM_cam)
 {
     core::list<scene::ISceneNode*>::Iterator I = List.begin(), E = List.end();
     for (; I != E; ++I)
@@ -351,20 +351,16 @@ parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::IScene
             continue;
         (*I)->updateAbsolutePosition();
 
-        scene::ICameraSceneNode* cam = irr_driver->getSceneManager()->getActiveCamera();
-        bool IsCulledForSolid = irr_driver->getSceneManager()->isCulled(*I);
+        core::aabbox3d<f32> tbox = (*I)->getBoundingBox();
+        (*I)->getAbsoluteTransformation().transformBoxEx(tbox);
+
+        bool IsCulledForSolid = !(tbox.intersectsWithBox(cam->getViewFrustum()->getBoundingBox()));
+
         bool IsCulledForShadow[4];
-
         for (unsigned i = 0; i < 4; ++i)
-        {
-            scene::ICameraSceneNode* cam = shadowCams[i];
-            irr_driver->getSceneManager()->setActiveCamera(cam);
-            IsCulledForShadow[i] = irr_driver->getSceneManager()->isCulled(*I);
-        }
+            IsCulledForShadow[i] = !(tbox.intersectsWithBox(shadowCams[i]->getViewFrustum()->getBoundingBox()));
 
-        irr_driver->getSceneManager()->setActiveCamera(RSM_cam);
-        bool IsCulledForRSM = irr_driver->getSceneManager()->isCulled(*I);
-        irr_driver->getSceneManager()->setActiveCamera(cam);
+        bool IsCulledForRSM = !(tbox.intersectsWithBox(RSM_cam->getViewFrustum()->getBoundingBox()));
 
         if (!IsCulledForSolid)
         {
@@ -378,7 +374,7 @@ parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::IScene
 
         handleSTKCommon(*I, ImmediateDraw, IsCulledForSolid, IsCulledForShadow, IsCulledForRSM);
 
-        parseSceneManager((*I)->getChildren(), ImmediateDraw, shadowCams, RSM_cam);
+        parseSceneManager((*I)->getChildren(), ImmediateDraw, cam, shadowCams, RSM_cam);
     }
 }
 
@@ -404,7 +400,7 @@ InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t
         ShadowPassCmd::getInstance()->Size[cascade][Mat] = CommandBufferOffset - ShadowPassCmd::getInstance()->Offset[cascade][Mat];
 }
 
-void IrrDriver::PrepareDrawCalls()
+void IrrDriver::PrepareDrawCalls(scene::ICameraSceneNode *camnode)
 {
     windDir = getWindDir();
     ListBlendTransparent::getInstance()->clear();
@@ -437,14 +433,11 @@ void IrrDriver::PrepareDrawCalls()
     core::list<scene::ISceneNode*> List = m_scene_manager->getRootSceneNode()->getChildren();
 
     bool isCulled[4] = {};
-    parseSceneManager(List, ImmediateDrawList::getInstance(), m_shadow_camnodes, m_suncam);
-    if (!irr_driver->hasARB_draw_indirect())
-        return;
 
     // Add a 20 ms timeout
     if (!m_sync)
         m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-    GLenum reason = glClientWaitSync(m_sync, GL_SYNC_FLUSH_COMMANDS_BIT, 20000000);
+    GLenum reason = glClientWaitSync(m_sync, GL_SYNC_FLUSH_COMMANDS_BIT, 1000000000);
     /*    switch (reason)
     {
     case GL_ALREADY_SIGNALED:
@@ -460,6 +453,9 @@ void IrrDriver::PrepareDrawCalls()
     printf("Wait Failed\n");
     break;
     }*/
+    parseSceneManager(List, ImmediateDrawList::getInstance(), camnode, m_shadow_camnodes, m_suncam);
+    if (!irr_driver->hasARB_draw_indirect())
+        return;
 
     InstanceData *InstanceBuffer;
     InstanceData *ShadowInstanceBuffer;

From 449c6a07b4879aa863646bfb63470a155c0f71fc Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Wed, 3 Sep 2014 21:13:07 -0400
Subject: [PATCH 197/248] fix weird profiler bug, hovering it would change the
 values. No idea why these changes work

---
 src/utils/profiler.cpp | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/utils/profiler.cpp b/src/utils/profiler.cpp
index a1af59aa1..2e8c56202 100644
--- a/src/utils/profiler.cpp
+++ b/src/utils/profiler.cpp
@@ -353,26 +353,27 @@ void Profiler::draw()
         }
     }
 
+    // GPU profiler
     QueryPerf hovered_gpu_marker = Q_LAST;
     long hovered_gpu_marker_elapsed = 0;
+    int gpu_y = int(y_offset + nb_thread_infos*line_height + line_height/2);
+    float total = 0;
+    for (unsigned i = 0; i < Q_LAST; i++)
+    {
+        total += irr_driver->getGPUTimer(i).elapsedTimeus();
+    }
+
+    static video::SColor colors[] = {
+        video::SColor(255, 255, 0, 0),
+        video::SColor(255, 0, 255, 0),
+        video::SColor(255, 0, 0, 255),
+        video::SColor(255, 255, 255, 0),
+        video::SColor(255, 255, 0, 255),
+        video::SColor(255, 0, 255, 255)
+    };
+
     if (hovered_markers.size() == 0)
     {
-        int gpu_y = int(y_offset + nb_thread_infos*line_height + line_height/2);
-        float total = 0;
-        for (unsigned i = 0; i < Q_LAST; i++)
-        {
-            total += irr_driver->getGPUTimer(i).elapsedTimeus();
-        }
-
-        static video::SColor colors[] = {
-            video::SColor(255, 255, 0, 0),
-            video::SColor(255, 0, 255, 0),
-            video::SColor(255, 0, 0, 255),
-            video::SColor(255, 255, 255, 0),
-            video::SColor(255, 255, 0, 255),
-            video::SColor(255, 0, 255, 255)
-        };
-
         float curr_val = 0;
         for (unsigned i = 0; i < Q_LAST; i++)
         {
@@ -422,7 +423,7 @@ void Profiler::draw()
 
     // Draw the hovered markers' names
     gui::ScalableFont* font = GUIEngine::getFont();
-    if(font)
+    if (font)
     {
         core::stringw text;
         while(!hovered_markers.empty())

From 9fc8b6ae10d44aadd9035bf21f4dfd5aa4e05b0a Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Thu, 4 Sep 2014 03:58:49 +0200
Subject: [PATCH 198/248] Use unordered_map in scenemanager

---
 src/graphics/stkscenemanager.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 0fbfe882d..cab7100c1 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -14,6 +14,7 @@
 #include "modes/world.hpp"
 #include "tracks/track.hpp"
 #include "lod_node.hpp"
+#include <unordered_map>
 
 static void
 FillInstances_impl(std::vector<std::pair<GLMesh *, scene::ISceneNode *> > InstanceList, InstanceData * InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer,
@@ -92,7 +93,7 @@ size_t &InstanceBufferOffset, size_t &CommandBufferOffset)
 
 
 static
-void FillInstances(const std::map<scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > &GatheredGLMesh, std::vector<GLMesh *> &InstancedList,
+void FillInstances(const std::unordered_map<scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > &GatheredGLMesh, std::vector<GLMesh *> &InstancedList,
     InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, size_t &Polycount)
 {
     auto It = GatheredGLMesh.begin(), E = GatheredGLMesh.end();
@@ -105,7 +106,7 @@ void FillInstances(const std::map<scene::IMeshBuffer *, std::vector<std::pair<GL
 }
 
 static
-void FillInstancesGrass(const std::map<scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > &GatheredGLMesh, std::vector<GLMesh *> &InstancedList,
+void FillInstancesGrass(const std::unordered_map<scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > &GatheredGLMesh, std::vector<GLMesh *> &InstancedList,
     InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, const core::vector3df &dir, size_t &PolyCount)
 {
     auto It = GatheredGLMesh.begin(), E = GatheredGLMesh.end();
@@ -118,10 +119,10 @@ void FillInstancesGrass(const std::map<scene::IMeshBuffer *, std::vector<std::pa
     }
 }
 
-static std::map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > MeshForSolidPass[MAT_COUNT];
-static std::map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > MeshForShadowPass[4][MAT_COUNT];
-static std::map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > MeshForRSMPass[MAT_COUNT];
-static std::map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, STKMeshCommon *> > > MeshForGlowPass;
+static std::unordered_map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > MeshForSolidPass[MAT_COUNT];
+static std::unordered_map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > MeshForShadowPass[4][MAT_COUNT];
+static std::unordered_map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > MeshForRSMPass[MAT_COUNT];
+static std::unordered_map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, STKMeshCommon *> > > MeshForGlowPass;
 
 static core::vector3df windDir;
 

From 8ffe09de2917208901575398dbc5e8a4076eb583 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 4 Sep 2014 16:49:15 +1000
Subject: [PATCH 199/248] Combined GPInfoScreen and RandomGPInfoScreen into one
 class, requiring only one stkgui file.

---
 data/gui/gp_info.stkgui               | 32 ++++++-------
 data/gui/random_gp_info.stkgui        | 69 ---------------------------
 src/states_screens/gp_info_screen.cpp | 30 ++++++------
 src/states_screens/gp_info_screen.hpp | 33 +++----------
 src/states_screens/tracks_screen.cpp  | 16 ++-----
 5 files changed, 39 insertions(+), 141 deletions(-)
 delete mode 100644 data/gui/random_gp_info.stkgui

diff --git a/data/gui/gp_info.stkgui b/data/gui/gp_info.stkgui
index 23cfb5acf..45d90944a 100644
--- a/data/gui/gp_info.stkgui
+++ b/data/gui/gp_info.stkgui
@@ -2,13 +2,13 @@
 <stkgui>
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
-    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row">
+    <div x="1%" y="1%" width="96%" height="98%" layout="vertical-row">
 
-        <header id="name" width="100%" text_align="center"/>
+        <header id="name" width="80%" align="center" text_align="center"/>
 
         <spacer width="1" height="5%"/>
 
-        <box width="95%" height="50%" padding="10" layout="horizontal-row">
+        <box width="95%" height="40%" padding="10" layout="horizontal-row">
             <spacer width="10" height="100%"/>
             <!-- Left pane -->
             <div width="45%" height="95%" align="center" layout="vertical-row">
@@ -25,37 +25,35 @@
 
         </box>
         <spacer width="1" height="3%"/>
-        <box width="95%" height="17%" padding="10" layout="horizontal-row">
+        <box width="95%" height="30%" padding="10" layout="horizontal-row">
             <spacer width="1" height="5%"/>
             <div width="50%" height="100%" layout="vertical-row">
 
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <label id="ai-text" height="100%" width="40%" I18N="Number of AI karts" text="AI karts"/>
-                    <spinner id="ai-spinner" width="40%" min_value="1" max_value="20" align="center"
+                    <label id="ai-text" height="100%" width="50%" I18N="Number of AI karts" text="AI karts"/>
+                    <spinner id="ai-spinner" width="50%" min_value="1" max_value="20" align="center"
                              wrap_around="true" />
-                    <spacer proportion="1" height="2" />
                 </div>
+                <spacer height="5%" />
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <label id="reverse-text" height="100%" width="40%" I18N="Drive the track reverse" text="Reverse"/>
+                    <label id="reverse-text"      width="50%" height="100%" I18N="Drive the track reverse" text="Reverse"/>
                     <spinner id="reverse-spinner" width="50%" align="center" wrap_around="true" />
-                    <spacer proportion="1" height="2" />
                 </div>
-            </div>
-            <div width="50%" height="100%" layout="vertical-row">
-                <div width="100%" height="fit" layout="horizontal-row" >
-                    <label id="track-text" height="100%" width="50%"  text="Tracks"
+                <spacer height="5%" />
+                <div width="100%" height="fit" layout="horizontal-row">
+                    <label id="track-text" width="50%" height="100%" text="Tracks"
                            I18N="Number of tracks to pick in a random Grand Prix."/>
                     <spinner id="track-spinner" width="50%" min_value="1" max_value="20" align="center"
                              wrap_around="true" />
-                    <spacer proportion="1" height="2" />
+                    <spacer height="1%" />
                 </div>
+                <spacer height="5%" />
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <label id="group-text" height="100%" width="50%" I18N="Number of AI karts" text="Track group"/>
+                    <label   id="group-text"    width="50%" height="100%" I18N="Number of AI karts" text="Track group"/>
                     <spinner id="group-spinner" width="50%" align="center" wrap_around="true" />
                     <spacer proportion="1" height="2" />
                 </div>
             </div>
-            <spacer width="1" height="2%"/>
         </box>
         <spacer width="1" height="2%"/>
         <buttonbar id="buttons" height="15%" width="100%" align="center">
@@ -64,7 +62,7 @@
                     I18N="Start race" text="Start Race"/>
 
             <icon-button id="continue" width="64" height="64" icon="gui/green_check.png"
-                    I18N="Continue race" text="Continue Race"/>
+                    I18N="Continue saved GP" text="Continue saved GP"/>
         </buttonbar>
 
     </div>
diff --git a/data/gui/random_gp_info.stkgui b/data/gui/random_gp_info.stkgui
deleted file mode 100644
index 45d90944a..000000000
--- a/data/gui/random_gp_info.stkgui
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
-    <div x="1%" y="1%" width="96%" height="98%" layout="vertical-row">
-
-        <header id="name" width="80%" align="center" text_align="center"/>
-
-        <spacer width="1" height="5%"/>
-
-        <box width="95%" height="40%" padding="10" layout="horizontal-row">
-            <spacer width="10" height="100%"/>
-            <!-- Left pane -->
-            <div width="45%" height="95%" align="center" layout="vertical-row">
-                <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
-                </placeholder>
-            </div>
-
-            <spacer width="5%" height="100%"/>
-
-            <!-- Right pane -->
-            <div width="45%" height="95%" align="center" layout="vertical-row">
-                <list id="tracks" width="100%" height="100%"/>
-            </div>
-
-        </box>
-        <spacer width="1" height="3%"/>
-        <box width="95%" height="30%" padding="10" layout="horizontal-row">
-            <spacer width="1" height="5%"/>
-            <div width="50%" height="100%" layout="vertical-row">
-
-                <div width="100%" height="fit" layout="horizontal-row" >
-                    <label id="ai-text" height="100%" width="50%" I18N="Number of AI karts" text="AI karts"/>
-                    <spinner id="ai-spinner" width="50%" min_value="1" max_value="20" align="center"
-                             wrap_around="true" />
-                </div>
-                <spacer height="5%" />
-                <div width="100%" height="fit" layout="horizontal-row" >
-                    <label id="reverse-text"      width="50%" height="100%" I18N="Drive the track reverse" text="Reverse"/>
-                    <spinner id="reverse-spinner" width="50%" align="center" wrap_around="true" />
-                </div>
-                <spacer height="5%" />
-                <div width="100%" height="fit" layout="horizontal-row">
-                    <label id="track-text" width="50%" height="100%" text="Tracks"
-                           I18N="Number of tracks to pick in a random Grand Prix."/>
-                    <spinner id="track-spinner" width="50%" min_value="1" max_value="20" align="center"
-                             wrap_around="true" />
-                    <spacer height="1%" />
-                </div>
-                <spacer height="5%" />
-                <div width="100%" height="fit" layout="horizontal-row" >
-                    <label   id="group-text"    width="50%" height="100%" I18N="Number of AI karts" text="Track group"/>
-                    <spinner id="group-spinner" width="50%" align="center" wrap_around="true" />
-                    <spacer proportion="1" height="2" />
-                </div>
-            </div>
-        </box>
-        <spacer width="1" height="2%"/>
-        <buttonbar id="buttons" height="15%" width="100%" align="center">
-
-            <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
-                    I18N="Start race" text="Start Race"/>
-
-            <icon-button id="continue" width="64" height="64" icon="gui/green_check.png"
-                    I18N="Continue saved GP" text="Continue saved GP"/>
-        </buttonbar>
-
-    </div>
-</stkgui>
diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index 196d8428a..02f0cc5cf 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -25,7 +25,6 @@
 #include "graphics/irr_driver.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets/check_box_widget.hpp"
 #include "guiengine/widgets/icon_button_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
 #include "guiengine/widgets/list_widget.hpp"
@@ -52,23 +51,22 @@ using GUIEngine::PROP_ID;
 using namespace GUIEngine;
 
 DEFINE_SCREEN_SINGLETON( GPInfoScreen );
-DEFINE_SCREEN_SINGLETON( RandomGPInfoScreen );
 
-BaseGPInfoScreen::BaseGPInfoScreen(const std::string &name) : Screen(name.c_str())
+GPInfoScreen::GPInfoScreen() : Screen("gp_info.stkgui")
 {
     m_curr_time = 0.0f;
     // Necessary to test if loadedFroMFile() was executed (in setGP)
     m_reverse_spinner = NULL;
-}   // BaseGPInfoScreen
+}   // GPInfoScreen
 
 // ----------------------------------------------------------------------------
 
-BaseGPInfoScreen::~BaseGPInfoScreen()
+GPInfoScreen::~GPInfoScreen()
 {
-}   // ~BaseGPInfoScreen
+}   // ~GPInfoScreen
 
 // ----------------------------------------------------------------------------
-void BaseGPInfoScreen::loadedFromFile()
+void GPInfoScreen::loadedFromFile()
 {
     // The group spinner is filled in init every time the screen is shown
     // (since the groups can change if addons are added/deleted).
@@ -91,7 +89,7 @@ void BaseGPInfoScreen::loadedFromFile()
 /** Sets the GP to be displayed. If the identifier is 'random', no gp info
  *  will be loaded.
  */
-void BaseGPInfoScreen::setGP(const std::string &gp_ident)
+void GPInfoScreen::setGP(const std::string &gp_ident)
 {
     if(gp_ident!="random")
         m_gp = *grand_prix_manager->getGrandPrix(gp_ident);
@@ -106,7 +104,7 @@ void BaseGPInfoScreen::setGP(const std::string &gp_ident)
 }   // setGP
 
 // ----------------------------------------------------------------------------
-GrandPrixData::GPReverseType BaseGPInfoScreen::getReverse() const
+GrandPrixData::GPReverseType GPInfoScreen::getReverse() const
 {
     switch (m_reverse_spinner->getValue())
     {
@@ -120,7 +118,7 @@ GrandPrixData::GPReverseType BaseGPInfoScreen::getReverse() const
 }   // getReverse
 
 // ----------------------------------------------------------------------------
-void BaseGPInfoScreen::init()
+void GPInfoScreen::init()
 {
     Screen::init();
     m_curr_time = 0.0f;
@@ -206,7 +204,7 @@ void BaseGPInfoScreen::init()
 // ----------------------------------------------------------------------------
 /** Updates the list of tracks shown.
  */
-void BaseGPInfoScreen::addTracks()
+void GPInfoScreen::addTracks()
 {
     const std::vector<std::string> tracks = m_gp.getTrackNames();
 
@@ -223,7 +221,7 @@ void BaseGPInfoScreen::addTracks()
 // ----------------------------------------------------------------------------
 /** Creates a screenshot widget in the placeholder of the GUI.
  */
-void BaseGPInfoScreen::addScreenshot()
+void GPInfoScreen::addScreenshot()
 {
     Widget* screenshot_div = getWidget("screenshot_div");
 
@@ -254,7 +252,7 @@ void BaseGPInfoScreen::addScreenshot()
 
 // ----------------------------------------------------------------------------
 
-void BaseGPInfoScreen::onEnterPressedInternal()
+void GPInfoScreen::onEnterPressedInternal()
 {
     // Save the GP id because dismiss() will destroy this instance
     GrandPrixData gp_data = m_gp;
@@ -264,7 +262,7 @@ void BaseGPInfoScreen::onEnterPressedInternal()
 }
 
 // ----------------------------------------------------------------------------
-void BaseGPInfoScreen::updateRandomGP()
+void GPInfoScreen::updateRandomGP()
 {
     // First get the right track group to use
     const std::vector<std::string>& groups = track_manager->getAllTrackGroups();
@@ -287,7 +285,7 @@ void BaseGPInfoScreen::updateRandomGP()
 // ----------------------------------------------------------------------------
 /** Handle user input.
  */
-void BaseGPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &name,
+void GPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &name,
                                  const int player_id)
 {
     if(name=="buttons")
@@ -356,7 +354,7 @@ void BaseGPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &nam
 /** Called every update. Used to cycle the screenshots.
  *  \param dt Time step size.
  */
-void BaseGPInfoScreen::onUpdate(float dt)
+void GPInfoScreen::onUpdate(float dt)
 {
     if (dt == 0)
         return; // if nothing changed, return right now
diff --git a/src/states_screens/gp_info_screen.hpp b/src/states_screens/gp_info_screen.hpp
index cb9776fba..47ae188dc 100644
--- a/src/states_screens/gp_info_screen.hpp
+++ b/src/states_screens/gp_info_screen.hpp
@@ -35,7 +35,8 @@ namespace GUIEngine
  * \brief Dialog that shows information about a specific grand prix
  * \ingroup states_screens
  */
-class BaseGPInfoScreen : public GUIEngine::Screen
+class GPInfoScreen : public GUIEngine::Screen,
+                     public GUIEngine::ScreenSingleton<GPInfoScreen>
 {
 private:
     /** Spinner for the different track groups. */
@@ -53,7 +54,7 @@ private:
     /** The currently selected group name. */
     std::string m_group_name;
 
-protected: // Necessary for RandomBaseGPInfoScreen
+protected: // Necessary for RandomGPInfoScreen
     GUIEngine::IconButtonWidget* m_screenshot_widget;
     float m_curr_time;
 
@@ -70,10 +71,10 @@ protected: // Necessary for RandomBaseGPInfoScreen
     GrandPrixData::GPReverseType getReverse() const;
 
 public:
-    BaseGPInfoScreen(const std::string &name);
+    GPInfoScreen();
     /** Places the focus back on the selected GP, in the case that the dialog
      * was cancelled and we're returning to the track selection screen */
-    virtual ~BaseGPInfoScreen();
+    virtual ~GPInfoScreen();
 
     void onEnterPressedInternal();
     virtual void eventCallback(GUIEngine::Widget *, const std::string &name,
@@ -84,28 +85,6 @@ public:
     virtual void onUpdate(float dt);
 
     void setGP(const std::string &gp_ident);
-};   // BaseGPInfoScreen
-
-// ============================================================================
-class GPInfoScreen: public BaseGPInfoScreen,
-                    public GUIEngine::ScreenSingleton<GPInfoScreen>
-{
-private:
-    GPInfoScreen() : BaseGPInfoScreen("gp_info.stkgui")
-    {};
-public:
-    friend class GUIEngine::ScreenSingleton<GPInfoScreen>;
-};   // class GPInfoScreen
-
-// ============================================================================
-class RandomGPInfoScreen: public BaseGPInfoScreen,
-                          public GUIEngine::ScreenSingleton<RandomGPInfoScreen>
-{
-private:
-    RandomGPInfoScreen() : BaseGPInfoScreen("random_gp_info.stkgui")
-    {};
-public:
-    friend class GUIEngine::ScreenSingleton<RandomGPInfoScreen>;
-};   // class RandomGPInfoScreen
+};   // GPInfoScreen
 
 #endif
diff --git a/src/states_screens/tracks_screen.cpp b/src/states_screens/tracks_screen.cpp
index 4d018feec..62e94f6df 100644
--- a/src/states_screens/tracks_screen.cpp
+++ b/src/states_screens/tracks_screen.cpp
@@ -114,18 +114,10 @@ void TracksScreen::eventCallback(Widget* widget, const std::string& name,
         }
         else
         {
-            if (selection == "Random Grand Prix")
-            {
-                RandomGPInfoScreen *gpis = RandomGPInfoScreen::getInstance();
-                gpis->setGP("random");
-                StateManager::get()->pushScreen(gpis);
-            }
-            else
-            {
-                GPInfoScreen *gpis = GPInfoScreen::getInstance();
-                gpis->setGP(selection);
-                StateManager::get()->pushScreen(gpis);
-            }
+            GPInfoScreen *gpis = GPInfoScreen::getInstance();
+            gpis->setGP( selection == "Random Grand Prix" ? "random" 
+                                                          : selection);
+            StateManager::get()->pushScreen(gpis);
         }
     }
     else if (name == "trackgroups")

From b3d1a412765f0a67e7489ee681b00a2d2cde064c Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 4 Sep 2014 17:05:47 +1000
Subject: [PATCH 200/248] Removed unused code, added comments.

---
 src/states_screens/gp_info_screen.cpp | 61 ++++++++-------------------
 src/states_screens/gp_info_screen.hpp |  2 +-
 2 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index 02f0cc5cf..d83032eab 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -52,6 +52,9 @@ using namespace GUIEngine;
 
 DEFINE_SCREEN_SINGLETON( GPInfoScreen );
 
+/** Constructor, initialised some variables which might be used before
+ *  loadedFromFile is called.
+ */
 GPInfoScreen::GPInfoScreen() : Screen("gp_info.stkgui")
 {
     m_curr_time = 0.0f;
@@ -60,12 +63,9 @@ GPInfoScreen::GPInfoScreen() : Screen("gp_info.stkgui")
 }   // GPInfoScreen
 
 // ----------------------------------------------------------------------------
-
-GPInfoScreen::~GPInfoScreen()
-{
-}   // ~GPInfoScreen
-
-// ----------------------------------------------------------------------------
+/** Called when the stkgui file is read. It stores the pointer to various
+ *  widgets and adds the right names for reverse mode.
+ */
 void GPInfoScreen::loadedFromFile()
 {
     // The group spinner is filled in init every time the screen is shown
@@ -104,6 +104,9 @@ void GPInfoScreen::setGP(const std::string &gp_ident)
 }   // setGP
 
 // ----------------------------------------------------------------------------
+/** Converts the currently selected reverse status into a value of type 
+*  GPReverseType .
+*/
 GrandPrixData::GPReverseType GPInfoScreen::getReverse() const
 {
     switch (m_reverse_spinner->getValue())
@@ -118,6 +121,10 @@ GrandPrixData::GPReverseType GPInfoScreen::getReverse() const
 }   // getReverse
 
 // ----------------------------------------------------------------------------
+/** Called before the screen is shown. It adds the screenshot icon, and
+ *  initialises all widgets depending on GP mode (random or not), if a saved
+ *  GP is available etc.
+ */
 void GPInfoScreen::init()
 {
     Screen::init();
@@ -250,38 +257,6 @@ void GPInfoScreen::addScreenshot()
     m_widgets.push_back(m_screenshot_widget);
 }   // addScreenShot
 
-// ----------------------------------------------------------------------------
-
-void GPInfoScreen::onEnterPressedInternal()
-{
-    // Save the GP id because dismiss() will destroy this instance
-    GrandPrixData gp_data = m_gp;
-    // Disable accidentally unlocking of a challenge
-    PlayerManager::getCurrentPlayer()->setCurrentChallenge("");
-    race_manager->startGP(m_gp, false, false);
-}
-
-// ----------------------------------------------------------------------------
-void GPInfoScreen::updateRandomGP()
-{
-    // First get the right track group to use
-    const std::vector<std::string>& groups = track_manager->getAllTrackGroups();
-
-    int n = m_group_spinner->getValue();
-    std::string track_group;
-    if(n>=0 && n < (int)groups.size())
-    {
-        track_group = groups[m_group_spinner->getValue()];
-    }
-    else
-    {
-        m_group_spinner->setValue(0);
-        track_group = groups[0];
-    }
-
-    int number_of_tracks = getWidget<SpinnerWidget>("track-spinner")->getValue();
-}   // updateRandomGP
-
 // ----------------------------------------------------------------------------
 /** Handle user input.
  */
@@ -341,7 +316,7 @@ void GPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &name,
     }
     else if (name=="reverse-spinner")
     {
-        m_gp.changeReverse(getReverse());
+        m_gp.changeReverse(getReverse());
     }
     else if(name=="back")
     {
@@ -360,16 +335,16 @@ void GPInfoScreen::onUpdate(float dt)
         return; // if nothing changed, return right now
 
     m_curr_time += dt;
-    int frameAfter = (int)(m_curr_time / 1.5f);
+    int frame_after = (int)(m_curr_time / 1.5f);
 
     const std::vector<std::string> tracks = m_gp.getTrackNames();
-    if (frameAfter >= (int)tracks.size())
+    if (frame_after >= (int)tracks.size())
     {
-        frameAfter = 0;
+        frame_after = 0;
         m_curr_time = 0;
     }
 
-    Track* track = track_manager->getTrack(tracks[frameAfter]);
+    Track* track = track_manager->getTrack(tracks[frame_after]);
     std::string file = track->getScreenshotFile();
     m_screenshot_widget->setImage(file, IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
     m_screenshot_widget->m_properties[GUIEngine::PROP_ICON] = file;
diff --git a/src/states_screens/gp_info_screen.hpp b/src/states_screens/gp_info_screen.hpp
index 47ae188dc..9e13328e7 100644
--- a/src/states_screens/gp_info_screen.hpp
+++ b/src/states_screens/gp_info_screen.hpp
@@ -74,7 +74,7 @@ public:
     GPInfoScreen();
     /** Places the focus back on the selected GP, in the case that the dialog
      * was cancelled and we're returning to the track selection screen */
-    virtual ~GPInfoScreen();
+    virtual ~GPInfoScreen() {}
 
     void onEnterPressedInternal();
     virtual void eventCallback(GUIEngine::Widget *, const std::string &name,

From 2514f8a8722c72b8fff7b52729c464e316327f6b Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 4 Sep 2014 17:19:15 +1000
Subject: [PATCH 201/248] Removed unnecessary GUIEngine::.

---
 src/states_screens/gp_info_screen.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index d83032eab..1f6195720 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -46,8 +46,6 @@
 #include <algorithm>
 
 using irr::gui::IGUIStaticText;
-using GUIEngine::PROP_ID;
-
 using namespace GUIEngine;
 
 DEFINE_SCREEN_SINGLETON( GPInfoScreen );
@@ -232,9 +230,9 @@ void GPInfoScreen::addScreenshot()
 {
     Widget* screenshot_div = getWidget("screenshot_div");
 
-    m_screenshot_widget = new GUIEngine::IconButtonWidget(
-        GUIEngine::IconButtonWidget::SCALE_MODE_KEEP_CUSTOM_ASPECT_RATIO,
-        false, false, GUIEngine::IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
+    m_screenshot_widget = new IconButtonWidget(
+        IconButtonWidget::SCALE_MODE_KEEP_CUSTOM_ASPECT_RATIO,
+        false, false, IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
     // images are saved squared, but must be stretched to 4:3
     m_screenshot_widget->setCustomAspectRatio(4.0f / 3.0f);
     m_screenshot_widget->m_x = screenshot_div->m_x;
@@ -260,12 +258,12 @@ void GPInfoScreen::addScreenshot()
 // ----------------------------------------------------------------------------
 /** Handle user input.
  */
-void GPInfoScreen::eventCallback(GUIEngine::Widget *, const std::string &name,
+void GPInfoScreen::eventCallback(Widget *, const std::string &name,
                                  const int player_id)
 {
     if(name=="buttons")
     {
-        const std::string &button = getWidget<GUIEngine::RibbonWidget>("buttons")
+        const std::string &button = getWidget<RibbonWidget>("buttons")
                                   ->getSelectionIDString(PLAYER_ID_GAME_MASTER);
 
         // The continue button becomes a 'reload' button in random GP:
@@ -347,5 +345,5 @@ void GPInfoScreen::onUpdate(float dt)
     Track* track = track_manager->getTrack(tracks[frame_after]);
     std::string file = track->getScreenshotFile();
     m_screenshot_widget->setImage(file, IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
-    m_screenshot_widget->m_properties[GUIEngine::PROP_ICON] = file;
+    m_screenshot_widget->m_properties[PROP_ICON] = file;
 }   // onUpdate
\ No newline at end of file

From 973399f5cbef2b3ccc96d381498c41644a8081ed Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 4 Sep 2014 21:14:37 +1000
Subject: [PATCH 202/248] Fixed memory leak.

---
 src/states_screens/gp_info_screen.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index 1f6195720..97b66725e 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -57,7 +57,8 @@ GPInfoScreen::GPInfoScreen() : Screen("gp_info.stkgui")
 {
     m_curr_time = 0.0f;
     // Necessary to test if loadedFroMFile() was executed (in setGP)
-    m_reverse_spinner = NULL;
+    m_reverse_spinner   = NULL;
+    m_screenshot_widget = NULL;
 }   // GPInfoScreen
 
 // ----------------------------------------------------------------------------
@@ -230,9 +231,13 @@ void GPInfoScreen::addScreenshot()
 {
     Widget* screenshot_div = getWidget("screenshot_div");
 
-    m_screenshot_widget = new IconButtonWidget(
-        IconButtonWidget::SCALE_MODE_KEEP_CUSTOM_ASPECT_RATIO,
-        false, false, IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
+    if(!m_screenshot_widget)
+    {
+        m_screenshot_widget = new IconButtonWidget(
+            IconButtonWidget::SCALE_MODE_KEEP_CUSTOM_ASPECT_RATIO,
+            false, false, IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
+        m_widgets.push_back(m_screenshot_widget);
+    }
     // images are saved squared, but must be stretched to 4:3
     m_screenshot_widget->setCustomAspectRatio(4.0f / 3.0f);
     m_screenshot_widget->m_x = screenshot_div->m_x;
@@ -252,7 +257,6 @@ void GPInfoScreen::addScreenshot()
                                            track->getFilename()            );
     if (screenshot != NULL)
         m_screenshot_widget->setImage(screenshot);
-    m_widgets.push_back(m_screenshot_widget);
 }   // addScreenShot
 
 // ----------------------------------------------------------------------------

From 6671182efdf2b46e01d606ed21c549ec85ffabef Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 4 Sep 2014 23:37:38 +1000
Subject: [PATCH 203/248] Fixed memory leak.

---
 src/states_screens/track_info_screen.cpp | 30 ++++++++++++++----------
 src/states_screens/track_info_screen.hpp |  3 +++
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/states_screens/track_info_screen.cpp b/src/states_screens/track_info_screen.cpp
index c17c71f7f..0e8914283 100644
--- a/src/states_screens/track_info_screen.cpp
+++ b/src/states_screens/track_info_screen.cpp
@@ -59,6 +59,7 @@ DEFINE_SCREEN_SINGLETON( TrackInfoScreen );
 TrackInfoScreen::TrackInfoScreen()
           : Screen("track_info.stkgui")
 {
+    m_screenshot = NULL;
 }   // TrackInfoScreen
 
 // ----------------------------------------------------------------------------
@@ -94,27 +95,30 @@ void TrackInfoScreen::init()
 
     // ---- Track screenshot
     Widget* screenshot_div = getWidget("screenshot_div");
-    IconButtonWidget* screenshot_widget = 
-        new IconButtonWidget(IconButtonWidget::SCALE_MODE_KEEP_CUSTOM_ASPECT_RATIO,
-                             false /* tab stop */, false /* focusable */);
-    // images are saved squared, but must be stretched to 4:
-    screenshot_widget->setCustomAspectRatio(4.0f / 3.0f);
+    if(!m_screenshot)
+    {
+        m_screenshot =
+            new IconButtonWidget(IconButtonWidget::SCALE_MODE_KEEP_CUSTOM_ASPECT_RATIO,
+                                 false /* tab stop */, false /* focusable */);
+        m_screenshot->setCustomAspectRatio(4.0f / 3.0f);
 
-    screenshot_widget->m_x = screenshot_div->m_x;
-    screenshot_widget->m_y = screenshot_div->m_y;
-    screenshot_widget->m_w = screenshot_div->m_w;
-    screenshot_widget->m_h = screenshot_div->m_h;
+        m_screenshot->m_x = screenshot_div->m_x;
+        m_screenshot->m_y = screenshot_div->m_y;
+        m_screenshot->m_w = screenshot_div->m_w;
+        m_screenshot->m_h = screenshot_div->m_h;
+        m_screenshot->add();
+        m_widgets.push_back(m_screenshot);
+    }
+    // images are saved squared, but must be stretched to 4:
 
     // temporary icon, will replace it just after (but it will be shown if the given icon is not found)
-    screenshot_widget->m_properties[PROP_ICON] = "gui/main_help.png";
-    screenshot_widget->add();
+    m_screenshot->m_properties[PROP_ICON] = "gui/main_help.png";
 
     ITexture* screenshot = irr_driver->getTexture(m_track->getScreenshotFile(),
                                     "While loading screenshot for track '%s':",
                                            m_track->getFilename()            );
     if (screenshot != NULL)
-        screenshot_widget->setImage(screenshot);
-    m_widgets.push_back(screenshot_widget);
+        m_screenshot->setImage(screenshot);
 
     // Lap count m_lap_spinner
     // -----------------------
diff --git a/src/states_screens/track_info_screen.hpp b/src/states_screens/track_info_screen.hpp
index e706640e9..00387bc60 100644
--- a/src/states_screens/track_info_screen.hpp
+++ b/src/states_screens/track_info_screen.hpp
@@ -52,6 +52,9 @@ class TrackInfoScreen : public GUIEngine::Screen,
     /** Spinner for number of AI karts. */
     GUIEngine::SpinnerWidget* m_ai_kart_spinner;
 
+    /** Screenshot widget. */
+    GUIEngine::IconButtonWidget *m_screenshot;
+
     /** Check box for reverse mode. */
     GUIEngine::CheckBoxWidget* m_reverse;
 

From 8fd6877e9263ac24c841962b27bb8d660cce4f77 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 5 Sep 2014 08:46:06 +1000
Subject: [PATCH 204/248] Fixed #1486. Made most menus more consistent (e.g.
 same position and height for heading).

---
 data/gui/gp_info.stkgui    |  18 ++---
 data/gui/racesetup.stkgui  |   4 +-
 data/gui/track_info.stkgui | 150 ++++++++++++++++++-------------------
 3 files changed, 85 insertions(+), 87 deletions(-)

diff --git a/data/gui/gp_info.stkgui b/data/gui/gp_info.stkgui
index 45d90944a..a1018587c 100644
--- a/data/gui/gp_info.stkgui
+++ b/data/gui/gp_info.stkgui
@@ -2,9 +2,9 @@
 <stkgui>
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
-    <div x="1%" y="1%" width="96%" height="98%" layout="vertical-row">
+    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
 
-        <header id="name" width="80%" align="center" text_align="center"/>
+        <header id="name" height="5%" width="80%" align="center" text_align="center"/>
 
         <spacer width="1" height="5%"/>
 
@@ -24,23 +24,23 @@
             </div>
 
         </box>
-        <spacer width="1" height="3%"/>
-        <box width="95%" height="30%" padding="10" layout="horizontal-row">
+        <spacer width="1" height="5%"/>
+        <box width="95%" height="25%" padding="10" layout="horizontal-row">
             <spacer width="1" height="5%"/>
             <div width="50%" height="100%" layout="vertical-row">
 
-                <div width="100%" height="fit" layout="horizontal-row" >
+                <div width="100%" height="20%" layout="horizontal-row" >
                     <label id="ai-text" height="100%" width="50%" I18N="Number of AI karts" text="AI karts"/>
                     <spinner id="ai-spinner" width="50%" min_value="1" max_value="20" align="center"
                              wrap_around="true" />
                 </div>
                 <spacer height="5%" />
-                <div width="100%" height="fit" layout="horizontal-row" >
+                <div width="100%" height="20%" layout="horizontal-row" >
                     <label id="reverse-text"      width="50%" height="100%" I18N="Drive the track reverse" text="Reverse"/>
                     <spinner id="reverse-spinner" width="50%" align="center" wrap_around="true" />
                 </div>
                 <spacer height="5%" />
-                <div width="100%" height="fit" layout="horizontal-row">
+                <div width="100%" height="20%" layout="horizontal-row">
                     <label id="track-text" width="50%" height="100%" text="Tracks"
                            I18N="Number of tracks to pick in a random Grand Prix."/>
                     <spinner id="track-spinner" width="50%" min_value="1" max_value="20" align="center"
@@ -48,14 +48,14 @@
                     <spacer height="1%" />
                 </div>
                 <spacer height="5%" />
-                <div width="100%" height="fit" layout="horizontal-row" >
+                <div width="100%" height="20%" layout="horizontal-row" >
                     <label   id="group-text"    width="50%" height="100%" I18N="Number of AI karts" text="Track group"/>
                     <spinner id="group-spinner" width="50%" align="center" wrap_around="true" />
                     <spacer proportion="1" height="2" />
                 </div>
             </div>
         </box>
-        <spacer width="1" height="2%"/>
+        <spacer width="1" height="5%"/>
         <buttonbar id="buttons" height="15%" width="100%" align="center">
 
             <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
diff --git a/data/gui/racesetup.stkgui b/data/gui/racesetup.stkgui
index 76a21512c..dd52aa0ea 100644
--- a/data/gui/racesetup.stkgui
+++ b/data/gui/racesetup.stkgui
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row" >
+    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
 
-        <header width="80%" text="Race Setup" align="center" text_align="center" />
+        <header height="5%" width="80%" text="Race Setup" align="center" text_align="center" />
 
         <spacer height="5%" width="25"/>
         <box width="95%" height="40%" padding="10" layout="vertical-row">
diff --git a/data/gui/track_info.stkgui b/data/gui/track_info.stkgui
index 7dea302dd..32ab2e52d 100644
--- a/data/gui/track_info.stkgui
+++ b/data/gui/track_info.stkgui
@@ -2,91 +2,89 @@
 <stkgui>
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
-    <div x="1%" y="1%" width="98%" height="98%">
-        <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
+    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
 
-            <header id="name" width="100%" text_align="center"/>
+        <header id="name" height="5%" width="80%" align="center" text_align="center"/>
 
-            <spacer width="1" height="5%"/>
+        <spacer width="1" height="5%"/>
 
-            <box width="95%" height="45%" padding="10" layout="horizontal-row">
-                <!-- Left pane -->
-                <div proportion="1" height="100%" layout="vertical-row">
-                    <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
-                    </placeholder>
+        <box width="95%" height="40%" padding="10" layout="horizontal-row">
+            <!-- Left pane -->
+            <div proportion="1" height="100%" layout="vertical-row">
+                <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
+                </placeholder>
 
-                </div>
-                <!-- Right pane -->
-                <div proportion="1" height="100%" layout="vertical-row">
-                    <label id="highscores" width="100%" text_align="center" text="= Highscores ="/>
+            </div>
+            <!-- Right pane -->
+            <div proportion="1" height="100%" layout="vertical-row">
+                <label id="highscores" width="100%" text_align="center" text="= Highscores ="/>
 
-                    <spacer width="1" height="2%"/>
-
-                    <div width="95%" height="fit" layout="horizontal-row">
-                        <icon id="iconscore1" icon="gui/random_kart.png" width="font" height="font"/>
-                        <spacer width="2%" height="1"/>
-                        <label id="highscore1" proportion="1" text="(Empty)"/>
-                    </div>
-
-                    <spacer width="1" height="2%"/>
-
-                    <div width="95%" height="fit" layout="horizontal-row">
-                        <icon id="iconscore2" icon="gui/random_kart.png" width="font" height="font"/>
-                        <spacer width="2%" height="1"/>
-                        <label id="highscore2" proportion="1" text="(Empty)"/>
-                    </div>
-
-                    <spacer width="1" height="2%"/>
-
-                    <div width="95%" height="fit" layout="horizontal-row">
-                        <icon id="iconscore3" icon="gui/random_kart.png" width="font" height="font"/>
-                        <spacer width="2%" height="1"/>
-                        <label id="highscore3" proportion="1" text="(Empty)"/>
-                    </div>
-
-                    <spacer width="1" height="10%"/>
-
-                    <label id="author" width="100%" text_align="center" word_wrap="true"/>
-                </div>
-
-            </box>
-            <spacer width="1" height="5%"/>
-            <box width="95%" height="25%" padding="10" layout="vertical-row">
-                <spacer width="1" height="5%"/>
-
-                <div width="75%" height="fit" layout="horizontal-row" >
-                    <spacer width="40" height="2" />
-                    <label id="lap-text" height="100%" width="40%" I18N="Number of laps" text="Number of laps"/>
-                    <spacer witdh="40" height="2" />
-                    <spinner id="lap-spinner" width="20%" min_value="1" max_value="20" align="center"
-                             wrap_around="true" />
-                    <spacer proportion="1" height="2" />
-                </div>
-                <div width="75%" height="fit" layout="horizontal-row" >
-                    <spacer width="40" height="2" />
-                    <label id="ai-text" height="100%" width="40%" I18N="Number of AI karts" text="Number of AI karts"/>
-                    <spacer with="40" height="2" />
-                    <spinner id="ai-spinner" width="20%" min_value="1" max_value="20" align="center"
-                             wrap_around="true" />
-                    <spacer proportion="1" height="2" />
-                </div>
-                <div width="75%" height="fit" layout="horizontal-row" >
-                    <spacer width="40" height="2" />
-                    <label id="reverse-text" height="100%" width="40%" I18N="Drive the track reverse" text="Drive in reverse"/>
-                    <spacer width="40" height="2" />
-                    <checkbox id="reverse"/>
-                    <spacer proportion="1" height="2" />
-                </div>
                 <spacer width="1" height="2%"/>
-            </box>
+
+                <div width="95%" height="fit" layout="horizontal-row">
+                    <icon id="iconscore1" icon="gui/random_kart.png" width="font" height="font"/>
+                    <spacer width="2%" height="1"/>
+                    <label id="highscore1" proportion="1" text="(Empty)"/>
+                </div>
+
+                <spacer width="1" height="2%"/>
+
+                <div width="95%" height="fit" layout="horizontal-row">
+                    <icon id="iconscore2" icon="gui/random_kart.png" width="font" height="font"/>
+                    <spacer width="2%" height="1"/>
+                    <label id="highscore2" proportion="1" text="(Empty)"/>
+                </div>
+
+                <spacer width="1" height="2%"/>
+
+                <div width="95%" height="fit" layout="horizontal-row">
+                    <icon id="iconscore3" icon="gui/random_kart.png" width="font" height="font"/>
+                    <spacer width="2%" height="1"/>
+                    <label id="highscore3" proportion="1" text="(Empty)"/>
+                </div>
+
+                <spacer width="1" height="10%"/>
+
+                <label id="author" width="100%" text_align="center" word_wrap="true"/>
+            </div>
+
+        </box>
+        <spacer width="1" height="5%"/>
+        <box width="95%" height="25%" padding="10" layout="vertical-row">
+            <spacer width="1" height="5%"/>
+
+            <div width="75%" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="2" />
+                <label id="lap-text" height="100%" width="40%" I18N="Number of laps" text="Number of laps"/>
+                <spacer witdh="40" height="2" />
+                <spinner id="lap-spinner" width="20%" min_value="1" max_value="20" align="center"
+                         wrap_around="true" />
+                <spacer proportion="1" height="2" />
+            </div>
+            <div width="75%" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="2" />
+                <label id="ai-text" height="100%" width="40%" I18N="Number of AI karts" text="Number of AI karts"/>
+                <spacer with="40" height="2" />
+                <spinner id="ai-spinner" width="20%" min_value="1" max_value="20" align="center"
+                         wrap_around="true" />
+                <spacer proportion="1" height="2" />
+            </div>
+            <div width="75%" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="2" />
+                <label id="reverse-text" height="100%" width="40%" I18N="Drive the track reverse" text="Drive in reverse"/>
+                <spacer width="40" height="2" />
+                <checkbox id="reverse"/>
+                <spacer proportion="1" height="2" />
+            </div>
             <spacer width="1" height="2%"/>
-            <buttonbar id="buttons" height="15%" width="100%" align="center">
+        </box>
+        <spacer width="1" height="5%"/>
+        <buttonbar id="buttons" height="15%" width="100%" align="center">
 
-                <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
-                        I18N="Start race" text="Start Race"/>
+            <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
+                    I18N="Start race" text="Start Race"/>
 
-            </buttonbar>>
-        </div>
+        </buttonbar>>
 
     </div>
 </stkgui>

From 0d7a425aac798dae3ed5123ab464667d2494d662 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 5 Sep 2014 01:35:38 +0200
Subject: [PATCH 205/248] Do not compute shadow/rsm mesh list if not available.

---
 src/graphics/stkscenemanager.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index cab7100c1..96ab0acec 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -209,6 +209,8 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
                 }
             }
         }
+        if (!UserConfigParams::m_shadows)
+            return;
         for (unsigned cascade = 0; cascade < 4; ++cascade)
         {
             if (!IsCulledForShadow[cascade])
@@ -255,6 +257,8 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
                 }
             }
         }
+        if (!UserConfigParams::m_gi)
+            return;
         if (!IsCulledForRSM)
         {
             if (irr_driver->hasARB_draw_indirect())

From 0848087b1d5c73e2ff6d1ded198ca7faa0c273f0 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 4 Sep 2014 19:45:16 -0400
Subject: [PATCH 206/248] Fix profiler, do not sync twice per frame

---
 src/main_loop.cpp      | 4 +---
 src/utils/profiler.cpp | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main_loop.cpp b/src/main_loop.cpp
index a24789f70..3052c9ed8 100644
--- a/src/main_loop.cpp
+++ b/src/main_loop.cpp
@@ -160,8 +160,6 @@ void MainLoop::run()
             PROFILER_PUSH_CPU_MARKER("Database polling update", 0x00, 0x7F, 0x7F);
             Online::RequestManager::get()->update(dt);
             PROFILER_POP_CPU_MARKER();
-
-            PROFILER_SYNC_FRAME();
         }
         else if (!m_abort && ProfileWorld::isNoGraphics())
         {
@@ -174,8 +172,8 @@ void MainLoop::run()
             PROFILER_POP_CPU_MARKER();
         }
 
-        PROFILER_SYNC_FRAME();
         PROFILER_POP_CPU_MARKER();
+        PROFILER_SYNC_FRAME();
     }  // while !m_abort
 
 }   // run
diff --git a/src/utils/profiler.cpp b/src/utils/profiler.cpp
index 2e8c56202..52123f0fc 100644
--- a/src/utils/profiler.cpp
+++ b/src/utils/profiler.cpp
@@ -264,7 +264,7 @@ void Profiler::draw()
     // Force to show the pointer
     irr_driver->showPointer();
 
-    int read_id = (m_freeze_state == FROZEN ? !m_write_id : m_write_id);
+    int read_id = !m_write_id;
 
     // Compute some values for drawing (unit: pixels, but we keep floats for reducing errors accumulation)
     core::dimension2d<u32>    screen_size    = driver->getScreenSize();

From 3529293b8d05c7468ab2950d830688be5fbdf183 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 5 Sep 2014 02:26:29 +0200
Subject: [PATCH 207/248] Turn timer query into asynchronous one

---
 src/graphics/glwrap.cpp | 14 ++++++++++----
 src/graphics/glwrap.hpp |  4 ++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index fcdcf2372..52f365c3a 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -924,11 +924,11 @@ size_t VAOManager::appendInstance(enum InstanceType, const std::vector<InstanceD
     return result;
 }
 
-ScopedGPUTimer::ScopedGPUTimer(GPUTimer &timer)
+ScopedGPUTimer::ScopedGPUTimer(GPUTimer &t) : timer(t)
 {
     if (!UserConfigParams::m_profiler_enabled) return;
     if (profiler.isFrozen()) return;
-
+    if (!timer.canSubmitQuery) return;
 #ifdef GL_TIME_ELAPSED
     irr::video::COpenGLDriver *gl_driver = (irr::video::COpenGLDriver *)irr_driver->getDevice()->getVideoDriver();
     if (!timer.initialised)
@@ -943,14 +943,15 @@ ScopedGPUTimer::~ScopedGPUTimer()
 {
     if (!UserConfigParams::m_profiler_enabled) return;
     if (profiler.isFrozen()) return;
-    
+    if (!timer.canSubmitQuery) return;
 #ifdef GL_TIME_ELAPSED
     irr::video::COpenGLDriver *gl_driver = (irr::video::COpenGLDriver *)irr_driver->getDevice()->getVideoDriver();
     gl_driver->extGlEndQuery(GL_TIME_ELAPSED);
+    timer.canSubmitQuery = false;
 #endif
 }
 
-GPUTimer::GPUTimer() : initialised(false)
+GPUTimer::GPUTimer() : initialised(false), lastResult(0), canSubmitQuery(true)
 {
 }
 
@@ -960,7 +961,12 @@ unsigned GPUTimer::elapsedTimeus()
         return 0;
     GLuint result;
     irr::video::COpenGLDriver *gl_driver = (irr::video::COpenGLDriver *)irr_driver->getDevice()->getVideoDriver();
+    gl_driver->extGlGetQueryObjectuiv(query, GL_QUERY_RESULT_AVAILABLE, &result);
+    if (result == GL_FALSE)
+        return lastResult;
     gl_driver->extGlGetQueryObjectuiv(query, GL_QUERY_RESULT, &result);
+    lastResult = result / 1000;
+    canSubmitQuery = true;
     return result / 1000;
 }
 
diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index 273cbdcb0..75133a7da 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -92,6 +92,8 @@ class GPUTimer;
 
 class ScopedGPUTimer
 {
+protected:
+    GPUTimer &timer;
 public:
     ScopedGPUTimer(GPUTimer &);
     ~ScopedGPUTimer();
@@ -102,6 +104,8 @@ class GPUTimer
     friend class ScopedGPUTimer;
     GLuint query;
     bool initialised;
+    unsigned lastResult;
+    bool canSubmitQuery;
 public:
     GPUTimer();
     unsigned elapsedTimeus();

From aee86fd14f91cad08c8ca5f3d3f39ae80dae1122 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 5 Sep 2014 02:30:51 +0200
Subject: [PATCH 208/248] Use classic buffersubdata for UBO

---
 src/graphics/render.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 8a1a561f4..11e80823a 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -596,9 +596,8 @@ void IrrDriver::computeCameraMatrix(scene::ICameraSceneNode * const camnode, siz
         50.,
     };
 
-    glBindBuffer(GL_UNIFORM_BUFFER, SharedObject::ViewProjectionMatrixesUBO);
-    float *tmp = (float *) glMapBufferRange(GL_UNIFORM_BUFFER, 0, (16 * 8 + 2) * sizeof(float), GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
 
+    float tmp[16 * 8 + 2];
     memcpy(tmp, irr_driver->getViewMatrix().pointer(), 16 * sizeof(float));
     memcpy(&tmp[16], irr_driver->getProjMatrix().pointer(), 16 * sizeof(float));
     memcpy(&tmp[32], irr_driver->getInvViewMatrix().pointer(), 16 * sizeof(float));
@@ -729,7 +728,8 @@ void IrrDriver::computeCameraMatrix(scene::ICameraSceneNode * const camnode, siz
 
     tmp[128] = float(width);
     tmp[129] = float(height);
-    glUnmapBuffer(GL_UNIFORM_BUFFER);
+    glBindBuffer(GL_UNIFORM_BUFFER, SharedObject::ViewProjectionMatrixesUBO);
+    glBufferSubData(GL_UNIFORM_BUFFER, 0, (16 * 8 + 2) * sizeof(float), tmp);
 }
 
 

From 5ef03ef4fa95eddc54c8266925250238f41b3c29 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 5 Sep 2014 02:37:48 +0200
Subject: [PATCH 209/248] Add 2 new profiler marker.

---
 src/graphics/render.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 11e80823a..5a1d8f225 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -148,8 +148,12 @@ void IrrDriver::renderGLSL(float dt)
         // TODO: put this outside of the rendering loop
         generateDiffuseCoefficients();
 
+        PROFILER_PUSH_CPU_MARKER("Update Light Info", 0xFF, 0x0, 0x0);
         unsigned plc = UpdateLightsInfo(camnode, dt);
+        PROFILER_POP_CPU_MARKER();
+        PROFILER_PUSH_CPU_MARKER("Compute camera matrix", 0x0, 0xFF, 0x0);
         computeCameraMatrix(camnode, viewport.LowerRightCorner.X - viewport.UpperLeftCorner.X, viewport.LowerRightCorner.Y - viewport.UpperLeftCorner.Y);
+        PROFILER_POP_CPU_MARKER();
         renderScene(camnode, plc, glows, dt, track->hasShadows(), false);
 
         // Debug physic

From e2b361356c84449a0ba7920d2cb05aa3b4984815 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 5 Sep 2014 02:40:30 +0200
Subject: [PATCH 210/248] Add a marker for gpu command upload

---
 src/graphics/stkscenemanager.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 96ab0acec..36482267d 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -14,6 +14,7 @@
 #include "modes/world.hpp"
 #include "tracks/track.hpp"
 #include "lod_node.hpp"
+#include "utils/profiler.hpp"
 #include <unordered_map>
 
 static void
@@ -493,6 +494,7 @@ void IrrDriver::PrepareDrawCalls(scene::ICameraSceneNode *camnode)
 
     size_t SolidPoly = 0, ShadowPoly = 0, MiscPoly = 0;
 
+    PROFILER_PUSH_CPU_MARKER("- Draw Command upload", 0xFF, 0x0, 0xFF);
 #pragma omp parallel sections
     {
 #pragma omp section
@@ -650,6 +652,7 @@ void IrrDriver::PrepareDrawCalls(scene::ICameraSceneNode *camnode)
             }
         }
     }
+    PROFILER_POP_CPU_MARKER();
     poly_count[SOLID_NORMAL_AND_DEPTH_PASS] += SolidPoly;
     poly_count[SHADOW_PASS] += ShadowPoly;
 

From 861a76ff55386a025e1317d53fcb04995992f70f Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 4 Sep 2014 20:46:08 -0400
Subject: [PATCH 211/248] Minor tweaks to profiler

---
 src/utils/profiler.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/utils/profiler.cpp b/src/utils/profiler.cpp
index 52123f0fc..6df0432dd 100644
--- a/src/utils/profiler.cpp
+++ b/src/utils/profiler.cpp
@@ -256,6 +256,7 @@ void Profiler::synchronizeFrame()
 /// Draw the markers
 void Profiler::draw()
 {
+    PROFILER_PUSH_CPU_MARKER("ProfilerDraw", 0xFF, 0xFF, 0x00);
     video::IVideoDriver*    driver = irr_driver->getVideoDriver();
     std::stack<Marker>      hovered_markers;
 
@@ -294,7 +295,7 @@ void Profiler::draw()
             else end = std::max(end, m.end);
         }
     }
-
+    
     const double duration = end - start;
     const double factor = profiler_width / duration;
 
@@ -352,17 +353,19 @@ void Profiler::draw()
             m_first_capture_sweep = false;
         }
     }
-
+    
     // GPU profiler
     QueryPerf hovered_gpu_marker = Q_LAST;
     long hovered_gpu_marker_elapsed = 0;
     int gpu_y = int(y_offset + nb_thread_infos*line_height + line_height/2);
     float total = 0;
+    unsigned int gpu_timers[Q_LAST];
     for (unsigned i = 0; i < Q_LAST; i++)
     {
-        total += irr_driver->getGPUTimer(i).elapsedTimeus();
+        gpu_timers[i] = irr_driver->getGPUTimer(i).elapsedTimeus();
+        total += gpu_timers[i];
     }
-
+    
     static video::SColor colors[] = {
         video::SColor(255, 255, 0, 0),
         video::SColor(255, 0, 255, 0),
@@ -379,7 +382,7 @@ void Profiler::draw()
         {
             //Log::info("GPU Perf", "Phase %d : %d us\n", i, irr_driver->getGPUTimer(i).elapsedTimeus());
 
-            float elapsed = float(irr_driver->getGPUTimer(i).elapsedTimeus());
+            float elapsed = float(gpu_timers[i]);
             core::rect<s32> pos((s32)(x_offset + (curr_val / total)*profiler_width),
                 (s32)(y_offset + gpu_y),
                 (s32)(x_offset + ((curr_val + elapsed) / total)*profiler_width),
@@ -391,7 +394,7 @@ void Profiler::draw()
             if (pos.isPointInside(mouse_pos))
             {
                 hovered_gpu_marker = (QueryPerf)i;
-                hovered_gpu_marker_elapsed = irr_driver->getGPUTimer(i).elapsedTimeus();
+                hovered_gpu_marker_elapsed = gpu_timers[i];
             }
 
             if (m_capture_report)
@@ -451,6 +454,8 @@ void Profiler::draw()
     {
         font->draw("Capturing profiler report...", MARKERS_NAMES_POS, video::SColor(0xFF, 0x00, 0x90, 0x00));
     }
+
+    PROFILER_POP_CPU_MARKER();
 }
 
 //-----------------------------------------------------------------------------

From cd3df69218e8d81e4c7619e1d49e733019820294 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Fri, 5 Sep 2014 03:33:45 +0200
Subject: [PATCH 212/248] Fix some compiler warning.

---
 src/graphics/render.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 5a1d8f225..3f7a39408 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -798,7 +798,7 @@ void IrrDriver::renderGlow(std::vector<GlowData>& glows)
         scene::ISceneNode * cur = dat.node;
 
         STKMeshSceneNode *node = static_cast<STKMeshSceneNode *>(cur);
-        node->setGlowColors(SColor(0, dat.b * 255.f, dat.g * 255.f, dat.r * 255.f));
+        node->setGlowColors(SColor(0, (unsigned)dat.b * 255.f, (unsigned)dat.g * 255.f, (unsigned)dat.r * 255.f));
         if (!irr_driver->hasARB_draw_indirect())
             node->render();
     }

From 95ea76cc600e0f794e192a4bcfcc6dd82a4c8efb Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Fri, 5 Sep 2014 03:36:58 +0200
Subject: [PATCH 213/248] Better fix

---
 src/graphics/render.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 3f7a39408..0850e6f40 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -798,7 +798,7 @@ void IrrDriver::renderGlow(std::vector<GlowData>& glows)
         scene::ISceneNode * cur = dat.node;
 
         STKMeshSceneNode *node = static_cast<STKMeshSceneNode *>(cur);
-        node->setGlowColors(SColor(0, (unsigned)dat.b * 255.f, (unsigned)dat.g * 255.f, (unsigned)dat.r * 255.f));
+        node->setGlowColors(SColor(0, (unsigned) (dat.b * 255.f), (unsigned)(dat.g * 255.f), (unsigned)(dat.r * 255.f)));
         if (!irr_driver->hasARB_draw_indirect())
             node->render();
     }

From 99eea187bb831eff06f572303447179167cab6ad Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Fri, 5 Sep 2014 15:38:25 +0200
Subject: [PATCH 214/248] Use emplace back instead of push_back in scenemanager

---
 src/graphics/stkscenemanager.cpp | 67 ++++++++++++++++----------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 36482267d..5b88bf04a 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -150,24 +150,25 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
                 for_in(mesh, node->MeshSolidMaterial[Mat])
                 {
                     if (node->glow())
-                        MeshForGlowPass[mesh->mb].push_back(std::make_pair(mesh, node));
-                    core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
-                    ModelMatrix.getInverse(InvModelMatrix);
+                        MeshForGlowPass[mesh->mb].emplace_back(mesh, node);
+
 
                     if (mesh->TextureMatrix.isIdentity())
-                        MeshForSolidPass[Mat][mesh->mb].push_back(std::make_pair(mesh, Node));
+                        MeshForSolidPass[Mat][mesh->mb].emplace_back(mesh, Node);
                     else
                     {
+                        core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
+                        ModelMatrix.getInverse(InvModelMatrix);
                         switch (Mat)
                         {
                         case MAT_DEFAULT:
-                            ListMatDefault::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            ListMatDefault::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                             break;
                         case MAT_ALPHA_REF:
-                            ListMatAlphaRef::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            ListMatAlphaRef::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                             break;
                         case MAT_UNLIT:
-                            ListMatUnlit::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            ListMatUnlit::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                             break;
                         }
                     }
@@ -183,28 +184,28 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
                     switch (Mat)
                     {
                     case MAT_DEFAULT:
-                        ListMatDefault::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        ListMatDefault::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_ALPHA_REF:
-                        ListMatAlphaRef::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        ListMatAlphaRef::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_NORMAL_MAP:
-                        ListMatNormalMap::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        ListMatNormalMap::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_DETAIL:
-                        ListMatDetails::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        ListMatDetails::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_UNLIT:
-                        ListMatUnlit::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        ListMatUnlit::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_SPHEREMAP:
-                        ListMatSphereMap::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        ListMatSphereMap::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_SPLATTING:
-                        ListMatSplatting::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix));
+                        ListMatSplatting::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix);
                         break;
                     case MAT_GRASS:
-                        ListMatGrass::getInstance()->SolidPass.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, windDir));
+                        ListMatGrass::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, windDir);
                         break;
                     }
                 }
@@ -219,7 +220,7 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
                 if (irr_driver->hasARB_draw_indirect())
                 {
                     for_in(mesh, node->MeshSolidMaterial[Mat])
-                        MeshForShadowPass[cascade][Mat][mesh->mb].push_back(std::make_pair(mesh, Node));
+                        MeshForShadowPass[cascade][Mat][mesh->mb].emplace_back(mesh, Node);
                 }
                 else
                 {
@@ -231,28 +232,28 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
                         switch (Mat)
                         {
                         case MAT_DEFAULT:
-                            ListMatDefault::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            ListMatDefault::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                             break;
                         case MAT_ALPHA_REF:
-                            ListMatAlphaRef::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            ListMatAlphaRef::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                             break;
                         case MAT_NORMAL_MAP:
-                            ListMatNormalMap::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            ListMatNormalMap::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                             break;
                         case MAT_DETAIL:
-                            ListMatDetails::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            ListMatDetails::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                             break;
                         case MAT_UNLIT:
-                            ListMatUnlit::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            ListMatUnlit::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                             break;
                         case MAT_SPHEREMAP:
-                            ListMatSphereMap::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                            ListMatSphereMap::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                             break;
                         case MAT_SPLATTING:
-                            ListMatSplatting::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix));
+                            ListMatSplatting::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix);
                             break;
                         case MAT_GRASS:
-                            ListMatGrass::getInstance()->Shadows[cascade].push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, windDir));
+                            ListMatGrass::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, windDir);
                         }
                     }
                 }
@@ -265,7 +266,7 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
             if (irr_driver->hasARB_draw_indirect())
             {
                 for_in(mesh, node->MeshSolidMaterial[Mat])
-                    MeshForRSMPass[Mat][mesh->mb].push_back(std::make_pair(mesh, Node));
+                    MeshForRSMPass[Mat][mesh->mb].emplace_back(mesh, Node);
             }
             else
             {
@@ -277,28 +278,28 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
                     switch (Mat)
                     {
                     case MAT_DEFAULT:
-                        ListMatDefault::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        ListMatDefault::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_ALPHA_REF:
-                        ListMatAlphaRef::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        ListMatAlphaRef::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_NORMAL_MAP:
-                        ListMatNormalMap::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        ListMatNormalMap::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_DETAIL:
-                        ListMatDetails::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        ListMatDetails::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_UNLIT:
-                        ListMatUnlit::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        ListMatUnlit::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_SPHEREMAP:
-                        ListMatSphereMap::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                        ListMatSphereMap::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_SPLATTING:
-                        ListMatSplatting::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix));
+                        ListMatSplatting::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix);
                         break;
                     case MAT_GRASS:
-                        ListMatGrass::getInstance()->RSM.push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, windDir));
+                        ListMatGrass::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, windDir);
                         break;
                     }
                 }

From 6223f5205bc5f0eb23561aad7ed91d80bc86315f Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Thu, 4 Sep 2014 00:56:17 +0200
Subject: [PATCH 215/248] Add an SSE optimised inverse matrix

---
 lib/irrlicht/include/matrix4.h | 116 +++++++++++++++++++++++++++++----
 1 file changed, 105 insertions(+), 11 deletions(-)

diff --git a/lib/irrlicht/include/matrix4.h b/lib/irrlicht/include/matrix4.h
index 45fe98374..1d812b308 100644
--- a/lib/irrlicht/include/matrix4.h
+++ b/lib/irrlicht/include/matrix4.h
@@ -12,6 +12,9 @@
 #include "aabbox3d.h"
 #include "rect.h"
 #include "irrString.h"
+#if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
+#include <intrin.h>
+#endif
 
 // enable this to keep track of changes to the matrix
 // and make simpler identity check for seldomly changing matrices
@@ -1307,20 +1310,110 @@ namespace core
 
 
 	template <class T>
-	inline bool CMatrix4<T>::getInverse(CMatrix4<T>& out) const
-	{
-		/// Calculates the inverse of this Matrix
-		/// The inverse is calculated using Cramers rule.
-		/// If no inverse exists then 'false' is returned.
+    inline bool CMatrix4<T>::getInverse(CMatrix4<T>& out) const
+    {
+        /// Calculates the inverse of this Matrix
+        /// The inverse is calculated using Cramers rule.
+        /// If no inverse exists then 'false' is returned.
 
 #if defined ( USE_MATRIX_TEST )
-		if ( this->isIdentity() )
-		{
-			out=*this;
-			return true;
-		}
+        if ( this->isIdentity() )
+        {
+            out=*this;
+            return true;
+        }
 #endif
-		const CMatrix4<T> &m = *this;
+        const CMatrix4<T> &m = *this;
+#if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
+        float *src = (float*)m.pointer();
+        float *dst = (float*)out.pointer();
+        // from http://www.intel.com/design/pentiumiii/sml/245043.htm
+        {
+            __m128 minor0, minor1, minor2, minor3;
+            __m128 row0, row1, row2, row3;
+            __m128 det, tmp1;
+            tmp1 = _mm_loadh_pi(_mm_loadl_pi(tmp1, (__m64*)(src)), (__m64*)(src + 4));
+            row1 = _mm_loadh_pi(_mm_loadl_pi(row1, (__m64*)(src + 8)), (__m64*)(src + 12));
+            row0 = _mm_shuffle_ps(tmp1, row1, 0x88);
+            row1 = _mm_shuffle_ps(row1, tmp1, 0xDD);
+            tmp1 = _mm_loadh_pi(_mm_loadl_pi(tmp1, (__m64*)(src + 2)), (__m64*)(src + 6));
+            row3 = _mm_loadh_pi(_mm_loadl_pi(row3, (__m64*)(src + 10)), (__m64*)(src + 14));
+            row2 = _mm_shuffle_ps(tmp1, row3, 0x88);
+            row3 = _mm_shuffle_ps(row3, tmp1, 0xDD);
+            // -----------------------------------------------
+            tmp1 = _mm_mul_ps(row2, row3);
+            tmp1 = _mm_shuffle_ps(tmp1, tmp1, 0xB1);
+            minor0 = _mm_mul_ps(row1, tmp1);
+            minor1 = _mm_mul_ps(row0, tmp1);
+            tmp1 = _mm_shuffle_ps(tmp1, tmp1, 0x4E);
+            minor0 = _mm_sub_ps(_mm_mul_ps(row1, tmp1), minor0);
+            minor1 = _mm_sub_ps(_mm_mul_ps(row0, tmp1), minor1);
+            minor1 = _mm_shuffle_ps(minor1, minor1, 0x4E);
+            // -----------------------------------------------
+            tmp1 = _mm_mul_ps(row1, row2);
+            tmp1 = _mm_shuffle_ps(tmp1, tmp1, 0xB1);
+            minor0 = _mm_add_ps(_mm_mul_ps(row3, tmp1), minor0);
+            minor3 = _mm_mul_ps(row0, tmp1);
+            tmp1 = _mm_shuffle_ps(tmp1, tmp1, 0x4E);
+            minor0 = _mm_sub_ps(minor0, _mm_mul_ps(row3, tmp1));
+            minor3 = _mm_sub_ps(_mm_mul_ps(row0, tmp1), minor3);
+            minor3 = _mm_shuffle_ps(minor3, minor3, 0x4E);
+            // -----------------------------------------------
+            tmp1 = _mm_mul_ps(_mm_shuffle_ps(row1, row1, 0x4E), row3);
+            tmp1 = _mm_shuffle_ps(tmp1, tmp1, 0xB1);
+            row2 = _mm_shuffle_ps(row2, row2, 0x4E);
+            minor0 = _mm_add_ps(_mm_mul_ps(row2, tmp1), minor0);
+            minor2 = _mm_mul_ps(row0, tmp1);
+            tmp1 = _mm_shuffle_ps(tmp1, tmp1, 0x4E);
+            minor0 = _mm_sub_ps(minor0, _mm_mul_ps(row2, tmp1));
+            minor2 = _mm_sub_ps(_mm_mul_ps(row0, tmp1), minor2);
+            minor2 = _mm_shuffle_ps(minor2, minor2, 0x4E);
+            // -----------------------------------------------
+            tmp1 = _mm_mul_ps(row0, row1);
+            tmp1 = _mm_shuffle_ps(tmp1, tmp1, 0xB1);
+            minor2 = _mm_add_ps(_mm_mul_ps(row3, tmp1), minor2);
+            minor3 = _mm_sub_ps(_mm_mul_ps(row2, tmp1), minor3);
+            tmp1 = _mm_shuffle_ps(tmp1, tmp1, 0x4E);
+            minor2 = _mm_sub_ps(_mm_mul_ps(row3, tmp1), minor2);
+            minor3 = _mm_sub_ps(minor3, _mm_mul_ps(row2, tmp1));
+            // -----------------------------------------------
+            tmp1 = _mm_mul_ps(row0, row3);
+            tmp1 = _mm_shuffle_ps(tmp1, tmp1, 0xB1);
+            minor1 = _mm_sub_ps(minor1, _mm_mul_ps(row2, tmp1));
+            minor2 = _mm_add_ps(_mm_mul_ps(row1, tmp1), minor2);
+            tmp1 = _mm_shuffle_ps(tmp1, tmp1, 0x4E);
+            minor1 = _mm_add_ps(_mm_mul_ps(row2, tmp1), minor1);
+            minor2 = _mm_sub_ps(minor2, _mm_mul_ps(row1, tmp1));
+            // -----------------------------------------------
+            tmp1 = _mm_mul_ps(row0, row2);
+            tmp1 = _mm_shuffle_ps(tmp1, tmp1, 0xB1);
+            minor1 = _mm_add_ps(_mm_mul_ps(row3, tmp1), minor1);
+            minor3 = _mm_sub_ps(minor3, _mm_mul_ps(row1, tmp1));
+            tmp1 = _mm_shuffle_ps(tmp1, tmp1, 0x4E);
+            minor1 = _mm_sub_ps(minor1, _mm_mul_ps(row3, tmp1));
+            minor3 = _mm_add_ps(_mm_mul_ps(row1, tmp1), minor3);
+            // -----------------------------------------------
+            det = _mm_mul_ps(row0, minor0);
+            det = _mm_add_ps(_mm_shuffle_ps(det, det, 0x4E), det);
+            det = _mm_add_ss(_mm_shuffle_ps(det, det, 0xB1), det);
+            tmp1 = _mm_rcp_ss(det);
+            det = _mm_sub_ss(_mm_add_ss(tmp1, tmp1), _mm_mul_ss(det, _mm_mul_ss(tmp1, tmp1)));
+            det = _mm_shuffle_ps(det, det, 0x00);
+            minor0 = _mm_mul_ps(det, minor0);
+            _mm_storel_pi((__m64*)(dst), minor0);
+            _mm_storeh_pi((__m64*)(dst + 2), minor0);
+            minor1 = _mm_mul_ps(det, minor1);
+            _mm_storel_pi((__m64*)(dst + 4), minor1);
+            _mm_storeh_pi((__m64*)(dst + 6), minor1);
+            minor2 = _mm_mul_ps(det, minor2);
+            _mm_storel_pi((__m64*)(dst + 8), minor2);
+            _mm_storeh_pi((__m64*)(dst + 10), minor2);
+            minor3 = _mm_mul_ps(det, minor3);
+            _mm_storel_pi((__m64*)(dst + 12), minor3);
+            _mm_storeh_pi((__m64*)(dst + 14), minor3);
+        }
+        return true;
+#else
 
 		f32 d = (m(0, 0) * m(1, 1) - m(0, 1) * m(1, 0)) * (m(2, 2) * m(3, 3) - m(2, 3) * m(3, 2)) -
 			(m(0, 0) * m(1, 2) - m(0, 2) * m(1, 0)) * (m(2, 1) * m(3, 3) - m(2, 3) * m(3, 1)) +
@@ -1387,6 +1480,7 @@ namespace core
 		out.definitelyIdentityMatrix = definitelyIdentityMatrix;
 #endif
 		return true;
+#endif
 	}
 
 

From 44d50aa8d7d120aef5b92d5991d782736c2ce03b Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Fri, 5 Sep 2014 17:32:18 +0200
Subject: [PATCH 216/248] Fix build

---
 lib/irrlicht/include/matrix4.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/irrlicht/include/matrix4.h b/lib/irrlicht/include/matrix4.h
index 1d812b308..13f729c1e 100644
--- a/lib/irrlicht/include/matrix4.h
+++ b/lib/irrlicht/include/matrix4.h
@@ -12,7 +12,7 @@
 #include "aabbox3d.h"
 #include "rect.h"
 #include "irrString.h"
-#if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
+#if defined(WIN32) && (defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86))
 #include <intrin.h>
 #endif
 
@@ -1324,7 +1324,7 @@ namespace core
         }
 #endif
         const CMatrix4<T> &m = *this;
-#if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
+#if defined(WIN32) && (defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86))
         float *src = (float*)m.pointer();
         float *dst = (float*)out.pointer();
         // from http://www.intel.com/design/pentiumiii/sml/245043.htm

From bc4762be48537d9c4dbd9940c0cacc75899d753d Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 3 Sep 2014 18:09:17 +0200
Subject: [PATCH 217/248] Use newer cmake in travis and download libGLEW

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a6bd4732b..b7f46447e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,13 +14,13 @@ before_install:
   # Update repos
   - sudo apt-get update -qq
   # Install dependencies
-  - sudo apt-get install build-essential cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev
+  - sudo apt-get install build-essential libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev
   # Install mesa from an other repo (a newer version is required). Quantal is not supported anymore, saucy is only supported till July 2014,
   # so we try to use trusty (precise which is what traiv uses a too old mesa version which doesn't link)
   - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted"
   - sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32
   - sudo apt-get update -qq
-  - sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev
+  - sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev libglew-dev cmake
 script:
   # First a debug build: 
   - mkdir build-debug

From b63654a40c9840975263ef1ac004ed6afdc6d102 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 3 Sep 2014 17:38:14 +0200
Subject: [PATCH 218/248] Detect Glew in CMake

---
 CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19ad08fbf..fd6fd4db7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,6 +149,10 @@ endif()
 find_package(OpenGL REQUIRED)
 include_directories(${OPENGL_INCLUDE_DIR})
 
+# Glew
+find_package(GLEW REQUIRED)
+include_directories(${GLEW_INCLUDE_DIR})
+
 if(UNIX AND NOT APPLE)
     if(USE_XRANDR)
         find_package(Xrandr REQUIRED)
@@ -269,7 +273,8 @@ target_link_libraries(supertuxkart
     ${CURL_LIBRARIES}
     ${OGGVORBIS_LIBRARIES}
     ${OPENAL_LIBRARY}
-    ${OPENGL_LIBRARIES})
+    ${OPENGL_LIBRARIES}
+    ${GLEW_LIBRARIES})
 
 if(UNIX AND NOT APPLE)
     if(USE_XRANDR)

From 8da557d1537d6fb11164ad2422392f101da476f1 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Wed, 3 Sep 2014 17:59:52 +0200
Subject: [PATCH 219/248] Use GLEW for our GL function support.

---
 src/graphics/gl_headers.hpp      | 113 +---------------
 src/graphics/glwrap.cpp          | 217 ++-----------------------------
 src/graphics/glwrap.hpp          |   4 -
 src/graphics/gpuparticles.cpp    |   1 +
 src/graphics/irr_driver.cpp      |  20 +--
 src/graphics/render.cpp          |  12 +-
 src/physics/irr_debug_drawer.hpp |   2 +-
 7 files changed, 28 insertions(+), 341 deletions(-)

diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp
index baf7f828e..50069f23f 100644
--- a/src/graphics/gl_headers.hpp
+++ b/src/graphics/gl_headers.hpp
@@ -1,6 +1,12 @@
 #ifndef GL_HEADER_HPP
 #define GL_HEADER_HPP
 
+#define GLEW_STATIC
+extern "C" {
+#include <GL/glew.h>
+}
+#include <cinttypes>
+
 #if defined(__APPLE__)
 #    include <OpenGL/gl.h>
 #    include <OpenGL/gl3.h>
@@ -15,10 +21,7 @@
 #    include <GLES/gl.h>
 #elif defined(WIN32)
 #    define _WINSOCKAPI_
-// has to be included before gl.h because of WINGDIAPI and APIENTRY definitions
 #    include <windows.h>
-#    include <GL/gl.h>
-#    include "../../lib/irrlicht/source/Irrlicht/glext.h"
 #else
 #define GL_GLEXT_PROTOTYPES
 #define DEBUG_OUTPUT_DECLARED
@@ -26,115 +29,11 @@
 #    include <GL/glext.h>
 #endif
 
-#ifdef WIN32
-extern PFNGLGENTRANSFORMFEEDBACKSPROC glGenTransformFeedbacks;
-extern PFNGLBINDTRANSFORMFEEDBACKPROC glBindTransformFeedback;
-extern PFNGLDRAWTRANSFORMFEEDBACKPROC glDrawTransformFeedback;
-extern PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback;
-extern PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback;
-extern PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings;
-extern PFNGLBINDBUFFERBASEPROC glBindBufferBase;
-extern PFNGLGENBUFFERSPROC glGenBuffers;
-extern PFNGLBINDBUFFERPROC glBindBuffer;
-extern PFNGLBUFFERDATAPROC glBufferData;
-extern PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;
-extern PFNGLCREATESHADERPROC glCreateShader;
-extern PFNGLCOMPILESHADERPROC glCompileShader;
-extern PFNGLSHADERSOURCEPROC glShaderSource;
-extern PFNGLCREATEPROGRAMPROC glCreateProgram;
-extern PFNGLATTACHSHADERPROC glAttachShader;
-extern PFNGLLINKPROGRAMPROC glLinkProgram;
-extern PFNGLUSEPROGRAMPROC glUseProgram;
-extern PFNGLDELETEPROGRAMPROC glDeleteProgram;
-extern PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
-extern PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
-extern PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
-extern PFNGLUNIFORMMATRIX4FVPROC glUniformMatrix4fv;
-extern PFNGLUNIFORM1FPROC glUniform1f;
-extern PFNGLUNIFORM3FPROC glUniform3f;
-extern PFNGLUNIFORM1FVPROC glUniform1fv;
-extern PFNGLUNIFORM4FVPROC glUniform4fv;
-extern PFNGLDELETESHADERPROC glDeleteShader;
-extern PFNGLGETSHADERIVPROC glGetShaderiv;
-extern PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
-extern PFNGLACTIVETEXTUREPROC glActiveTexture;
-extern PFNGLUNIFORM2FPROC glUniform2f;
-extern PFNGLUNIFORM1IPROC glUniform1i;
-extern PFNGLUNIFORM3IPROC glUniform3i;
-extern PFNGLUNIFORM4IPROC glUniform4i;
-extern PFNGLGETPROGRAMIVPROC glGetProgramiv;
-extern PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;
-extern PFNGLGETATTRIBLOCATIONPROC glGetAttribLocation;
-extern PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;
-extern PFNGLBLENDEQUATIONPROC glBlendEquation;
-extern PFNGLVERTEXATTRIBDIVISORPROC glVertexAttribDivisor;
-extern PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
-extern PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
-extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
-extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
-extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC glDrawElementsInstancedBaseVertexBaseInstance;
-extern PFNGLDRAWELEMENTSINDIRECTPROC glDrawElementsIndirect;
-extern PFNGLMULTIDRAWELEMENTSINDIRECTPROC glMultiDrawElementsIndirect;
-extern PFNGLDELETEBUFFERSPROC glDeleteBuffers;
-extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
-extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
-extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
-extern PFNGLTEXBUFFERPROC glTexBuffer;
-extern PFNGLBUFFERSUBDATAPROC glBufferSubData;
-extern PFNGLMAPBUFFERPROC glMapBuffer;
-extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
-extern PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;
-extern PFNGLMEMORYBARRIERPROC glMemoryBarrier;
-extern PFNGLBUFFERSTORAGEPROC glBufferStorage;
-extern PFNGLUNMAPBUFFERPROC glUnmapBuffer;
-extern PFNGLFENCESYNCPROC glFenceSync;
-extern PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
-extern PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer;
-extern PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers;
-extern PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers;
-extern PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
-extern PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D;
-extern PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture;
-extern PFNGLTEXIMAGE3DPROC glTexImage3D;
-extern PFNGLGENERATEMIPMAPPROC glGenerateMipmap;
-extern PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus;
-extern PFNGLTEXIMAGE2DMULTISAMPLEPROC glTexImage2DMultisample;
-extern PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
-extern PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
-extern PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
-extern PFNGLBLENDCOLORPROC glBlendColor;
-extern PFNGLCOMPRESSEDTEXIMAGE2DPROC glCompressedTexImage2D;
-extern PFNGLGETCOMPRESSEDTEXIMAGEPROC glGetCompressedTexImage;
-extern PFNGLTEXSTORAGE1DPROC glTexStorage1D;
-extern PFNGLTEXSTORAGE2DPROC glTexStorage2D;
-extern PFNGLTEXSTORAGE3DPROC glTexStorage3D;
-extern PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
-extern PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
-extern PFNGLGENSAMPLERSPROC glGenSamplers;
-extern PFNGLDELETESAMPLERSPROC glDeleteSamplers;
-extern PFNGLBINDSAMPLERPROC glBindSampler;
-extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
-extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
-extern PFNGLGETTEXTURESAMPLERHANDLEARBPROC glGetTextureSamplerHandleARB;
-extern PFNGLMAKETEXTUREHANDLERESIDENTARBPROC glMakeTextureHandleResidentARB;
-extern PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC glMakeTextureHandleNonResidentARB;
-extern PFNGLUNIFORMHANDLEUI64ARBPROC glUniformHandleui64ARB;
-extern PFNGLISTEXTUREHANDLERESIDENTARBPROC glIsTextureHandleResidentARB;
-extern PFNGLVERTEXATTRIBLPOINTERPROC glVertexAttribLPointer;
-#ifdef DEBUG
-extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
-#endif
-#endif
-
-
-#ifdef WIN32
 #define Bindless_Texture_Support
 #define Base_Instance_Support
 #define Buffer_Storage
 #define Multi_Draw_Indirect
 #define Draw_Indirect
-#endif
-
 
 struct DrawElementsIndirectCommand{
     GLuint count;
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 52f365c3a..15887a8f0 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -6,105 +6,8 @@
 #include "utils/cpp2011.hpp"
 #include "graphics/stkmesh.hpp"
 
-#ifdef _IRR_WINDOWS_API_
-#define IRR_OGL_LOAD_EXTENSION(X) wglGetProcAddress(reinterpret_cast<const char*>(X))
-PFNGLGENTRANSFORMFEEDBACKSPROC glGenTransformFeedbacks;
-PFNGLBINDTRANSFORMFEEDBACKPROC glBindTransformFeedback;
-PFNGLDRAWTRANSFORMFEEDBACKPROC glDrawTransformFeedback;
-PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback;
-PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback;
-PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings;
-PFNGLBINDBUFFERBASEPROC glBindBufferBase;
-PFNGLGENBUFFERSPROC glGenBuffers;
-PFNGLBINDBUFFERPROC glBindBuffer;
-PFNGLBUFFERDATAPROC glBufferData;
-PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;
-PFNGLCREATESHADERPROC glCreateShader;
-PFNGLCOMPILESHADERPROC glCompileShader;
-PFNGLSHADERSOURCEPROC glShaderSource;
-PFNGLCREATEPROGRAMPROC glCreateProgram;
-PFNGLATTACHSHADERPROC glAttachShader;
-PFNGLLINKPROGRAMPROC glLinkProgram;
-PFNGLUSEPROGRAMPROC glUseProgram;
-PFNGLDELETEPROGRAMPROC glDeleteProgram;
-PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
-PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
-PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
-PFNGLUNIFORMMATRIX4FVPROC glUniformMatrix4fv;
-PFNGLUNIFORM1FPROC glUniform1f;
-PFNGLUNIFORM3FPROC glUniform3f;
-PFNGLDELETESHADERPROC glDeleteShader;
-PFNGLGETSHADERIVPROC glGetShaderiv;
-PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
-PFNGLACTIVETEXTUREPROC glActiveTexture;
-PFNGLUNIFORM2FPROC glUniform2f;
-PFNGLUNIFORM1IPROC glUniform1i;
-PFNGLUNIFORM3IPROC glUniform3i;
-PFNGLUNIFORM4IPROC glUniform4i;
-PFNGLUNIFORM1FVPROC glUniform1fv;
-PFNGLUNIFORM4FVPROC glUniform4fv;
-PFNGLGETPROGRAMIVPROC glGetProgramiv;
-PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;
-PFNGLGETATTRIBLOCATIONPROC glGetAttribLocation;
-PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;
-PFNGLBLENDEQUATIONPROC glBlendEquation;
-PFNGLVERTEXATTRIBDIVISORPROC glVertexAttribDivisor;
-PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
-PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
-PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
-PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
-PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC glDrawElementsInstancedBaseVertexBaseInstance;
-PFNGLDRAWELEMENTSINDIRECTPROC glDrawElementsIndirect;
-PFNGLMULTIDRAWELEMENTSINDIRECTPROC glMultiDrawElementsIndirect;
-PFNGLDELETEBUFFERSPROC glDeleteBuffers;
-PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
-PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
-PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
-PFNGLTEXBUFFERPROC glTexBuffer;
-PFNGLBUFFERSUBDATAPROC glBufferSubData;
-PFNGLMAPBUFFERPROC glMapBuffer;
-PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
-PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;
-PFNGLMEMORYBARRIERPROC glMemoryBarrier;
-PFNGLBUFFERSTORAGEPROC glBufferStorage;
-PFNGLUNMAPBUFFERPROC glUnmapBuffer;
-PFNGLFENCESYNCPROC glFenceSync;
-PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
-PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer;
-PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
-PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers;
-PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers;
-PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
-PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D;
-PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture;
-PFNGLTEXIMAGE3DPROC glTexImage3D;
-PFNGLGENERATEMIPMAPPROC glGenerateMipmap;
-PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus;
-PFNGLTEXIMAGE2DMULTISAMPLEPROC glTexImage2DMultisample;
-PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
-PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
-PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
-PFNGLBLENDCOLORPROC glBlendColor;
-PFNGLCOMPRESSEDTEXIMAGE2DPROC glCompressedTexImage2D;
-PFNGLGETCOMPRESSEDTEXIMAGEPROC glGetCompressedTexImage;
-PFNGLTEXSTORAGE1DPROC glTexStorage1D;
-PFNGLTEXSTORAGE2DPROC glTexStorage2D;
-PFNGLTEXSTORAGE3DPROC glTexStorage3D;
-PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
-PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
-PFNGLGENSAMPLERSPROC glGenSamplers;
-PFNGLDELETESAMPLERSPROC glDeleteSamplers;
-PFNGLBINDSAMPLERPROC glBindSampler;
-PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
-PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
-PFNGLGETSTRINGIPROC glGetStringi;
-PFNGLGETTEXTURESAMPLERHANDLEARBPROC glGetTextureSamplerHandleARB;
-PFNGLMAKETEXTUREHANDLERESIDENTARBPROC glMakeTextureHandleResidentARB;
-PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC glMakeTextureHandleNonResidentARB;
-PFNGLUNIFORMHANDLEUI64ARBPROC glUniformHandleui64ARB;
-PFNGLISTEXTUREHANDLERESIDENTARBPROC glIsTextureHandleResidentARB;
-PFNGLVERTEXATTRIBLPOINTERPROC glVertexAttribLPointer;
-#endif
+
+#include "../../lib/irrlicht/source/Irrlicht/COpenGLTexture.h"
 
 static bool is_gl_init = false;
 
@@ -195,106 +98,7 @@ void initGL()
     if (is_gl_init)
         return;
     is_gl_init = true;
-#ifdef _IRR_WINDOWS_API_
-    glGenTransformFeedbacks = (PFNGLGENTRANSFORMFEEDBACKSPROC)IRR_OGL_LOAD_EXTENSION("glGenTransformFeedbacks");
-    glBindTransformFeedback = (PFNGLBINDTRANSFORMFEEDBACKPROC)IRR_OGL_LOAD_EXTENSION("glBindTransformFeedback");
-    glDrawTransformFeedback = (PFNGLDRAWTRANSFORMFEEDBACKPROC)IRR_OGL_LOAD_EXTENSION("glDrawTransformFeedback");
-    glBeginTransformFeedback = (PFNGLBEGINTRANSFORMFEEDBACKPROC)IRR_OGL_LOAD_EXTENSION("glBeginTransformFeedback");
-    glEndTransformFeedback = (PFNGLENDTRANSFORMFEEDBACKPROC)IRR_OGL_LOAD_EXTENSION("glEndTransformFeedback");
-    glBindBufferBase = (PFNGLBINDBUFFERBASEPROC)IRR_OGL_LOAD_EXTENSION("glBindBufferBase");
-    glGenBuffers = (PFNGLGENBUFFERSPROC)IRR_OGL_LOAD_EXTENSION("glGenBuffers");
-    glBindBuffer = (PFNGLBINDBUFFERPROC)IRR_OGL_LOAD_EXTENSION("glBindBuffer");
-    glBufferData = (PFNGLBUFFERDATAPROC)IRR_OGL_LOAD_EXTENSION("glBufferData");
-    glMapBuffer = (PFNGLMAPBUFFERPROC)IRR_OGL_LOAD_EXTENSION("glMapBuffer");
-    glMapBufferRange = (PFNGLMAPBUFFERRANGEPROC)IRR_OGL_LOAD_EXTENSION("glMapBufferRange");
-    glFlushMappedBufferRange = (PFNGLFLUSHMAPPEDBUFFERRANGEPROC)IRR_OGL_LOAD_EXTENSION("glFlushMappedBufferRange");
-    glMemoryBarrier = (PFNGLMEMORYBARRIERPROC)IRR_OGL_LOAD_EXTENSION("glMemoryBarrier");
-    glBufferStorage = (PFNGLBUFFERSTORAGEPROC)IRR_OGL_LOAD_EXTENSION("glBufferStorage");
-    glUnmapBuffer = (PFNGLUNMAPBUFFERPROC)IRR_OGL_LOAD_EXTENSION("glUnmapBuffer");
-    glFenceSync = (PFNGLFENCESYNCPROC)IRR_OGL_LOAD_EXTENSION("glFenceSync");
-    glClientWaitSync = (PFNGLCLIENTWAITSYNCPROC)IRR_OGL_LOAD_EXTENSION("glClientWaitSync");
-    glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)IRR_OGL_LOAD_EXTENSION("glVertexAttribPointer");
-    glCreateShader = (PFNGLCREATESHADERPROC)IRR_OGL_LOAD_EXTENSION("glCreateShader");
-    glCompileShader = (PFNGLCOMPILESHADERPROC)IRR_OGL_LOAD_EXTENSION("glCompileShader");
-    glShaderSource = (PFNGLSHADERSOURCEPROC)IRR_OGL_LOAD_EXTENSION("glShaderSource");
-    glCreateProgram = (PFNGLCREATEPROGRAMPROC)IRR_OGL_LOAD_EXTENSION("glCreateProgram");
-    glAttachShader = (PFNGLATTACHSHADERPROC)IRR_OGL_LOAD_EXTENSION("glAttachShader");
-    glLinkProgram = (PFNGLLINKPROGRAMPROC)IRR_OGL_LOAD_EXTENSION("glLinkProgram");
-    glUseProgram = (PFNGLUSEPROGRAMPROC)IRR_OGL_LOAD_EXTENSION("glUseProgram");
-    glDeleteProgram = (PFNGLDELETEPROGRAMPROC)IRR_OGL_LOAD_EXTENSION("glDeleteProgram");
-    glEnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC)IRR_OGL_LOAD_EXTENSION("glEnableVertexAttribArray");
-    glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)IRR_OGL_LOAD_EXTENSION("glGetUniformLocation");
-    glUniformMatrix4fv = (PFNGLUNIFORMMATRIX4FVPROC)IRR_OGL_LOAD_EXTENSION("glUniformMatrix4fv");
-    glUniform1f = (PFNGLUNIFORM1FPROC)IRR_OGL_LOAD_EXTENSION("glUniform1f");
-    glUniform3f = (PFNGLUNIFORM3FPROC)IRR_OGL_LOAD_EXTENSION("glUniform3f");
-    glDisableVertexAttribArray = (PFNGLDISABLEVERTEXATTRIBARRAYPROC)IRR_OGL_LOAD_EXTENSION("glDisableVertexAttribArray");
-    glDeleteShader = (PFNGLDELETESHADERPROC)IRR_OGL_LOAD_EXTENSION("glDeleteShader");
-    glGetShaderiv = (PFNGLGETSHADERIVPROC)IRR_OGL_LOAD_EXTENSION("glGetShaderiv");
-    glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)IRR_OGL_LOAD_EXTENSION("glGetShaderInfoLog");
-    glActiveTexture = (PFNGLACTIVETEXTUREPROC)IRR_OGL_LOAD_EXTENSION("glActiveTexture");
-    glUniform2f = (PFNGLUNIFORM2FPROC)IRR_OGL_LOAD_EXTENSION("glUniform2f");
-    glUniform4i = (PFNGLUNIFORM4IPROC)IRR_OGL_LOAD_EXTENSION("glUniform4i");
-    glUniform3i = (PFNGLUNIFORM3IPROC)IRR_OGL_LOAD_EXTENSION("glUniform3i");
-    glUniform1i = (PFNGLUNIFORM1IPROC)IRR_OGL_LOAD_EXTENSION("glUniform1i");
-    glGetProgramiv = (PFNGLGETPROGRAMIVPROC)IRR_OGL_LOAD_EXTENSION("glGetProgramiv");
-    glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)IRR_OGL_LOAD_EXTENSION("glGetProgramInfoLog");
-    glTransformFeedbackVaryings = (PFNGLTRANSFORMFEEDBACKVARYINGSPROC)IRR_OGL_LOAD_EXTENSION("glTransformFeedbackVaryings");
-    glGetAttribLocation = (PFNGLGETATTRIBLOCATIONPROC)IRR_OGL_LOAD_EXTENSION("glGetAttribLocation");
-    glBindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC)IRR_OGL_LOAD_EXTENSION("glBindAttribLocation");
-    glBlendEquation = (PFNGLBLENDEQUATIONPROC)IRR_OGL_LOAD_EXTENSION("glBlendEquation");
-    glVertexAttribDivisor = (PFNGLVERTEXATTRIBDIVISORPROC)IRR_OGL_LOAD_EXTENSION("glVertexAttribDivisor");
-    glDrawArraysInstanced = (PFNGLDRAWARRAYSINSTANCEDPROC)IRR_OGL_LOAD_EXTENSION("glDrawArraysInstanced");
-    glDrawElementsBaseVertex = (PFNGLDRAWELEMENTSBASEVERTEXPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsBaseVertex");
-    glDrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsInstanced");
-    glDrawElementsInstancedBaseVertex = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsInstancedBaseVertex");
-    glDrawElementsInstancedBaseVertexBaseInstance = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsInstancedBaseVertexBaseInstance");
-    glDrawElementsIndirect = (PFNGLDRAWELEMENTSINDIRECTPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsIndirect");
-    glMultiDrawElementsIndirect = (PFNGLMULTIDRAWELEMENTSINDIRECTPROC)IRR_OGL_LOAD_EXTENSION("glMultiDrawElementsIndirect");
-    glDeleteBuffers = (PFNGLDELETEBUFFERSPROC)IRR_OGL_LOAD_EXTENSION("glDeleteBuffers");
-    glGenVertexArrays = (PFNGLGENVERTEXARRAYSPROC)IRR_OGL_LOAD_EXTENSION("glGenVertexArrays");
-    glBindVertexArray = (PFNGLBINDVERTEXARRAYPROC)IRR_OGL_LOAD_EXTENSION("glBindVertexArray");
-    glDeleteVertexArrays = (PFNGLDELETEVERTEXARRAYSPROC)IRR_OGL_LOAD_EXTENSION("glDeleteVertexArrays");
-    glTexBuffer = (PFNGLTEXBUFFERPROC)IRR_OGL_LOAD_EXTENSION("glTexBuffer");
-    glUniform1fv = (PFNGLUNIFORM1FVPROC)IRR_OGL_LOAD_EXTENSION("glUniform1fv");
-    glUniform4fv = (PFNGLUNIFORM4FVPROC)IRR_OGL_LOAD_EXTENSION("glUniform4fv");
-    glBufferSubData = (PFNGLBUFFERSUBDATAPROC)IRR_OGL_LOAD_EXTENSION("glBufferSubData");
-    glVertexAttribIPointer = (PFNGLVERTEXATTRIBIPOINTERPROC)IRR_OGL_LOAD_EXTENSION("glVertexAttribIPointer");
-    glGenFramebuffers = (PFNGLGENFRAMEBUFFERSPROC)IRR_OGL_LOAD_EXTENSION("glGenFramebuffers");
-    glDeleteFramebuffers = (PFNGLDELETEFRAMEBUFFERSPROC)IRR_OGL_LOAD_EXTENSION("glDeleteFramebuffers");
-    glBindFramebuffer = (PFNGLBINDFRAMEBUFFERPROC)IRR_OGL_LOAD_EXTENSION("glBindFramebuffer");
-    glFramebufferTexture2D = (PFNGLFRAMEBUFFERTEXTURE2DPROC)IRR_OGL_LOAD_EXTENSION("glFramebufferTexture2D");
-    glFramebufferTexture = (PFNGLFRAMEBUFFERTEXTUREPROC)IRR_OGL_LOAD_EXTENSION("glFramebufferTexture");
-    glTexImage3D = (PFNGLTEXIMAGE3DPROC)IRR_OGL_LOAD_EXTENSION("glTexImage3D");
-    glGenerateMipmap = (PFNGLGENERATEMIPMAPPROC)IRR_OGL_LOAD_EXTENSION("glGenerateMipmap");
-    glCheckFramebufferStatus = (PFNGLCHECKFRAMEBUFFERSTATUSPROC)IRR_OGL_LOAD_EXTENSION("glCheckFramebufferStatus");
-    glTexImage2DMultisample = (PFNGLTEXIMAGE2DMULTISAMPLEPROC)IRR_OGL_LOAD_EXTENSION("glTexImage2DMultisample");
-    glBlitFramebuffer = (PFNGLBLITFRAMEBUFFERPROC)IRR_OGL_LOAD_EXTENSION("glBlitFramebuffer");
-    glGetUniformBlockIndex = (PFNGLGETUNIFORMBLOCKINDEXPROC)IRR_OGL_LOAD_EXTENSION("glGetUniformBlockIndex");
-    glUniformBlockBinding = (PFNGLUNIFORMBLOCKBINDINGPROC)IRR_OGL_LOAD_EXTENSION("glUniformBlockBinding");
-    glBlendColor = (PFNGLBLENDCOLORPROC)IRR_OGL_LOAD_EXTENSION("glBlendColor");
-    glCompressedTexImage2D = (PFNGLCOMPRESSEDTEXIMAGE2DPROC)IRR_OGL_LOAD_EXTENSION("glCompressedTexImage2D");
-    glGetCompressedTexImage = (PFNGLGETCOMPRESSEDTEXIMAGEPROC)IRR_OGL_LOAD_EXTENSION("glGetCompressedTexImage");
-    glTexStorage1D = (PFNGLTEXSTORAGE1DPROC)IRR_OGL_LOAD_EXTENSION("glTexStorage1D");
-    glTexStorage2D = (PFNGLTEXSTORAGE2DPROC)IRR_OGL_LOAD_EXTENSION("glTexStorage2D");
-    glTexStorage3D = (PFNGLTEXSTORAGE3DPROC)IRR_OGL_LOAD_EXTENSION("glTexStorage3D");
-    glBindImageTexture = (PFNGLBINDIMAGETEXTUREPROC)IRR_OGL_LOAD_EXTENSION("glBindImageTexture");
-    glDispatchCompute = (PFNGLDISPATCHCOMPUTEPROC)IRR_OGL_LOAD_EXTENSION("glDispatchCompute");
-    glGenSamplers = (PFNGLGENSAMPLERSPROC)IRR_OGL_LOAD_EXTENSION("glGenSamplers");
-    glDeleteSamplers = (PFNGLDELETESAMPLERSPROC)IRR_OGL_LOAD_EXTENSION("glDeleteSamplers");
-    glBindSampler = (PFNGLBINDSAMPLERPROC)IRR_OGL_LOAD_EXTENSION("glBindSampler");
-    glSamplerParameterf = (PFNGLSAMPLERPARAMETERFPROC)IRR_OGL_LOAD_EXTENSION("glSamplerParameterf");
-    glSamplerParameteri = (PFNGLSAMPLERPARAMETERIPROC)IRR_OGL_LOAD_EXTENSION("glSamplerParameteri");
-    glGetStringi = (PFNGLGETSTRINGIPROC)IRR_OGL_LOAD_EXTENSION("glGetstringi");
-    glGetTextureSamplerHandleARB = (PFNGLGETTEXTURESAMPLERHANDLEARBPROC)IRR_OGL_LOAD_EXTENSION("glGetTextureSamplerHandleARB");
-    glMakeTextureHandleResidentARB = (PFNGLMAKETEXTUREHANDLERESIDENTARBPROC)IRR_OGL_LOAD_EXTENSION("glMakeTextureHandleResidentARB");
-    glMakeTextureHandleNonResidentARB = (PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC)IRR_OGL_LOAD_EXTENSION("glMakeTextureHandleNonResidentARB");
-    glUniformHandleui64ARB = (PFNGLUNIFORMHANDLEUI64ARBPROC)IRR_OGL_LOAD_EXTENSION("glUniformHandleui64ARB");
-    glIsTextureHandleResidentARB = (PFNGLISTEXTUREHANDLERESIDENTARBPROC)IRR_OGL_LOAD_EXTENSION("glIsTextureHandleResidentARB");
-    glVertexAttribLPointer = (PFNGLVERTEXATTRIBLPOINTERPROC)IRR_OGL_LOAD_EXTENSION("glVertexAttribLPointer");
-#ifdef DEBUG
-    glDebugMessageCallbackARB = (PFNGLDEBUGMESSAGECALLBACKARBPROC)IRR_OGL_LOAD_EXTENSION("glDebugMessageCallbackARB");
-#endif
-#endif
+    glewInit();
 #ifdef ARB_DEBUG_OUTPUT
     if (glDebugMessageCallbackARB)
         glDebugMessageCallbackARB((GLDEBUGPROCARB)debugCallback, NULL);
@@ -930,13 +734,12 @@ ScopedGPUTimer::ScopedGPUTimer(GPUTimer &t) : timer(t)
     if (profiler.isFrozen()) return;
     if (!timer.canSubmitQuery) return;
 #ifdef GL_TIME_ELAPSED
-    irr::video::COpenGLDriver *gl_driver = (irr::video::COpenGLDriver *)irr_driver->getDevice()->getVideoDriver();
     if (!timer.initialised)
     {
-        gl_driver->extGlGenQueries(1, &timer.query);
+        glGenQueries(1, &timer.query);
         timer.initialised = true;
     }
-    gl_driver->extGlBeginQuery(GL_TIME_ELAPSED, timer.query);
+    glBeginQuery(GL_TIME_ELAPSED, timer.query);
 #endif
 }
 ScopedGPUTimer::~ScopedGPUTimer()
@@ -945,8 +748,7 @@ ScopedGPUTimer::~ScopedGPUTimer()
     if (profiler.isFrozen()) return;
     if (!timer.canSubmitQuery) return;
 #ifdef GL_TIME_ELAPSED
-    irr::video::COpenGLDriver *gl_driver = (irr::video::COpenGLDriver *)irr_driver->getDevice()->getVideoDriver();
-    gl_driver->extGlEndQuery(GL_TIME_ELAPSED);
+    glEndQuery(GL_TIME_ELAPSED);
     timer.canSubmitQuery = false;
 #endif
 }
@@ -960,11 +762,10 @@ unsigned GPUTimer::elapsedTimeus()
     if (!initialised)
         return 0;
     GLuint result;
-    irr::video::COpenGLDriver *gl_driver = (irr::video::COpenGLDriver *)irr_driver->getDevice()->getVideoDriver();
-    gl_driver->extGlGetQueryObjectuiv(query, GL_QUERY_RESULT_AVAILABLE, &result);
+    glGetQueryObjectuiv(query, GL_QUERY_RESULT_AVAILABLE, &result);
     if (result == GL_FALSE)
         return lastResult;
-    gl_driver->extGlGetQueryObjectuiv(query, GL_QUERY_RESULT, &result);
+    glGetQueryObjectuiv(query, GL_QUERY_RESULT, &result);
     lastResult = result / 1000;
     canSubmitQuery = true;
     return result / 1000;
@@ -1023,7 +824,7 @@ void FrameBuffer::Bind()
     glViewport(0, 0, width, height);
     irr::video::COpenGLDriver *gl_driver = (irr::video::COpenGLDriver*)irr_driver->getDevice()->getVideoDriver();
     GLenum bufs[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2 };
-    gl_driver->extGlDrawBuffers(RenderTargets.size(), bufs);
+    glDrawBuffers(RenderTargets.size(), bufs);
 }
 
 void FrameBuffer::Blit(const FrameBuffer &Src, FrameBuffer &Dst, GLbitfield mask, GLenum filter)
diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index 75133a7da..cd4da2a20 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -7,10 +7,6 @@
 #include "irr_driver.hpp"
 #include "utils/log.hpp"
 
-// already includes glext.h, which defines useful GL constants.
-// COpenGLDriver has already loaded the extension GL functions we use (e.g glBeginQuery)
-#include "../../lib/irrlicht/source/Irrlicht/COpenGLDriver.h"
-
 
 void initGL();
 GLuint LoadTFBProgram(const char * vertex_file_path, const char **varyings, unsigned varyingscount);
diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index 6108aa0a7..2c7656863 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -6,6 +6,7 @@
 #include <IParticleSystemSceneNode.h>
 #include "guiengine/engine.hpp"
 #include "graphics/particle_emitter.hpp"
+#include "../../lib/irrlicht/source/Irrlicht/os.h"
 #define COMPONENTCOUNT 8
 
 scene::IParticleSystemSceneNode *ParticleSystemProxy::addParticleNode(
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 16ff20163..4a5c601a7 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -490,6 +490,7 @@ void IrrDriver::initDevice()
             m_need_srgb_workaround = true;
     }
     m_glsl = (GLMajorVersion > 3 || (GLMajorVersion == 3 && GLMinorVersion >= 1));
+    initGL();
 
     // Parse extensions
     hasVSLayer = false;
@@ -499,28 +500,22 @@ void IrrDriver::initDevice()
     // Default false value for hasVSLayer if --no-graphics argument is used
     if (!ProfileWorld::isNoGraphics())
     {
-        if (hasGLExtension("GL_AMD_vertex_shader_layer")) {
+        if (GLEW_AMD_vertex_shader_layer) {
             hasVSLayer = true;
             Log::info("GLDriver", "AMD Vertex Shader Layer enabled");
         }
-#ifdef Buffer_Storage
-        if (hasGLExtension("GL_ARB_buffer_storage")) {
+        if (GLEW_ARB_buffer_storage) {
             hasBuffserStorage = true;
             Log::info("GLDriver", "ARB Buffer Storage enabled");
         }
-#endif
-#ifdef Base_Instance_Support
-        if (hasGLExtension("GL_ARB_base_instance")) {
+        if (GLEW_ARB_base_instance) {
             hasBaseInstance = true;
-            Log::info("GLDriver", "ARB Instance enabled");
+            Log::info("GLDriver", "ARB Base Instance enabled");
         }
-#endif
-#ifdef Draw_Indirect
-        if (hasGLExtension("GL_ARB_draw_indirect")) {
+        if (GLEW_ARB_draw_indirect) {
             hasDrawIndirect = true;
             Log::info("GLDriver", "ARB Draw Indirect enabled");
         }
-#endif
     }
 
 
@@ -548,8 +543,7 @@ void IrrDriver::initDevice()
         m_mrt.clear();
         m_mrt.reallocate(2);
 
-        irr::video::COpenGLDriver*    gl_driver = (irr::video::COpenGLDriver*)m_device->getVideoDriver();
-        gl_driver->extGlGenQueries(1, &m_lensflare_query);
+        glGenQueries(1, &m_lensflare_query);
         m_query_issued = false;
 
         scene::IMesh * const sphere = m_scene_manager->getGeometryCreator()->createSphereMesh(1, 16, 16);
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 0850e6f40..336302a8a 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -494,29 +494,25 @@ void IrrDriver::computeSunVisibility()
         hasgodrays = World::getWorld()->getTrack()->hasGodRays();
     }
 
-    irr::video::COpenGLDriver*    gl_driver = (irr::video::COpenGLDriver*)m_device->getVideoDriver();
-    if (UserConfigParams::m_light_shaft && hasgodrays)//hasflare || hasgodrays)
+    if (UserConfigParams::m_light_shaft && hasgodrays)
     {
         GLuint res = 0;
         if (m_query_issued)
-            gl_driver->extGlGetQueryObjectuiv(m_lensflare_query, GL_QUERY_RESULT, &res);
+            glGetQueryObjectuiv(m_lensflare_query, GL_QUERY_RESULT, &res);
         m_post_processing->setSunPixels(res);
 
         // Prepare the query for the next frame.
         glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-        gl_driver->extGlBeginQuery(GL_SAMPLES_PASSED_ARB, m_lensflare_query);
+        glBeginQuery(GL_SAMPLES_PASSED_ARB, m_lensflare_query);
         m_scene_manager->setCurrentRendertime(scene::ESNRP_SOLID);
         m_scene_manager->drawAll(scene::ESNRP_CAMERA);
         irr_driver->setPhase(GLOW_PASS);
         m_sun_interposer->render();
-        gl_driver->extGlEndQuery(GL_SAMPLES_PASSED_ARB);
+        glEndQuery(GL_SAMPLES_PASSED_ARB);
         m_query_issued = true;
 
         m_lensflare->setStrength(res / 4000.0f);
 
-        if (hasflare)
-            m_lensflare->OnRegisterSceneNode();
-
         // Make sure the color mask is reset
         glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
     }
diff --git a/src/physics/irr_debug_drawer.hpp b/src/physics/irr_debug_drawer.hpp
index b384f12bd..6dc54d4ed 100644
--- a/src/physics/irr_debug_drawer.hpp
+++ b/src/physics/irr_debug_drawer.hpp
@@ -20,8 +20,8 @@
 #define HEADER_IRR_DEBUG_DRAWER_HPP
 
 #include "btBulletDynamicsCommon.h"
-#include "graphics/glwrap.hpp"
 
+#include <SColor.h>
 #include "utils/vec3.hpp"
 #include <map>
 #include <vector>

From d741204ee06733222ca56d65d6dcf6ac4fd9a3aa Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Fri, 5 Sep 2014 18:28:41 +0200
Subject: [PATCH 220/248] Compute shader support detected at runtime.

---
 src/graphics/irr_driver.cpp      |  5 +++++
 src/graphics/irr_driver.hpp      |  6 ++++++
 src/graphics/post_processing.cpp | 12 ++----------
 src/graphics/shaders.cpp         |  9 +++------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 4a5c601a7..db8b4ad04 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -497,6 +497,7 @@ void IrrDriver::initDevice()
     hasBaseInstance = false;
     hasBuffserStorage = false;
     hasDrawIndirect = false;
+    hasComputeShaders = false;
     // Default false value for hasVSLayer if --no-graphics argument is used
     if (!ProfileWorld::isNoGraphics())
     {
@@ -516,6 +517,10 @@ void IrrDriver::initDevice()
             hasDrawIndirect = true;
             Log::info("GLDriver", "ARB Draw Indirect enabled");
         }
+        if (GLEW_ARB_compute_shader) {
+            hasComputeShaders = true;
+            Log::info("GLDriver", "ARB Compute Shader enabled");
+        }
     }
 
 
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 8a233227f..1539227cf 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -203,6 +203,7 @@ private:
     bool hasBaseInstance;
     bool hasDrawIndirect;
     bool hasBuffserStorage;
+    bool hasComputeShaders;
     bool m_need_ubo_workaround;
     bool m_need_rh_workaround;
     bool m_need_srgb_workaround;
@@ -324,6 +325,11 @@ public:
         return hasBuffserStorage;
     }
 
+    bool hasARBComputeShaders() const
+    {
+        return hasComputeShaders;
+    }
+
     video::SColorf getAmbientLight() const;
 
     struct GlowData {
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index fc0e99044..0075fa354 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -337,15 +337,12 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
     assert(in_fbo.getWidth() == auxiliary.getWidth() && in_fbo.getHeight() == auxiliary.getHeight());
     float inv_width = 1.0f / in_fbo.getWidth(), inv_height = 1.0f / in_fbo.getHeight();
     {
-#if WIN32
-        if (irr_driver->getGLSLVersion() < 430)
-#endif
+        if (irr_driver->hasARBComputeShaders())
         {
             auxiliary.Bind();
             FullScreenShader::Gaussian17TapHShader::getInstance()->SetTextureUnits(createVector<GLuint>(in_fbo.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]));
             DrawFullScreenEffect<FullScreenShader::Gaussian17TapHShader>(core::vector2df(inv_width, inv_height));
         }
-#if WIN32
         else
         {
 
@@ -356,19 +353,15 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
             FullScreenShader::ComputeGaussian17TapHShader::getInstance()->setUniforms();
             glDispatchCompute(in_fbo.getWidth() / 8, in_fbo.getHeight() / 8, 1);
         }
-#endif
     }
     {
-#if WIN32
-        if (irr_driver->getGLSLVersion() < 430)
-#endif
+        if (irr_driver->hasARBComputeShaders())
         {
             in_fbo.Bind();
 
             FullScreenShader::Gaussian17TapVShader::getInstance()->SetTextureUnits(createVector<GLuint>(auxiliary.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]));
             DrawFullScreenEffect<FullScreenShader::Gaussian17TapVShader>(core::vector2df(inv_width, inv_height));
         }
-#if WIN32
         else
         {
             glUseProgram(FullScreenShader::ComputeGaussian17TapVShader::getInstance()->Program);
@@ -378,7 +371,6 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
             FullScreenShader::ComputeGaussian17TapVShader::getInstance()->setUniforms();
             glDispatchCompute(in_fbo.getWidth() / 8, in_fbo.getHeight() / 8, 1);
         }
-#endif
     }
 }
 
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index d95ccdf4f..2fe6a267e 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1727,8 +1727,8 @@ namespace FullScreenShader
 
     ComputeGaussian17TapHShader::ComputeGaussian17TapHShader()
     {
-#if WIN32
-        if (irr_driver->getGLSLVersion() < 420)
+
+        if (irr_driver->hasARBComputeShaders())
             return;
         Program = LoadProgram(
             GL_COMPUTE_SHADER, file_manager->getAsset("shaders/bilateralH.comp").c_str());
@@ -1737,7 +1737,6 @@ namespace FullScreenShader
         TU_dest = 2;
         AssignUniforms();
         AssignTextureUnit(Program, TexUnit(TU_source, "source"), TexUnit(TU_depth, "depth"), TexUnit(TU_dest, "dest"));
-#endif
     }
 
     Gaussian6HBlurShader::Gaussian6HBlurShader()
@@ -1772,8 +1771,7 @@ namespace FullScreenShader
 
     ComputeGaussian17TapVShader::ComputeGaussian17TapVShader()
     {
-#if WIN32
-        if (irr_driver->getGLSLVersion() < 420)
+        if (irr_driver->hasARBComputeShaders())
             return;
         Program = LoadProgram(
             GL_COMPUTE_SHADER, file_manager->getAsset("shaders/bilateralV.comp").c_str());
@@ -1781,7 +1779,6 @@ namespace FullScreenShader
         TU_depth = 1;
         TU_dest = 2;
         AssignTextureUnit(Program, TexUnit(TU_source, "source"), TexUnit(TU_depth, "depth"), TexUnit(TU_dest, "dest"));
-#endif
     }
 
     Gaussian6VBlurShader::Gaussian6VBlurShader()

From 781288bf80873126356f6e2a13b9db2a108b5e23 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Fri, 5 Sep 2014 18:33:05 +0200
Subject: [PATCH 221/248] Texture storage support detected at runtime.

---
 src/graphics/irr_driver.cpp | 5 +++++
 src/graphics/irr_driver.hpp | 6 ++++++
 src/graphics/rtts.cpp       | 8 ++------
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index db8b4ad04..493dff0ed 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -498,6 +498,7 @@ void IrrDriver::initDevice()
     hasBuffserStorage = false;
     hasDrawIndirect = false;
     hasComputeShaders = false;
+    hasTextureStorage = false;
     // Default false value for hasVSLayer if --no-graphics argument is used
     if (!ProfileWorld::isNoGraphics())
     {
@@ -521,6 +522,10 @@ void IrrDriver::initDevice()
             hasComputeShaders = true;
             Log::info("GLDriver", "ARB Compute Shader enabled");
         }
+        if (GLEW_ARB_texture_storage) {
+            hasTextureStorage = true;
+            Log::info("GLDriver", "ARB Texture Storage enabled");
+        }
     }
 
 
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 1539227cf..f324b1dcd 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -204,6 +204,7 @@ private:
     bool hasDrawIndirect;
     bool hasBuffserStorage;
     bool hasComputeShaders;
+    bool hasTextureStorage;
     bool m_need_ubo_workaround;
     bool m_need_rh_workaround;
     bool m_need_srgb_workaround;
@@ -330,6 +331,11 @@ public:
         return hasComputeShaders;
     }
 
+    bool hasARBTextureStorage() const
+    {
+        return hasTextureStorage;
+    }
+
     video::SColorf getAmbientLight() const;
 
     struct GlowData {
diff --git a/src/graphics/rtts.cpp b/src/graphics/rtts.cpp
index 3cd98bf5a..c37c097fb 100644
--- a/src/graphics/rtts.cpp
+++ b/src/graphics/rtts.cpp
@@ -29,11 +29,9 @@ static GLuint generateRTT3D(GLenum target, size_t w, size_t h, size_t d, GLint i
     GLuint result;
     glGenTextures(1, &result);
     glBindTexture(target, result);
-#if WIN32
-    if (irr_driver->getGLSLVersion() >= 420)
+    if (irr_driver->hasARBTextureStorage())
         glTexStorage3D(target, 1, internalFormat, w, h, d);
     else
-#endif
         glTexImage3D(target, 0, internalFormat, w, h, d, 0, format, type, 0);
     return result;
 }
@@ -43,11 +41,9 @@ static GLuint generateRTT(const core::dimension2du &res, GLint internalFormat, G
     GLuint result;
     glGenTextures(1, &result);
     glBindTexture(GL_TEXTURE_2D, result);
-#if WIN32
-    if (irr_driver->getGLSLVersion() >= 420)
+    if (irr_driver->hasARBTextureStorage())
         glTexStorage2D(GL_TEXTURE_2D, mipmaplevel, internalFormat, res.Width, res.Height);
     else
-#endif
         glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, res.Width, res.Height, 0, format, type, 0);
     return result;
 }

From 93dca486cfb1c1deb3d4c809f979c585a9442611 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 5 Sep 2014 21:59:00 +0200
Subject: [PATCH 222/248] Use bilinear filtering for some textures of displace
 effect

---
 src/graphics/shaders.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 96d686b16..b5c5adbe5 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -706,7 +706,7 @@ public:
     DisplaceMaskShader();
 };
 
-class DisplaceShader : public ShaderHelperSingleton<DisplaceShader, core::matrix4, core::vector2df, core::vector2df>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class DisplaceShader : public ShaderHelperSingleton<DisplaceShader, core::matrix4, core::vector2df, core::vector2df>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     DisplaceShader();

From 1e172dbf337cde80117abefce3dc771f92de5960 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 5 Sep 2014 22:08:35 +0200
Subject: [PATCH 223/248] Fix glowobject frag shader

---
 data/shaders/glow_object.frag | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/shaders/glow_object.frag b/data/shaders/glow_object.frag
index ca2f881dc..a811b40f8 100644
--- a/data/shaders/glow_object.frag
+++ b/data/shaders/glow_object.frag
@@ -1,6 +1,6 @@
-in vec4 glowColor;
+flat in vec4 glowColor;
 
-flat out vec4 FragColor;
+out vec4 FragColor;
 
 void main()
 {

From e5f8b399000701333e7601d85cd2ad99faf2210f Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 5 Sep 2014 23:21:53 +0200
Subject: [PATCH 224/248] Visualise how long pipeline stalls.

---
 src/graphics/stkscenemanager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 5b88bf04a..9c331a055 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -444,7 +444,9 @@ void IrrDriver::PrepareDrawCalls(scene::ICameraSceneNode *camnode)
     // Add a 20 ms timeout
     if (!m_sync)
         m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+    PROFILER_PUSH_CPU_MARKER("- Sync Stall", 0xFF, 0x0, 0x0);
     GLenum reason = glClientWaitSync(m_sync, GL_SYNC_FLUSH_COMMANDS_BIT, 1000000000);
+    PROFILER_POP_CPU_MARKER();
     /*    switch (reason)
     {
     case GL_ALREADY_SIGNALED:

From 94cd8d5c51d824e7a723a187c38771a8da05b4c0 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 5 Sep 2014 23:41:12 +0200
Subject: [PATCH 225/248] Avoid some useless computation in some vert shaders

---
 data/shaders/header.txt                 |  2 ++
 data/shaders/instanced_grass.vert       |  2 +-
 data/shaders/instanced_object_pass.vert |  2 +-
 data/shaders/utils/getworldmatrix.vert  |  2 +-
 src/graphics/render.cpp                 | 11 ++++++-----
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/data/shaders/header.txt b/data/shaders/header.txt
index ec5c45115..98e73f6a9 100644
--- a/data/shaders/header.txt
+++ b/data/shaders/header.txt
@@ -3,6 +3,7 @@ uniform mat4 ViewMatrix;
 uniform mat4 ProjectionMatrix;
 uniform mat4 InverseViewMatrix;
 uniform mat4 InverseProjectionMatrix;
+uniform mat4 ProjectionViewMatrix;
 uniform vec2 screen;
 #else
 layout (std140) uniform MatrixesData
@@ -11,6 +12,7 @@ layout (std140) uniform MatrixesData
     mat4 ProjectionMatrix;
     mat4 InverseViewMatrix;
     mat4 InverseProjectionMatrix;
+    mat4 ProjectionViewMatrix;
     mat4 ShadowViewProjMatrixes[4];
     vec2 screen;
 };
diff --git a/data/shaders/instanced_grass.vert b/data/shaders/instanced_grass.vert
index b65a08d1f..5a9d11769 100644
--- a/data/shaders/instanced_grass.vert
+++ b/data/shaders/instanced_grass.vert
@@ -37,7 +37,7 @@ void main()
 {
     mat4 ModelMatrix = getWorldMatrix(Origin + windDir * Color.r, Orientation, Scale);
     mat4 TransposeInverseModelView = transpose(getInverseWorldMatrix(Origin + windDir * Color.r, Orientation, Scale) * InverseViewMatrix);
-    gl_Position = ProjectionMatrix * ViewMatrix *  ModelMatrix * vec4(Position, 1.);
+    gl_Position = ProjectionViewMatrix *  ModelMatrix * vec4(Position, 1.);
     nor = (TransposeInverseModelView * vec4(Normal, 0.)).xyz;
     uv = Texcoord;
 #ifdef GL_ARB_bindless_texture
diff --git a/data/shaders/instanced_object_pass.vert b/data/shaders/instanced_object_pass.vert
index eb8a9e018..ab0fce5b2 100644
--- a/data/shaders/instanced_object_pass.vert
+++ b/data/shaders/instanced_object_pass.vert
@@ -44,7 +44,7 @@ void main(void)
 {
     mat4 ModelMatrix = getWorldMatrix(Origin, Orientation, Scale);
     mat4 TransposeInverseModelView = transpose(getInverseWorldMatrix(Origin, Orientation, Scale) * InverseViewMatrix);
-    gl_Position = ProjectionMatrix * ViewMatrix *  ModelMatrix * vec4(Position, 1.);
+    gl_Position = ProjectionViewMatrix *  ModelMatrix * vec4(Position, 1.);
     nor = (TransposeInverseModelView * vec4(Normal, 0.)).xyz;
     tangent = (TransposeInverseModelView * vec4(Tangent, 1.)).xyz;
     bitangent = (TransposeInverseModelView * vec4(Bitangent, 1.)).xyz;
diff --git a/data/shaders/utils/getworldmatrix.vert b/data/shaders/utils/getworldmatrix.vert
index 3bff563f4..c5883ae35 100644
--- a/data/shaders/utils/getworldmatrix.vert
+++ b/data/shaders/utils/getworldmatrix.vert
@@ -45,6 +45,6 @@ mat4 getInverseWorldMatrix(vec3 translation, vec3 rotation, vec3 scale)
 {
     mat4 result = transpose(getMatrixFromRotation(rotation));
     // FIXME: it's wrong but the fourth column is not used
-    result[3].xyz -= translation;
+    // result[3].xyz -= translation;
     return getScaleMatrix(1. / scale) * result;
 }
\ No newline at end of file
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 336302a8a..ee510d776 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -597,11 +597,12 @@ void IrrDriver::computeCameraMatrix(scene::ICameraSceneNode * const camnode, siz
     };
 
 
-    float tmp[16 * 8 + 2];
+    float tmp[16 * 9 + 2];
     memcpy(tmp, irr_driver->getViewMatrix().pointer(), 16 * sizeof(float));
     memcpy(&tmp[16], irr_driver->getProjMatrix().pointer(), 16 * sizeof(float));
     memcpy(&tmp[32], irr_driver->getInvViewMatrix().pointer(), 16 * sizeof(float));
     memcpy(&tmp[48], irr_driver->getInvProjMatrix().pointer(), 16 * sizeof(float));
+    memcpy(&tmp[64], irr_driver->getProjViewMatrix().pointer(), 16 * sizeof(float));
 
     const core::matrix4 &SunCamViewMatrix = m_suncam->getViewMatrix();
     for (unsigned i = 0; i < 4; i++)
@@ -723,13 +724,13 @@ void IrrDriver::computeCameraMatrix(scene::ICameraSceneNode * const camnode, siz
 
         size_t size = irr_driver->getShadowViewProj().size();
         for (unsigned i = 0; i < size; i++)
-            memcpy(&tmp[16 * i + 64], irr_driver->getShadowViewProj()[i].pointer(), 16 * sizeof(float));
+            memcpy(&tmp[16 * i + 80], irr_driver->getShadowViewProj()[i].pointer(), 16 * sizeof(float));
     }
 
-    tmp[128] = float(width);
-    tmp[129] = float(height);
+    tmp[144] = float(width);
+    tmp[145] = float(height);
     glBindBuffer(GL_UNIFORM_BUFFER, SharedObject::ViewProjectionMatrixesUBO);
-    glBufferSubData(GL_UNIFORM_BUFFER, 0, (16 * 8 + 2) * sizeof(float), tmp);
+    glBufferSubData(GL_UNIFORM_BUFFER, 0, (16 * 9 + 2) * sizeof(float), tmp);
 }
 
 

From ee8c6daec2b4c3dd6bafedd94265d0cae78ce830 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 5 Sep 2014 23:51:33 +0200
Subject: [PATCH 226/248] Forget a file in previous commit

---
 src/graphics/shaders.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 2fe6a267e..0b1391a8e 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -291,7 +291,7 @@ static void initShadowVPMUBO()
 {
     glGenBuffers(1, &SharedObject::ViewProjectionMatrixesUBO);
     glBindBuffer(GL_UNIFORM_BUFFER, SharedObject::ViewProjectionMatrixesUBO);
-    glBufferData(GL_UNIFORM_BUFFER, (16 * 8 + 2) * sizeof(float), 0, GL_STREAM_DRAW);
+    glBufferData(GL_UNIFORM_BUFFER, (16 * 9 + 2) * sizeof(float), 0, GL_STREAM_DRAW);
     glBindBuffer(GL_UNIFORM_BUFFER, 0);
 }
 

From d6c265daf6d6316b5a1ff1c34c3eb2c7449739dd Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 5 Sep 2014 23:51:43 +0200
Subject: [PATCH 227/248] Fix VS warning

---
 lib/irrlicht/include/matrix4.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/irrlicht/include/matrix4.h b/lib/irrlicht/include/matrix4.h
index 13f729c1e..5b3076a02 100644
--- a/lib/irrlicht/include/matrix4.h
+++ b/lib/irrlicht/include/matrix4.h
@@ -1329,9 +1329,9 @@ namespace core
         float *dst = (float*)out.pointer();
         // from http://www.intel.com/design/pentiumiii/sml/245043.htm
         {
-            __m128 minor0, minor1, minor2, minor3;
-            __m128 row0, row1, row2, row3;
-            __m128 det, tmp1;
+            __m128 minor0 = {}, minor1 = {}, minor2 = {}, minor3 = {};
+            __m128 row0 = {}, row1 = {}, row2 = {}, row3 = {};
+            __m128 det = {}, tmp1 = {};
             tmp1 = _mm_loadh_pi(_mm_loadl_pi(tmp1, (__m64*)(src)), (__m64*)(src + 4));
             row1 = _mm_loadh_pi(_mm_loadl_pi(row1, (__m64*)(src + 8)), (__m64*)(src + 12));
             row0 = _mm_shuffle_ps(tmp1, row1, 0x88);

From 56459f39ab576eae667a208de25246dfa122b250 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Fri, 5 Sep 2014 17:30:24 +0200
Subject: [PATCH 228/248] Use a matrix multiplication

---
 lib/irrlicht/include/matrix4.h | 53 ++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/lib/irrlicht/include/matrix4.h b/lib/irrlicht/include/matrix4.h
index 5b3076a02..1d07713e1 100644
--- a/lib/irrlicht/include/matrix4.h
+++ b/lib/irrlicht/include/matrix4.h
@@ -661,6 +661,58 @@ namespace core
 		const T *m1 = other_a.M;
 		const T *m2 = other_b.M;
 
+#if defined(WIN32) && (defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86))
+        // From http://drrobsjournal.blogspot.fr/2012/10/fast-simd-4x4-matrix-multiplication.html
+        // Use unaligned load/store
+
+        const float *matA = other_a.pointer();
+
+        const __m128 a = _mm_loadu_ps(matA); // First row
+        const __m128 b = _mm_loadu_ps(&matA[4]); // Second row
+        const __m128 c = _mm_loadu_ps(&matA[8]); // Third row
+        const __m128 d = _mm_loadu_ps(&matA[12]); // Fourth row
+
+         __m128 t1 = _mm_set1_ps(m2[0]);
+         __m128 t2 = _mm_mul_ps(a, t1);
+        t1 = _mm_set1_ps(m2[1]);
+        t2 = _mm_add_ps(_mm_mul_ps(b, t1), t2);
+        t1 = _mm_set1_ps(m2[2]);
+        t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
+        t1 = _mm_set1_ps(m2[3]);
+        t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
+        _mm_storeu_ps(&M[0], t2);
+
+        t1 = _mm_set1_ps(m2[4]);
+        t2 = _mm_mul_ps(a, t1);
+        t1 = _mm_set1_ps(m2[5]);
+        t2 = _mm_add_ps(_mm_mul_ps(b, t1), t2);
+        t1 = _mm_set1_ps(m2[6]);
+        t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
+        t1 = _mm_set1_ps(m2[7]);
+        t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
+        _mm_storeu_ps(&M[4], t2);
+
+        t1 = _mm_set1_ps(m2[8]);
+        t2 = _mm_mul_ps(a, t1);
+        t1 = _mm_set1_ps(m2[9]);
+        t2 = _mm_add_ps(_mm_mul_ps(b, t1), t2);
+        t1 = _mm_set1_ps(m2[10]);
+        t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
+        t1 = _mm_set1_ps(m2[11]);
+        t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
+        _mm_storeu_ps(&M[8], t2);
+
+        t1 = _mm_set1_ps(m2[12]);
+        t2 = _mm_mul_ps(a, t1);
+        t1 = _mm_set1_ps(m2[13]);
+        t2 = _mm_add_ps(_mm_mul_ps(b, t1), t2);
+        t1 = _mm_set1_ps(m2[14]);
+        t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
+        t1 = _mm_set1_ps(m2[15]);
+        t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
+        _mm_storeu_ps(&M[12], t2);
+#else
+
 		M[0] = m1[0]*m2[0] + m1[4]*m2[1] + m1[8]*m2[2] + m1[12]*m2[3];
 		M[1] = m1[1]*m2[0] + m1[5]*m2[1] + m1[9]*m2[2] + m1[13]*m2[3];
 		M[2] = m1[2]*m2[0] + m1[6]*m2[1] + m1[10]*m2[2] + m1[14]*m2[3];
@@ -682,6 +734,7 @@ namespace core
 		M[15] = m1[3]*m2[12] + m1[7]*m2[13] + m1[11]*m2[14] + m1[15]*m2[15];
 #if defined ( USE_MATRIX_TEST )
 		definitelyIdentityMatrix=false;
+#endif
 #endif
 		return *this;
 	}

From 6348537eb967f3fcc5a18d7cfd26a190016821fb Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 5 Sep 2014 23:59:27 +0200
Subject: [PATCH 229/248] Fix another warning

---
 src/graphics/lod_node.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/lod_node.cpp b/src/graphics/lod_node.cpp
index 27f1f3e97..0f28a36a6 100644
--- a/src/graphics/lod_node.cpp
+++ b/src/graphics/lod_node.cpp
@@ -143,7 +143,7 @@ void LODNode::updateVisibility(bool* shown)
     if (m_nodes.size() == 0) return;
 
     int level = getLevel();
-    for (int i = 0; i < m_nodes.size(); i++)
+    for (size_t i = 0; i < m_nodes.size(); i++)
     {
         m_nodes[i]->setVisible(i == level);
         if (i == level && shown != NULL)

From e0e90f81f443f0ef319b079925409fd3049ca71a Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sat, 6 Sep 2014 00:02:48 +0200
Subject: [PATCH 230/248] And another one

---
 src/graphics/lod_node.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/lod_node.cpp b/src/graphics/lod_node.cpp
index 0f28a36a6..6a4e0ddf7 100644
--- a/src/graphics/lod_node.cpp
+++ b/src/graphics/lod_node.cpp
@@ -147,7 +147,7 @@ void LODNode::updateVisibility(bool* shown)
     {
         m_nodes[i]->setVisible(i == level);
         if (i == level && shown != NULL)
-            *shown = level;
+            *shown = (i > 0);
     }
 }
 

From d625bb23ccb588c06adc0d987c740ffb2e765543 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Sat, 6 Sep 2014 14:52:08 +0200
Subject: [PATCH 231/248] Postpone update of nodes

---
 src/graphics/stkscenemanager.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 9c331a055..e0cfbf118 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -124,6 +124,7 @@ static std::unordered_map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *,
 static std::unordered_map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > MeshForShadowPass[4][MAT_COUNT];
 static std::unordered_map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > MeshForRSMPass[MAT_COUNT];
 static std::unordered_map <scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, STKMeshCommon *> > > MeshForGlowPass;
+static std::vector <STKMeshCommon *> DeferredUpdate;
 
 static core::vector3df windDir;
 
@@ -133,7 +134,7 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
     STKMeshCommon *node = dynamic_cast<STKMeshCommon*>(Node);
     if (!node)
         return;
-    node->update();
+    DeferredUpdate.push_back(node);
 
     if (node->isImmediateDraw())
     {
@@ -437,11 +438,11 @@ void IrrDriver::PrepareDrawCalls(scene::ICameraSceneNode *camnode)
             MeshForShadowPass[cascade][Mat].clear();
     }
     MeshForGlowPass.clear();
+    DeferredUpdate.clear();
     core::list<scene::ISceneNode*> List = m_scene_manager->getRootSceneNode()->getChildren();
 
-    bool isCulled[4] = {};
-
-    // Add a 20 ms timeout
+    parseSceneManager(List, ImmediateDrawList::getInstance(), camnode, m_shadow_camnodes, m_suncam);
+    // Add a 1 s timeout
     if (!m_sync)
         m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
     PROFILER_PUSH_CPU_MARKER("- Sync Stall", 0xFF, 0x0, 0x0);
@@ -462,7 +463,9 @@ void IrrDriver::PrepareDrawCalls(scene::ICameraSceneNode *camnode)
     printf("Wait Failed\n");
     break;
     }*/
-    parseSceneManager(List, ImmediateDrawList::getInstance(), camnode, m_shadow_camnodes, m_suncam);
+    for (unsigned i = 0; i < DeferredUpdate.size(); i++)
+        DeferredUpdate[i]->update();
+
     if (!irr_driver->hasARB_draw_indirect())
         return;
 

From 4f60c1b7531ca3ba1af77e337b07846a28d1e78f Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Sat, 6 Sep 2014 15:03:24 +0200
Subject: [PATCH 232/248] Factorize culling code.

---
 src/graphics/stkscenemanager.cpp | 52 ++++++++++++++++++++++++++++----
 1 file changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index e0cfbf118..39663484b 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -16,6 +16,7 @@
 #include "lod_node.hpp"
 #include "utils/profiler.hpp"
 #include <unordered_map>
+#include <SViewFrustum.h>
 
 static void
 FillInstances_impl(std::vector<std::pair<GLMesh *, scene::ISceneNode *> > InstanceList, InstanceData * InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer,
@@ -128,6 +129,48 @@ static std::vector <STKMeshCommon *> DeferredUpdate;
 
 static core::vector3df windDir;
 
+// From irrlicht code
+static
+bool isBoxInFrontOfPlane(const core::plane3df &plane, const core::vector3df edges[8])
+{
+    for (u32 j = 0; j<8; ++j)
+        if (plane.classifyPointRelation(edges[j]) != core::ISREL3D_FRONT)
+            return true;
+    return false;
+}
+
+static
+bool isCulled(const scene::ICameraSceneNode *cam, const scene::ISceneNode *node)
+{
+    // can be seen by a bounding box ?
+    if (node->getAutomaticCulling() & scene::EAC_BOX)
+    {
+        core::aabbox3d<f32> tbox = node->getBoundingBox();
+        node->getAbsoluteTransformation().transformBoxEx(tbox);
+        return !(tbox.intersectsWithBox(cam->getViewFrustum()->getBoundingBox()));
+    }
+
+    // can be seen by cam pyramid planes ?
+    if (node->getAutomaticCulling() & scene::EAC_FRUSTUM_BOX)
+    {
+        scene::SViewFrustum frust = *cam->getViewFrustum();
+
+        //transform the frustum to the node's current absolute transformation
+        core::matrix4 invTrans(node->getAbsoluteTransformation(), core::matrix4::EM4CONST_INVERSE);
+        //invTrans.makeInverse();
+        frust.transform(invTrans);
+
+        core::vector3df edges[8];
+        node->getBoundingBox().getEdges(edges);
+
+        for (s32 i = 0; i < scene::SViewFrustum::VF_PLANE_COUNT; ++i)
+            if (isBoxInFrontOfPlane(frust.planes[i], edges))
+                return true;
+        return false;
+    }
+    return false;
+}
+
 static void
 handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *ImmediateDraw, bool IsCulledForSolid, bool IsCulledForShadow[4], bool IsCulledForRSM)
 {
@@ -359,16 +402,13 @@ parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::IScene
             continue;
         (*I)->updateAbsolutePosition();
 
-        core::aabbox3d<f32> tbox = (*I)->getBoundingBox();
-        (*I)->getAbsoluteTransformation().transformBoxEx(tbox);
-
-        bool IsCulledForSolid = !(tbox.intersectsWithBox(cam->getViewFrustum()->getBoundingBox()));
+        bool IsCulledForSolid = isCulled(cam, *I);
 
         bool IsCulledForShadow[4];
         for (unsigned i = 0; i < 4; ++i)
-            IsCulledForShadow[i] = !(tbox.intersectsWithBox(shadowCams[i]->getViewFrustum()->getBoundingBox()));
+            IsCulledForShadow[i] = isCulled(shadowCams[i], *I);
 
-        bool IsCulledForRSM = !(tbox.intersectsWithBox(RSM_cam->getViewFrustum()->getBoundingBox()));
+        bool IsCulledForRSM = isCulled(RSM_cam, *I);
 
         if (!IsCulledForSolid)
         {

From 163a3ae7cd57e7e77cafbc397df38db5ff8892c7 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Sat, 6 Sep 2014 15:07:28 +0200
Subject: [PATCH 233/248] Inverted true/false

---
 src/graphics/stkscenemanager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 39663484b..b42c2defe 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -135,8 +135,8 @@ bool isBoxInFrontOfPlane(const core::plane3df &plane, const core::vector3df edge
 {
     for (u32 j = 0; j<8; ++j)
         if (plane.classifyPointRelation(edges[j]) != core::ISREL3D_FRONT)
-            return true;
-    return false;
+            return false;
+    return true;
 }
 
 static

From 14b8e00279e0fc6bbec93878d19813f3c2180a94 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sat, 6 Sep 2014 16:24:42 -0400
Subject: [PATCH 234/248] Fix use of unititialized variables in cutscene

---
 src/graphics/irr_driver.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 493dff0ed..15d911208 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -112,6 +112,10 @@ IrrDriver::IrrDriver()
     m_mipviz = m_wireframe = m_normals = m_ssaoviz = \
         m_lightviz = m_shadowviz = m_distortviz = m_rsm = m_rh = m_gi = false;
     SkyboxCubeMap = m_last_light_bucket_distance = 0;
+    m_shadow_camnodes[0] = NULL;
+    m_shadow_camnodes[1] = NULL;
+    m_shadow_camnodes[2] = NULL;
+    m_shadow_camnodes[3] = NULL;
     memset(object_count, 0, sizeof(object_count));
 }   // IrrDriver
 

From a6f7c3a152f129924139086a6d0c02ddb5edd796 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sat, 6 Sep 2014 17:01:06 -0400
Subject: [PATCH 235/248] Add clean way to hide/show ribbon items and use it in
 GP info screen. Fixes #1485

---
 src/guiengine/widgets/ribbon_widget.cpp | 12 ++++++++++++
 src/guiengine/widgets/ribbon_widget.hpp |  2 ++
 src/states_screens/gp_info_screen.cpp   | 15 ++++++++-------
 src/states_screens/gp_info_screen.hpp   |  8 +++-----
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/guiengine/widgets/ribbon_widget.cpp b/src/guiengine/widgets/ribbon_widget.cpp
index 9432335ed..c82d7bd5f 100644
--- a/src/guiengine/widgets/ribbon_widget.cpp
+++ b/src/guiengine/widgets/ribbon_widget.cpp
@@ -733,6 +733,18 @@ void RibbonWidget::setLabel(const unsigned int id, irr::core::stringw new_name)
     m_text = new_name;
 }   // setLabel
 
+// ----------------------------------------------------------------------------
+
+void RibbonWidget::setItemVisible(const unsigned int id, bool visible)
+{
+    m_children[id].setVisible(visible);
+
+    // ignore this call for ribbons without labels
+    if (m_labels.size() == 0) return;
+
+    m_labels[id].setVisible(visible);
+} // RibbonWidget
+
 // ----------------------------------------------------------------------------
 int RibbonWidget::findItemNamed(const char* internalName)
 {
diff --git a/src/guiengine/widgets/ribbon_widget.hpp b/src/guiengine/widgets/ribbon_widget.hpp
index 5746b877a..f14558250 100644
--- a/src/guiengine/widgets/ribbon_widget.hpp
+++ b/src/guiengine/widgets/ribbon_widget.hpp
@@ -152,6 +152,8 @@ namespace GUIEngine
           */
         void setLabel(const unsigned int id, irr::core::stringw new_name);
         
+        void setItemVisible(const unsigned int id, bool visible);
+
         /** Returns the ID of the item, or -1 if not found */
         int findItemNamed(const char* internalName);
         
diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index 97b66725e..7346d6644 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -70,7 +70,6 @@ void GPInfoScreen::loadedFromFile()
     // The group spinner is filled in init every time the screen is shown
     // (since the groups can change if addons are added/deleted).
     m_group_spinner      = getWidget<SpinnerWidget>("group-spinner");
-    m_continue_button    = getWidget<IconButtonWidget>("continue");
     m_reverse_spinner    = getWidget<SpinnerWidget>("reverse-spinner");
     m_reverse_spinner->addLabel(_("No"));
     m_reverse_spinner->addLabel(_("Yes"));
@@ -118,6 +117,14 @@ GrandPrixData::GPReverseType GPInfoScreen::getReverse() const
     // Avoid compiler warning
     return GrandPrixData::GP_NO_REVERSE;
 }   // getReverse
+// ----------------------------------------------------------------------------
+void GPInfoScreen::beforeAddingWidget()
+{
+    bool random = m_gp.isRandomGP();
+    RibbonWidget* ribbonButtons = getWidget<RibbonWidget>("buttons");
+    int id_continue_button = ribbonButtons->findItemNamed("continue");
+    ribbonButtons->setItemVisible(id_continue_button, random);
+}
 
 // ----------------------------------------------------------------------------
 /** Called before the screen is shown. It adds the screenshot icon, and
@@ -144,8 +151,6 @@ void GPInfoScreen::init()
         rb->setLabel(1,_(L"Reload") );
         getWidget<LabelWidget>("name")->setText(_("Random Grand Prix"), false);
         std::string restart = file_manager->getAsset(FileManager::GUI, "restart.png");
-        m_continue_button->setImage(restart, IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
-        m_continue_button->setVisible(true);
 
         // We have to recreate the group spinner, but a new group might have
         // been added or deleted since the last time this screen was shown.
@@ -197,10 +202,6 @@ void GPInfoScreen::init()
                                        race_manager->getDifficulty(),
                                        race_manager->getNumberOfKarts(),
                                        race_manager->getNumLocalPlayers());
-
-        //I18N: Continue a previously saved Grand Prix.
-        m_continue_button->setText(_(L"Continue saved GP"));
-        m_continue_button->setVisible(saved_gp != NULL);
     }
 
     addTracks();
diff --git a/src/states_screens/gp_info_screen.hpp b/src/states_screens/gp_info_screen.hpp
index 9e13328e7..8e72b89b2 100644
--- a/src/states_screens/gp_info_screen.hpp
+++ b/src/states_screens/gp_info_screen.hpp
@@ -48,9 +48,6 @@ private:
     /** Spinner for number of tracks (in case of random GP). */
     GUIEngine::SpinnerWidget *m_num_tracks_spinner;
 
-    /** The continue/reload (in case of random GP) icon. */
-    GUIEngine::IconButtonWidget *m_continue_button;
-
     /** The currently selected group name. */
     std::string m_group_name;
 
@@ -79,8 +76,9 @@ public:
     void onEnterPressedInternal();
     virtual void eventCallback(GUIEngine::Widget *, const std::string &name,
                                const int player_id);
-    virtual void loadedFromFile();
-    virtual void init();
+    virtual void loadedFromFile() OVERRIDE;
+    virtual void init() OVERRIDE;
+    virtual void beforeAddingWidget() OVERRIDE;
 
     virtual void onUpdate(float dt);
 

From f0796b238086ff7ffa32ef255888dcfffcd6427d Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sat, 6 Sep 2014 17:15:19 -0400
Subject: [PATCH 236/248] Fix #1485 properly

---
 src/states_screens/gp_info_screen.cpp | 32 +++++++++++++++++----------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index 7346d6644..59eea6a65 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -121,9 +121,26 @@ GrandPrixData::GPReverseType GPInfoScreen::getReverse() const
 void GPInfoScreen::beforeAddingWidget()
 {
     bool random = m_gp.isRandomGP();
-    RibbonWidget* ribbonButtons = getWidget<RibbonWidget>("buttons");
-    int id_continue_button = ribbonButtons->findItemNamed("continue");
-    ribbonButtons->setItemVisible(id_continue_button, random);
+    if (!random)
+    {
+        // Check if there is a saved GP:
+        SavedGrandPrix* saved_gp = SavedGrandPrix::getSavedGP(
+            StateManager::get()->getActivePlayerProfile(0)->getUniqueID(),
+            m_gp.getId(),
+            race_manager->getDifficulty(),
+            race_manager->getNumberOfKarts(),
+            race_manager->getNumLocalPlayers());
+
+        RibbonWidget* ribbonButtons = getWidget<RibbonWidget>("buttons");
+        int id_continue_button = ribbonButtons->findItemNamed("continue");
+        ribbonButtons->setItemVisible(id_continue_button, saved_gp != NULL);
+    }
+    else
+    {
+        RibbonWidget* ribbonButtons = getWidget<RibbonWidget>("buttons");
+        int id_continue_button = ribbonButtons->findItemNamed("continue");
+        ribbonButtons->setItemVisible(id_continue_button, true);
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -193,15 +210,6 @@ void GPInfoScreen::init()
     {
         getWidget<LabelWidget>("name")->setText(m_gp.getName(), false);
         m_gp.checkConsistency();
-
-        // Check if there is a saved GP:
-        SavedGrandPrix* saved_gp =
-            SavedGrandPrix::getSavedGP(StateManager::get()
-                                       ->getActivePlayerProfile(0)->getUniqueID(),
-                                       m_gp.getId(),
-                                       race_manager->getDifficulty(),
-                                       race_manager->getNumberOfKarts(),
-                                       race_manager->getNumLocalPlayers());
     }
 
     addTracks();

From 88f21e249051abe80d7054f062e5da2efe1c6fa3 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sat, 6 Sep 2014 23:35:00 +0200
Subject: [PATCH 237/248] Fix RSM

---
 src/graphics/render_geometry.cpp |  2 +-
 src/graphics/stkscenemanager.cpp | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 85bac8ed1..74c89078b 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -423,7 +423,7 @@ void IrrDriver::renderSolidSecondPass()
             TexUnit(2, true),
             TexUnit(3, true),
             TexUnit(4, true),
-            TexUnit(5, true)
+            TexUnit(0, true)
             ), ListMatSplatting::getInstance()->SolidPass, createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
         renderMeshes2ndPass<MeshShader::SphereMapShader, video::EVT_STANDARD, 2, 1>(TexUnits(
             TexUnit(0, true)
diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index b42c2defe..b1b9c8679 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -197,7 +197,7 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
                         MeshForGlowPass[mesh->mb].emplace_back(mesh, node);
 
 
-                    if (mesh->TextureMatrix.isIdentity())
+                    if (Mat != MAT_SPLATTING && mesh->TextureMatrix.isIdentity())
                         MeshForSolidPass[Mat][mesh->mb].emplace_back(mesh, Node);
                     else
                     {
@@ -214,6 +214,9 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
                         case MAT_UNLIT:
                             ListMatUnlit::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                             break;
+                        case MAT_SPLATTING:
+                            ListMatSplatting::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix);
+                            break;
                         }
                     }
                 }
@@ -310,7 +313,16 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
             if (irr_driver->hasARB_draw_indirect())
             {
                 for_in(mesh, node->MeshSolidMaterial[Mat])
-                    MeshForRSMPass[Mat][mesh->mb].emplace_back(mesh, Node);
+                {
+                    if (Mat != MAT_SPLATTING)
+                        MeshForRSMPass[Mat][mesh->mb].emplace_back(mesh, Node);
+                    else
+                    {
+                        core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
+                        ModelMatrix.getInverse(InvModelMatrix);
+                        ListMatSplatting::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix);
+                    }
+                }
             }
             else
             {

From 3d63d5e010660d304760a597984c7ec15f41a28b Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sat, 6 Sep 2014 23:39:51 +0200
Subject: [PATCH 238/248] Emit a fatal error if glewInit() failed.

---
 src/graphics/glwrap.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 15887a8f0..ac1ace5cb 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -98,7 +98,8 @@ void initGL()
     if (is_gl_init)
         return;
     is_gl_init = true;
-    glewInit();
+    if (GLEW_OK != glewInit())
+        Log::fatal("GLEW", "Glew initialisation failed, can't continue.");
 #ifdef ARB_DEBUG_OUTPUT
     if (glDebugMessageCallbackARB)
         glDebugMessageCallbackARB((GLDEBUGPROCARB)debugCallback, NULL);

From 27306018d55c47aee341102d81f40d7de6016605 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sat, 6 Sep 2014 23:41:29 +0200
Subject: [PATCH 239/248] Better glew error reporting.

---
 src/graphics/glwrap.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index ac1ace5cb..5cd1ce570 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -98,8 +98,9 @@ void initGL()
     if (is_gl_init)
         return;
     is_gl_init = true;
-    if (GLEW_OK != glewInit())
-        Log::fatal("GLEW", "Glew initialisation failed, can't continue.");
+    GLenum err = glewInit();
+    if (GLEW_OK != err)
+        Log::fatal("GLEW", "Glew initialisation failed with error %s", glewGetErrorString(err));
 #ifdef ARB_DEBUG_OUTPUT
     if (glDebugMessageCallbackARB)
         glDebugMessageCallbackARB((GLDEBUGPROCARB)debugCallback, NULL);

From 016ba2caf37ca255c99de2fe7c0804a5975750ff Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sat, 6 Sep 2014 17:58:59 -0400
Subject: [PATCH 240/248] Fix #1499

---
 src/guiengine/widgets/ribbon_widget.cpp | 22 ++++++++++++++--------
 src/states_screens/gp_info_screen.cpp   |  2 ++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/guiengine/widgets/ribbon_widget.cpp b/src/guiengine/widgets/ribbon_widget.cpp
index c82d7bd5f..cc379cd7c 100644
--- a/src/guiengine/widgets/ribbon_widget.cpp
+++ b/src/guiengine/widgets/ribbon_widget.cpp
@@ -722,15 +722,21 @@ EventPropagation RibbonWidget::transmitEvent(Widget* w,
 // ----------------------------------------------------------------------------
 void RibbonWidget::setLabel(const unsigned int id, irr::core::stringw new_name)
 {
-    // This method should only be called AFTER a widget is added
-    assert(m_element != NULL);
+    if (m_element == NULL)
+    {
+        // before adding
+        m_children[id].setText(new_name);
+    }
+    else
+    {
+        // after adding
+        // ignore this call for ribbons without labels
+        if (m_labels.size() == 0) return;
 
-    // ignore this call for ribbons without labels
-    if (m_labels.size() == 0) return;
-
-    assert(id < m_labels.size());
-    m_labels[id].setText( new_name.c_str() );
-    m_text = new_name;
+        assert(id < m_labels.size());
+        m_labels[id].setText(new_name.c_str());
+        //m_text = new_name;
+    }
 }   // setLabel
 
 // ----------------------------------------------------------------------------
diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index 59eea6a65..5efdee60c 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -134,12 +134,14 @@ void GPInfoScreen::beforeAddingWidget()
         RibbonWidget* ribbonButtons = getWidget<RibbonWidget>("buttons");
         int id_continue_button = ribbonButtons->findItemNamed("continue");
         ribbonButtons->setItemVisible(id_continue_button, saved_gp != NULL);
+        ribbonButtons->setLabel(id_continue_button, _("Continue saved GP"));
     }
     else
     {
         RibbonWidget* ribbonButtons = getWidget<RibbonWidget>("buttons");
         int id_continue_button = ribbonButtons->findItemNamed("continue");
         ribbonButtons->setItemVisible(id_continue_button, true);
+        ribbonButtons->setLabel(id_continue_button, _("Reload"));
     }
 }
 

From 0eeeb606854c4f5f87f5cd403d1d39c2c68c7f68 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sat, 6 Sep 2014 23:15:05 +0200
Subject: [PATCH 241/248] Use pointer arithmetic to enforce matrix 16 bytes
 alignment

---
 lib/irrlicht/include/matrix4.h | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/irrlicht/include/matrix4.h b/lib/irrlicht/include/matrix4.h
index 1d07713e1..c386da82d 100644
--- a/lib/irrlicht/include/matrix4.h
+++ b/lib/irrlicht/include/matrix4.h
@@ -47,6 +47,8 @@ namespace core
 	template <class T>
 	class CMatrix4
 	{
+    private:
+        float M_raw[24];
 		public:
 
 			//! Constructor Flags
@@ -406,7 +408,7 @@ namespace core
 
 		private:
 			//! Matrix data, stored in row-major order
-			T M[16];
+            T* M = (T*)((uintptr_t)&M_raw[4] & ~0xF);
 #if defined ( USE_MATRIX_TEST )
 			//! Flag is this matrix is identity matrix
 			mutable u32 definitelyIdentityMatrix;
@@ -667,10 +669,10 @@ namespace core
 
         const float *matA = other_a.pointer();
 
-        const __m128 a = _mm_loadu_ps(matA); // First row
-        const __m128 b = _mm_loadu_ps(&matA[4]); // Second row
-        const __m128 c = _mm_loadu_ps(&matA[8]); // Third row
-        const __m128 d = _mm_loadu_ps(&matA[12]); // Fourth row
+        const __m128 a = _mm_load_ps(matA); // First row
+        const __m128 b = _mm_load_ps(&matA[4]); // Second row
+        const __m128 c = _mm_load_ps(&matA[8]); // Third row
+        const __m128 d = _mm_load_ps(&matA[12]); // Fourth row
 
          __m128 t1 = _mm_set1_ps(m2[0]);
          __m128 t2 = _mm_mul_ps(a, t1);
@@ -680,7 +682,7 @@ namespace core
         t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
         t1 = _mm_set1_ps(m2[3]);
         t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
-        _mm_storeu_ps(&M[0], t2);
+        _mm_store_ps(&M[0], t2);
 
         t1 = _mm_set1_ps(m2[4]);
         t2 = _mm_mul_ps(a, t1);
@@ -690,7 +692,7 @@ namespace core
         t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
         t1 = _mm_set1_ps(m2[7]);
         t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
-        _mm_storeu_ps(&M[4], t2);
+        _mm_store_ps(&M[4], t2);
 
         t1 = _mm_set1_ps(m2[8]);
         t2 = _mm_mul_ps(a, t1);
@@ -700,7 +702,7 @@ namespace core
         t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
         t1 = _mm_set1_ps(m2[11]);
         t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
-        _mm_storeu_ps(&M[8], t2);
+        _mm_store_ps(&M[8], t2);
 
         t1 = _mm_set1_ps(m2[12]);
         t2 = _mm_mul_ps(a, t1);
@@ -710,7 +712,7 @@ namespace core
         t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
         t1 = _mm_set1_ps(m2[15]);
         t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
-        _mm_storeu_ps(&M[12], t2);
+        _mm_store_ps(&M[12], t2);
 #else
 
 		M[0] = m1[0]*m2[0] + m1[4]*m2[1] + m1[8]*m2[2] + m1[12]*m2[3];

From e91a916e14dc2befb3bce897d151bd413bc92e9d Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sun, 7 Sep 2014 00:14:34 +0200
Subject: [PATCH 242/248] Try to fix glew initialisation with Mesa

---
 src/graphics/glwrap.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 5cd1ce570..7c7975fbd 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -98,6 +98,7 @@ void initGL()
     if (is_gl_init)
         return;
     is_gl_init = true;
+    glewExperimental = GL_TRUE;
     GLenum err = glewInit();
     if (GLEW_OK != err)
         Log::fatal("GLEW", "Glew initialisation failed with error %s", glewGetErrorString(err));

From bdb867bce270ba98d066feb78fa19ecda11d2812 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sun, 7 Sep 2014 00:17:24 +0200
Subject: [PATCH 243/248] Fix travis

---
 lib/irrlicht/include/matrix4.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/irrlicht/include/matrix4.h b/lib/irrlicht/include/matrix4.h
index c386da82d..8ff6501a8 100644
--- a/lib/irrlicht/include/matrix4.h
+++ b/lib/irrlicht/include/matrix4.h
@@ -12,6 +12,7 @@
 #include "aabbox3d.h"
 #include "rect.h"
 #include "irrString.h"
+#include <cstdint>
 #if defined(WIN32) && (defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86))
 #include <intrin.h>
 #endif

From cbb59fa640a3139a6d884eae5e7856effe86c903 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sun, 7 Sep 2014 00:20:31 +0200
Subject: [PATCH 244/248] Revert "Fix travis"

This reverts commit bdb867bce270ba98d066feb78fa19ecda11d2812.
---
 lib/irrlicht/include/matrix4.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/irrlicht/include/matrix4.h b/lib/irrlicht/include/matrix4.h
index 8ff6501a8..c386da82d 100644
--- a/lib/irrlicht/include/matrix4.h
+++ b/lib/irrlicht/include/matrix4.h
@@ -12,7 +12,6 @@
 #include "aabbox3d.h"
 #include "rect.h"
 #include "irrString.h"
-#include <cstdint>
 #if defined(WIN32) && (defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86))
 #include <intrin.h>
 #endif

From e83bd118911a51e75e2c1c36388237c8280edcfa Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sun, 7 Sep 2014 00:20:35 +0200
Subject: [PATCH 245/248] Revert "Use pointer arithmetic to enforce matrix 16
 bytes alignment"

This reverts commit 0eeeb606854c4f5f87f5cd403d1d39c2c68c7f68.
---
 lib/irrlicht/include/matrix4.h | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/irrlicht/include/matrix4.h b/lib/irrlicht/include/matrix4.h
index c386da82d..1d07713e1 100644
--- a/lib/irrlicht/include/matrix4.h
+++ b/lib/irrlicht/include/matrix4.h
@@ -47,8 +47,6 @@ namespace core
 	template <class T>
 	class CMatrix4
 	{
-    private:
-        float M_raw[24];
 		public:
 
 			//! Constructor Flags
@@ -408,7 +406,7 @@ namespace core
 
 		private:
 			//! Matrix data, stored in row-major order
-            T* M = (T*)((uintptr_t)&M_raw[4] & ~0xF);
+			T M[16];
 #if defined ( USE_MATRIX_TEST )
 			//! Flag is this matrix is identity matrix
 			mutable u32 definitelyIdentityMatrix;
@@ -669,10 +667,10 @@ namespace core
 
         const float *matA = other_a.pointer();
 
-        const __m128 a = _mm_load_ps(matA); // First row
-        const __m128 b = _mm_load_ps(&matA[4]); // Second row
-        const __m128 c = _mm_load_ps(&matA[8]); // Third row
-        const __m128 d = _mm_load_ps(&matA[12]); // Fourth row
+        const __m128 a = _mm_loadu_ps(matA); // First row
+        const __m128 b = _mm_loadu_ps(&matA[4]); // Second row
+        const __m128 c = _mm_loadu_ps(&matA[8]); // Third row
+        const __m128 d = _mm_loadu_ps(&matA[12]); // Fourth row
 
          __m128 t1 = _mm_set1_ps(m2[0]);
          __m128 t2 = _mm_mul_ps(a, t1);
@@ -682,7 +680,7 @@ namespace core
         t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
         t1 = _mm_set1_ps(m2[3]);
         t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
-        _mm_store_ps(&M[0], t2);
+        _mm_storeu_ps(&M[0], t2);
 
         t1 = _mm_set1_ps(m2[4]);
         t2 = _mm_mul_ps(a, t1);
@@ -692,7 +690,7 @@ namespace core
         t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
         t1 = _mm_set1_ps(m2[7]);
         t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
-        _mm_store_ps(&M[4], t2);
+        _mm_storeu_ps(&M[4], t2);
 
         t1 = _mm_set1_ps(m2[8]);
         t2 = _mm_mul_ps(a, t1);
@@ -702,7 +700,7 @@ namespace core
         t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
         t1 = _mm_set1_ps(m2[11]);
         t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
-        _mm_store_ps(&M[8], t2);
+        _mm_storeu_ps(&M[8], t2);
 
         t1 = _mm_set1_ps(m2[12]);
         t2 = _mm_mul_ps(a, t1);
@@ -712,7 +710,7 @@ namespace core
         t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
         t1 = _mm_set1_ps(m2[15]);
         t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
-        _mm_store_ps(&M[12], t2);
+        _mm_storeu_ps(&M[12], t2);
 #else
 
 		M[0] = m1[0]*m2[0] + m1[4]*m2[1] + m1[8]*m2[2] + m1[12]*m2[3];

From b9a595e66612e94c36b4e82522c0036b9a089fc4 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sun, 7 Sep 2014 00:44:49 +0200
Subject: [PATCH 246/248] Revert "Revert "Use pointer arithmetic to enforce
 matrix 16 bytes alignment""

This reverts commit e83bd118911a51e75e2c1c36388237c8280edcfa.
---
 lib/irrlicht/include/matrix4.h | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/irrlicht/include/matrix4.h b/lib/irrlicht/include/matrix4.h
index 1d07713e1..c386da82d 100644
--- a/lib/irrlicht/include/matrix4.h
+++ b/lib/irrlicht/include/matrix4.h
@@ -47,6 +47,8 @@ namespace core
 	template <class T>
 	class CMatrix4
 	{
+    private:
+        float M_raw[24];
 		public:
 
 			//! Constructor Flags
@@ -406,7 +408,7 @@ namespace core
 
 		private:
 			//! Matrix data, stored in row-major order
-			T M[16];
+            T* M = (T*)((uintptr_t)&M_raw[4] & ~0xF);
 #if defined ( USE_MATRIX_TEST )
 			//! Flag is this matrix is identity matrix
 			mutable u32 definitelyIdentityMatrix;
@@ -667,10 +669,10 @@ namespace core
 
         const float *matA = other_a.pointer();
 
-        const __m128 a = _mm_loadu_ps(matA); // First row
-        const __m128 b = _mm_loadu_ps(&matA[4]); // Second row
-        const __m128 c = _mm_loadu_ps(&matA[8]); // Third row
-        const __m128 d = _mm_loadu_ps(&matA[12]); // Fourth row
+        const __m128 a = _mm_load_ps(matA); // First row
+        const __m128 b = _mm_load_ps(&matA[4]); // Second row
+        const __m128 c = _mm_load_ps(&matA[8]); // Third row
+        const __m128 d = _mm_load_ps(&matA[12]); // Fourth row
 
          __m128 t1 = _mm_set1_ps(m2[0]);
          __m128 t2 = _mm_mul_ps(a, t1);
@@ -680,7 +682,7 @@ namespace core
         t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
         t1 = _mm_set1_ps(m2[3]);
         t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
-        _mm_storeu_ps(&M[0], t2);
+        _mm_store_ps(&M[0], t2);
 
         t1 = _mm_set1_ps(m2[4]);
         t2 = _mm_mul_ps(a, t1);
@@ -690,7 +692,7 @@ namespace core
         t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
         t1 = _mm_set1_ps(m2[7]);
         t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
-        _mm_storeu_ps(&M[4], t2);
+        _mm_store_ps(&M[4], t2);
 
         t1 = _mm_set1_ps(m2[8]);
         t2 = _mm_mul_ps(a, t1);
@@ -700,7 +702,7 @@ namespace core
         t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
         t1 = _mm_set1_ps(m2[11]);
         t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
-        _mm_storeu_ps(&M[8], t2);
+        _mm_store_ps(&M[8], t2);
 
         t1 = _mm_set1_ps(m2[12]);
         t2 = _mm_mul_ps(a, t1);
@@ -710,7 +712,7 @@ namespace core
         t2 = _mm_add_ps(_mm_mul_ps(c, t1), t2);
         t1 = _mm_set1_ps(m2[15]);
         t2 = _mm_add_ps(_mm_mul_ps(d, t1), t2);
-        _mm_storeu_ps(&M[12], t2);
+        _mm_store_ps(&M[12], t2);
 #else
 
 		M[0] = m1[0]*m2[0] + m1[4]*m2[1] + m1[8]*m2[2] + m1[12]*m2[3];

From 4822b8a75e459c15cdfda3436566c448969486e3 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sun, 7 Sep 2014 00:33:34 +0200
Subject: [PATCH 247/248] Fix travis

---
 lib/irrlicht/include/matrix4.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/irrlicht/include/matrix4.h b/lib/irrlicht/include/matrix4.h
index c386da82d..6c04a8308 100644
--- a/lib/irrlicht/include/matrix4.h
+++ b/lib/irrlicht/include/matrix4.h
@@ -48,7 +48,9 @@ namespace core
 	class CMatrix4
 	{
     private:
+#if defined(WIN32) && (defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86))
         float M_raw[24];
+#endif
 		public:
 
 			//! Constructor Flags
@@ -407,8 +409,12 @@ namespace core
 			bool equals(const core::CMatrix4<T>& other, const T tolerance=(T)ROUNDING_ERROR_f64) const;
 
 		private:
+#if defined(WIN32) && (defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86))
 			//! Matrix data, stored in row-major order
             T* M = (T*)((uintptr_t)&M_raw[4] & ~0xF);
+#else
+            T M[16];
+#endif
 #if defined ( USE_MATRIX_TEST )
 			//! Flag is this matrix is identity matrix
 			mutable u32 definitelyIdentityMatrix;

From 9f940770a47bf69a4490689a4d83a12581928269 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sat, 6 Sep 2014 15:47:52 +0200
Subject: [PATCH 248/248] Make frustrum culling calculation parallel

---
 src/graphics/stkmesh.hpp         |  10 +
 src/graphics/stkscenemanager.cpp | 460 +++++++++++++++----------------
 2 files changed, 236 insertions(+), 234 deletions(-)

diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stkmesh.hpp
index f4c246419..569331b96 100644
--- a/src/graphics/stkmesh.hpp
+++ b/src/graphics/stkmesh.hpp
@@ -63,12 +63,22 @@ core::vector3df getWindDir();
 
 class STKMeshCommon
 {
+protected:
+    bool m_culledForPlayerCam;
+    bool m_culledForShadowCam[4];
+    bool m_culledForRSMCam;
 public:
     PtrVector<GLMesh, REF> MeshSolidMaterial[MAT_COUNT];
     PtrVector<GLMesh, REF> TransparentMesh[TM_COUNT];
     virtual void update() = 0;
     virtual bool glow() const = 0;
     virtual bool isImmediateDraw() const { return false; }
+    bool isCulledForPlayerCam() const { return m_culledForPlayerCam; }
+    void setCulledForPlayerCam(bool v) { m_culledForPlayerCam = v; }
+    bool isCulledForShadowCam(unsigned cascade) const { return m_culledForShadowCam[cascade]; }
+    void setCulledForShadowCam(unsigned cascade, bool v) { m_culledForShadowCam[cascade] = v; }
+    bool isCulledForRSMCam() const { return m_culledForRSMCam; }
+    void setCulledForRSMCam(bool v) { m_culledForRSMCam = v; }
 };
 
 template<typename T, typename... Args>
diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index b1b9c8679..57721bf20 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -17,28 +17,23 @@
 #include "utils/profiler.hpp"
 #include <unordered_map>
 #include <SViewFrustum.h>
+#include <functional>
 
 static void
 FillInstances_impl(std::vector<std::pair<GLMesh *, scene::ISceneNode *> > InstanceList, InstanceData * InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer,
-    size_t &InstanceBufferOffset, size_t &CommandBufferOffset, size_t &PolyCount)
+    size_t &InstanceBufferOffset, size_t &CommandBufferOffset, size_t &PolyCount, std::function<bool (const scene::ISceneNode *)> cull_func)
 {
     // Should never be empty
     GLMesh *mesh = InstanceList.front().first;
-
-    DrawElementsIndirectCommand &CurrentCommand = CommandBuffer[CommandBufferOffset++];
-    CurrentCommand.baseVertex = mesh->vaoBaseVertex;
-    CurrentCommand.count = mesh->IndexCount;
-    CurrentCommand.firstIndex = mesh->vaoOffset / 2;
-    CurrentCommand.baseInstance = InstanceBufferOffset;
-    CurrentCommand.instanceCount = InstanceList.size();
-
-    PolyCount += InstanceList.size() * mesh->IndexCount / 3;
+    size_t InitialOffset = InstanceBufferOffset;
 
     for (unsigned i = 0; i < InstanceList.size(); i++)
     {
         auto &Tp = InstanceList[i];
-        InstanceData &Instance = InstanceBuffer[InstanceBufferOffset++];
         scene::ISceneNode *node = Tp.second;
+        if (cull_func(node))
+            continue;
+        InstanceData &Instance = InstanceBuffer[InstanceBufferOffset++];
         const core::matrix4 &mat = node->getAbsoluteTransformation();
         const core::vector3df &Origin = mat.getTranslation();
         const core::vector3df &Orientation = mat.getRotationDegrees();
@@ -55,26 +50,31 @@ FillInstances_impl(std::vector<std::pair<GLMesh *, scene::ISceneNode *> > Instan
         Instance.Texture = mesh->TextureHandles[0];
         Instance.SecondTexture = mesh->TextureHandles[1];
     }
-}
-
-
-static void
-FillInstancesGlow_impl(std::vector<std::pair<GLMesh *, STKMeshCommon *> > InstanceList, GlowInstanceData * InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer,
-size_t &InstanceBufferOffset, size_t &CommandBufferOffset)
-{
-    // Should never be empty
-    GLMesh *mesh = InstanceList.front().first;
 
     DrawElementsIndirectCommand &CurrentCommand = CommandBuffer[CommandBufferOffset++];
     CurrentCommand.baseVertex = mesh->vaoBaseVertex;
     CurrentCommand.count = mesh->IndexCount;
     CurrentCommand.firstIndex = mesh->vaoOffset / 2;
-    CurrentCommand.baseInstance = InstanceBufferOffset;
-    CurrentCommand.instanceCount = InstanceList.size();
+    CurrentCommand.baseInstance = InitialOffset;
+    CurrentCommand.instanceCount = InstanceBufferOffset - InitialOffset;
+
+    PolyCount += (InstanceBufferOffset - InitialOffset) * mesh->IndexCount / 3;
+}
+
+
+static void
+FillInstancesGlow_impl(std::vector<std::pair<GLMesh *, STKMeshCommon *> > InstanceList, GlowInstanceData * InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer,
+    size_t &InstanceBufferOffset, size_t &CommandBufferOffset, std::function<bool (const scene::ISceneNode *)> cull_func)
+{
+    // Should never be empty
+    GLMesh *mesh = InstanceList.front().first;
+    size_t InitialOffset = InstanceBufferOffset;
 
     for (unsigned i = 0; i < InstanceList.size(); i++)
     {
         STKMeshSceneNode *node = dynamic_cast<STKMeshSceneNode*>(InstanceList[i].second);
+        if (cull_func(node))
+            continue;
         GlowInstanceData &Instance = InstanceBuffer[InstanceBufferOffset++];
         const core::matrix4 &mat = node->getAbsoluteTransformation();
         const core::vector3df &Origin = mat.getTranslation();
@@ -91,17 +91,25 @@ size_t &InstanceBufferOffset, size_t &CommandBufferOffset)
         Instance.Scale.Y = Scale.Y;
         Instance.Scale.Z = Scale.Z;
     }
+
+    DrawElementsIndirectCommand &CurrentCommand = CommandBuffer[CommandBufferOffset++];
+    CurrentCommand.baseVertex = mesh->vaoBaseVertex;
+    CurrentCommand.count = mesh->IndexCount;
+    CurrentCommand.firstIndex = mesh->vaoOffset / 2;
+    CurrentCommand.baseInstance = InitialOffset;
+    CurrentCommand.instanceCount = InstanceBufferOffset - InitialOffset;
 }
 
 
 static
 void FillInstances(const std::unordered_map<scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > &GatheredGLMesh, std::vector<GLMesh *> &InstancedList,
-    InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, size_t &Polycount)
+    InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, size_t &Polycount,
+    std::function<bool (const scene::ISceneNode *)> cull_func)
 {
     auto It = GatheredGLMesh.begin(), E = GatheredGLMesh.end();
     for (; It != E; ++It)
     {
-        FillInstances_impl(It->second, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, Polycount);
+        FillInstances_impl(It->second, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, Polycount, cull_func);
         if (!UserConfigParams::m_azdo)
             InstancedList.push_back(It->second.front().first);
     }
@@ -109,13 +117,14 @@ void FillInstances(const std::unordered_map<scene::IMeshBuffer *, std::vector<st
 
 static
 void FillInstancesGrass(const std::unordered_map<scene::IMeshBuffer *, std::vector<std::pair<GLMesh *, scene::ISceneNode*> > > &GatheredGLMesh, std::vector<GLMesh *> &InstancedList,
-    InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, const core::vector3df &dir, size_t &PolyCount)
+    InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, const core::vector3df &dir, size_t &PolyCount,
+    std::function<bool (const scene::ISceneNode *)> cull_func)
 {
     auto It = GatheredGLMesh.begin(), E = GatheredGLMesh.end();
     SunLightProvider * const cb = (SunLightProvider *)irr_driver->getCallback(ES_SUNLIGHT);
     for (; It != E; ++It)
     {
-        FillInstances_impl(It->second, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, PolyCount);
+        FillInstances_impl(It->second, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, PolyCount, cull_func);
         if (!UserConfigParams::m_azdo)
             InstancedList.push_back(It->second.front().first);
     }
@@ -142,37 +151,27 @@ bool isBoxInFrontOfPlane(const core::plane3df &plane, const core::vector3df edge
 static
 bool isCulled(const scene::ICameraSceneNode *cam, const scene::ISceneNode *node)
 {
-    // can be seen by a bounding box ?
-    if (node->getAutomaticCulling() & scene::EAC_BOX)
-    {
-        core::aabbox3d<f32> tbox = node->getBoundingBox();
-        node->getAbsoluteTransformation().transformBoxEx(tbox);
-        return !(tbox.intersectsWithBox(cam->getViewFrustum()->getBoundingBox()));
-    }
-
-    // can be seen by cam pyramid planes ?
-    if (node->getAutomaticCulling() & scene::EAC_FRUSTUM_BOX)
-    {
-        scene::SViewFrustum frust = *cam->getViewFrustum();
-
-        //transform the frustum to the node's current absolute transformation
-        core::matrix4 invTrans(node->getAbsoluteTransformation(), core::matrix4::EM4CONST_INVERSE);
-        //invTrans.makeInverse();
-        frust.transform(invTrans);
-
-        core::vector3df edges[8];
-        node->getBoundingBox().getEdges(edges);
-
-        for (s32 i = 0; i < scene::SViewFrustum::VF_PLANE_COUNT; ++i)
-            if (isBoxInFrontOfPlane(frust.planes[i], edges))
-                return true;
+    if (!node->getAutomaticCulling())
         return false;
-    }
+
+    scene::SViewFrustum frust = *cam->getViewFrustum();
+
+    //transform the frustum to the node's current absolute transformation
+    core::matrix4 invTrans(node->getAbsoluteTransformation(), core::matrix4::EM4CONST_INVERSE);
+    //invTrans.makeInverse();
+    frust.transform(invTrans);
+
+    core::vector3df edges[8];
+    node->getBoundingBox().getEdges(edges);
+
+    for (s32 i = 0; i < scene::SViewFrustum::VF_PLANE_COUNT; ++i)
+        if (isBoxInFrontOfPlane(frust.planes[i], edges))
+            return true;
     return false;
 }
 
 static void
-handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *ImmediateDraw, bool IsCulledForSolid, bool IsCulledForShadow[4], bool IsCulledForRSM)
+handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *ImmediateDraw)
 {
     STKMeshCommon *node = dynamic_cast<STKMeshCommon*>(Node);
     if (!node)
@@ -187,47 +186,19 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
     for (unsigned Mat = 0; Mat < MAT_COUNT; ++Mat)
     {
         GLMesh *mesh;
-        if (!IsCulledForSolid)
+        if (irr_driver->hasARB_draw_indirect())
         {
-            if (irr_driver->hasARB_draw_indirect())
+            for_in(mesh, node->MeshSolidMaterial[Mat])
             {
-                for_in(mesh, node->MeshSolidMaterial[Mat])
-                {
-                    if (node->glow())
-                        MeshForGlowPass[mesh->mb].emplace_back(mesh, node);
-
-
-                    if (Mat != MAT_SPLATTING && mesh->TextureMatrix.isIdentity())
-                        MeshForSolidPass[Mat][mesh->mb].emplace_back(mesh, Node);
-                    else
-                    {
-                        core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
-                        ModelMatrix.getInverse(InvModelMatrix);
-                        switch (Mat)
-                        {
-                        case MAT_DEFAULT:
-                            ListMatDefault::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
-                            break;
-                        case MAT_ALPHA_REF:
-                            ListMatAlphaRef::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
-                            break;
-                        case MAT_UNLIT:
-                            ListMatUnlit::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
-                            break;
-                        case MAT_SPLATTING:
-                            ListMatSplatting::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix);
-                            break;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
-                ModelMatrix.getInverse(InvModelMatrix);
-
-                for_in(mesh, node->MeshSolidMaterial[Mat])
+                if (node->glow())
+                    MeshForGlowPass[mesh->mb].emplace_back(mesh, node);
+
+                if (Mat != MAT_SPLATTING && mesh->TextureMatrix.isIdentity())
+                    MeshForSolidPass[Mat][mesh->mb].emplace_back(mesh, Node);
+                else
                 {
+                    core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
+                    ModelMatrix.getInverse(InvModelMatrix);
                     switch (Mat)
                     {
                     case MAT_DEFAULT:
@@ -236,93 +207,60 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
                     case MAT_ALPHA_REF:
                         ListMatAlphaRef::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
-                    case MAT_NORMAL_MAP:
-                        ListMatNormalMap::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
-                        break;
-                    case MAT_DETAIL:
-                        ListMatDetails::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
-                        break;
                     case MAT_UNLIT:
                         ListMatUnlit::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
-                    case MAT_SPHEREMAP:
-                        ListMatSphereMap::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
-                        break;
                     case MAT_SPLATTING:
                         ListMatSplatting::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix);
                         break;
-                    case MAT_GRASS:
-                        ListMatGrass::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, windDir);
-                        break;
                     }
                 }
             }
         }
+        else
+        {
+            core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
+            ModelMatrix.getInverse(InvModelMatrix);
+
+            for_in(mesh, node->MeshSolidMaterial[Mat])
+            {
+                switch (Mat)
+                {
+                case MAT_DEFAULT:
+                    ListMatDefault::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                    break;
+                case MAT_ALPHA_REF:
+                    ListMatAlphaRef::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                    break;
+                case MAT_NORMAL_MAP:
+                    ListMatNormalMap::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                    break;
+                case MAT_DETAIL:
+                    ListMatDetails::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                    break;
+                case MAT_UNLIT:
+                    ListMatUnlit::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                    break;
+                case MAT_SPHEREMAP:
+                    ListMatSphereMap::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                    break;
+                case MAT_SPLATTING:
+                    ListMatSplatting::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix);
+                    break;
+                case MAT_GRASS:
+                    ListMatGrass::getInstance()->SolidPass.emplace_back(mesh, ModelMatrix, InvModelMatrix, windDir);
+                    break;
+                }
+            }
+        }
         if (!UserConfigParams::m_shadows)
             return;
         for (unsigned cascade = 0; cascade < 4; ++cascade)
-        {
-            if (!IsCulledForShadow[cascade])
-            {
-                if (irr_driver->hasARB_draw_indirect())
-                {
-                    for_in(mesh, node->MeshSolidMaterial[Mat])
-                        MeshForShadowPass[cascade][Mat][mesh->mb].emplace_back(mesh, Node);
-                }
-                else
-                {
-                    core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
-                    ModelMatrix.getInverse(InvModelMatrix);
-
-                    for_in(mesh, node->MeshSolidMaterial[Mat])
-                    {
-                        switch (Mat)
-                        {
-                        case MAT_DEFAULT:
-                            ListMatDefault::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
-                            break;
-                        case MAT_ALPHA_REF:
-                            ListMatAlphaRef::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
-                            break;
-                        case MAT_NORMAL_MAP:
-                            ListMatNormalMap::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
-                            break;
-                        case MAT_DETAIL:
-                            ListMatDetails::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
-                            break;
-                        case MAT_UNLIT:
-                            ListMatUnlit::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
-                            break;
-                        case MAT_SPHEREMAP:
-                            ListMatSphereMap::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
-                            break;
-                        case MAT_SPLATTING:
-                            ListMatSplatting::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix);
-                            break;
-                        case MAT_GRASS:
-                            ListMatGrass::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, windDir);
-                        }
-                    }
-                }
-            }
-        }
-        if (!UserConfigParams::m_gi)
-            return;
-        if (!IsCulledForRSM)
         {
             if (irr_driver->hasARB_draw_indirect())
             {
                 for_in(mesh, node->MeshSolidMaterial[Mat])
-                {
-                    if (Mat != MAT_SPLATTING)
-                        MeshForRSMPass[Mat][mesh->mb].emplace_back(mesh, Node);
-                    else
-                    {
-                        core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
-                        ModelMatrix.getInverse(InvModelMatrix);
-                        ListMatSplatting::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix);
-                    }
-                }
+                    MeshForShadowPass[cascade][Mat][mesh->mb].emplace_back(mesh, Node);
             }
             else
             {
@@ -334,76 +272,122 @@ handleSTKCommon(scene::ISceneNode *Node, std::vector<scene::ISceneNode *> *Immed
                     switch (Mat)
                     {
                     case MAT_DEFAULT:
-                        ListMatDefault::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                        ListMatDefault::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_ALPHA_REF:
-                        ListMatAlphaRef::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                        ListMatAlphaRef::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_NORMAL_MAP:
-                        ListMatNormalMap::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                        ListMatNormalMap::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_DETAIL:
-                        ListMatDetails::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                        ListMatDetails::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_UNLIT:
-                        ListMatUnlit::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                        ListMatUnlit::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_SPHEREMAP:
-                        ListMatSphereMap::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                        ListMatSphereMap::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
                         break;
                     case MAT_SPLATTING:
-                        ListMatSplatting::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix);
+                        ListMatSplatting::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix);
                         break;
                     case MAT_GRASS:
-                        ListMatGrass::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, windDir);
-                        break;
+                        ListMatGrass::getInstance()->Shadows[cascade].emplace_back(mesh, ModelMatrix, InvModelMatrix, windDir);
                     }
                 }
             }
         }
+        if (!UserConfigParams::m_gi)
+            return;
+        if (irr_driver->hasARB_draw_indirect())
+        {
+            for_in(mesh, node->MeshSolidMaterial[Mat])
+                if (Mat != MAT_SPLATTING)
+                    MeshForRSMPass[Mat][mesh->mb].emplace_back(mesh, Node);
+                else
+                {
+                    core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
+                    ModelMatrix.getInverse(InvModelMatrix);
+                    ListMatSplatting::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix);
+                }
+        }
+        else
+        {
+            core::matrix4 ModelMatrix = Node->getAbsoluteTransformation(), InvModelMatrix;
+            ModelMatrix.getInverse(InvModelMatrix);
+
+            for_in(mesh, node->MeshSolidMaterial[Mat])
+            {
+                switch (Mat)
+                {
+                case MAT_DEFAULT:
+                    ListMatDefault::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                    break;
+                case MAT_ALPHA_REF:
+                    ListMatAlphaRef::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                    break;
+                case MAT_NORMAL_MAP:
+                    ListMatNormalMap::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                    break;
+                case MAT_DETAIL:
+                    ListMatDetails::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                    break;
+                case MAT_UNLIT:
+                    ListMatUnlit::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                    break;
+                case MAT_SPHEREMAP:
+                    ListMatSphereMap::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix);
+                    break;
+                case MAT_SPLATTING:
+                    ListMatSplatting::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix);
+                    break;
+                case MAT_GRASS:
+                    ListMatGrass::getInstance()->RSM.emplace_back(mesh, ModelMatrix, InvModelMatrix, windDir);
+                    break;
+                }
+            }
+        }
     }
     // Transparent
-    if (!IsCulledForSolid)
+    GLMesh *mesh;
+    if (World::getWorld() && World::getWorld()->isFogEnabled())
     {
-        GLMesh *mesh;
-        if (World::getWorld() && World::getWorld()->isFogEnabled())
-        {
-            const Track * const track = World::getWorld()->getTrack();
+        const Track * const track = World::getWorld()->getTrack();
 
-            // Todo : put everything in a ubo
-            const float fogmax = track->getFogMax();
-            const float startH = track->getFogStartHeight();
-            const float endH = track->getFogEndHeight();
-            const float start = track->getFogStart();
-            const float end = track->getFogEnd();
-            const video::SColor tmpcol = track->getFogColor();
+        // Todo : put everything in a ubo
+        const float fogmax = track->getFogMax();
+        const float startH = track->getFogStartHeight();
+        const float endH = track->getFogEndHeight();
+        const float start = track->getFogStart();
+        const float end = track->getFogEnd();
+        const video::SColor tmpcol = track->getFogColor();
 
-            video::SColorf col(tmpcol.getRed() / 255.0f,
-                tmpcol.getGreen() / 255.0f,
-                tmpcol.getBlue() / 255.0f);
+        video::SColorf col(tmpcol.getRed() / 255.0f,
+            tmpcol.getGreen() / 255.0f,
+            tmpcol.getBlue() / 255.0f);
 
-            for_in(mesh, node->TransparentMesh[TM_DEFAULT])
-                pushVector(ListBlendTransparentFog::getInstance(), mesh, Node->getAbsoluteTransformation(), mesh->TextureMatrix,
-                fogmax, startH, endH, start, end, col);
-            for_in(mesh, node->TransparentMesh[TM_ADDITIVE])
-                pushVector(ListAdditiveTransparentFog::getInstance(), mesh, Node->getAbsoluteTransformation(), mesh->TextureMatrix,
-                fogmax, startH, endH, start, end, col);
-        }
-        else
-        {
-            for_in(mesh, node->TransparentMesh[TM_DEFAULT])
-                pushVector(ListBlendTransparent::getInstance(), mesh, Node->getAbsoluteTransformation(), mesh->TextureMatrix);
-            for_in(mesh, node->TransparentMesh[TM_ADDITIVE])
-                pushVector(ListAdditiveTransparent::getInstance(), mesh, Node->getAbsoluteTransformation(), mesh->TextureMatrix);
-        }
-        for_in(mesh, node->TransparentMesh[TM_DISPLACEMENT])
-            pushVector(ListDisplacement::getInstance(), mesh, Node->getAbsoluteTransformation());
+        for_in(mesh, node->TransparentMesh[TM_DEFAULT])
+            pushVector(ListBlendTransparentFog::getInstance(), mesh, Node->getAbsoluteTransformation(), mesh->TextureMatrix,
+            fogmax, startH, endH, start, end, col);
+        for_in(mesh, node->TransparentMesh[TM_ADDITIVE])
+            pushVector(ListAdditiveTransparentFog::getInstance(), mesh, Node->getAbsoluteTransformation(), mesh->TextureMatrix,
+            fogmax, startH, endH, start, end, col);
     }
+    else
+    {
+        for_in(mesh, node->TransparentMesh[TM_DEFAULT])
+            pushVector(ListBlendTransparent::getInstance(), mesh, Node->getAbsoluteTransformation(), mesh->TextureMatrix);
+        for_in(mesh, node->TransparentMesh[TM_ADDITIVE])
+            pushVector(ListAdditiveTransparent::getInstance(), mesh, Node->getAbsoluteTransformation(), mesh->TextureMatrix);
+    }
+    for_in(mesh, node->TransparentMesh[TM_DISPLACEMENT])
+        pushVector(ListDisplacement::getInstance(), mesh, Node->getAbsoluteTransformation());
 }
 
 static void
 parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::ISceneNode *> *ImmediateDraw,
-    scene::ICameraSceneNode* cam, scene::ICameraSceneNode *shadowCams[4], scene::ICameraSceneNode *RSM_cam)
+    scene::ICameraSceneNode* cam)
 {
     core::list<scene::ISceneNode*>::Iterator I = List.begin(), E = List.end();
     for (; I != E; ++I)
@@ -414,27 +398,16 @@ parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<scene::IScene
             continue;
         (*I)->updateAbsolutePosition();
 
-        bool IsCulledForSolid = isCulled(cam, *I);
-
-        bool IsCulledForShadow[4];
-        for (unsigned i = 0; i < 4; ++i)
-            IsCulledForShadow[i] = isCulled(shadowCams[i], *I);
-
-        bool IsCulledForRSM = isCulled(RSM_cam, *I);
-
-        if (!IsCulledForSolid)
+        if (ParticleSystemProxy *node = dynamic_cast<ParticleSystemProxy *>(*I))
         {
-            if (ParticleSystemProxy *node = dynamic_cast<ParticleSystemProxy *>(*I))
-            {
-                if (node->update())
-                    ParticlesList::getInstance()->push_back(node);
-                continue;
-            }
+            if (!isCulled(cam, *I) && node->update())
+                ParticlesList::getInstance()->push_back(node);
+            continue;
         }
 
-        handleSTKCommon(*I, ImmediateDraw, IsCulledForSolid, IsCulledForShadow, IsCulledForRSM);
+        handleSTKCommon(*I, ImmediateDraw);
 
-        parseSceneManager((*I)->getChildren(), ImmediateDraw, cam, shadowCams, RSM_cam);
+        parseSceneManager((*I)->getChildren(), ImmediateDraw, cam);
     }
 }
 
@@ -442,9 +415,10 @@ template<MeshMaterial Mat> static void
 GenDrawCalls(unsigned cascade, std::vector<GLMesh *> &InstancedList,
     InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, size_t &PolyCount)
 {
+    std::function<bool(const scene::ISceneNode *)> shadowculling = [&](const scene::ISceneNode *nd) {return dynamic_cast<const STKMeshCommon*>(nd)->isCulledForShadowCam(cascade); };
     if (irr_driver->hasARB_draw_indirect())
         ShadowPassCmd::getInstance()->Offset[cascade][Mat] = CommandBufferOffset; // Store command buffer offset
-    FillInstances(MeshForShadowPass[cascade][Mat], InstancedList, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, PolyCount);
+    FillInstances(MeshForShadowPass[cascade][Mat], InstancedList, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, PolyCount, shadowculling);
     if (UserConfigParams::m_azdo)
         ShadowPassCmd::getInstance()->Size[cascade][Mat] = CommandBufferOffset - ShadowPassCmd::getInstance()->Offset[cascade][Mat];
 }
@@ -453,9 +427,10 @@ template<MeshMaterial Mat> static void
 GenDrawCallsGrass(unsigned cascade, std::vector<GLMesh *> &InstancedList,
 InstanceData *InstanceBuffer, DrawElementsIndirectCommand *CommandBuffer, size_t &InstanceBufferOffset, size_t &CommandBufferOffset, const core::vector3df &dir, size_t &PolyCount)
 {
+    std::function<bool(const scene::ISceneNode *)> shadowculling = [&](const scene::ISceneNode *nd) {return dynamic_cast<const STKMeshCommon*>(nd)->isCulledForShadowCam(cascade); };
     if (irr_driver->hasARB_draw_indirect())
         ShadowPassCmd::getInstance()->Offset[cascade][Mat] = CommandBufferOffset; // Store command buffer offset
-    FillInstancesGrass(MeshForShadowPass[cascade][Mat], InstancedList, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, dir, PolyCount);
+    FillInstancesGrass(MeshForShadowPass[cascade][Mat], InstancedList, InstanceBuffer, CommandBuffer, InstanceBufferOffset, CommandBufferOffset, dir, PolyCount, shadowculling);
     if (UserConfigParams::m_azdo)
         ShadowPassCmd::getInstance()->Size[cascade][Mat] = CommandBufferOffset - ShadowPassCmd::getInstance()->Offset[cascade][Mat];
 }
@@ -493,7 +468,20 @@ void IrrDriver::PrepareDrawCalls(scene::ICameraSceneNode *camnode)
     DeferredUpdate.clear();
     core::list<scene::ISceneNode*> List = m_scene_manager->getRootSceneNode()->getChildren();
 
-    parseSceneManager(List, ImmediateDrawList::getInstance(), camnode, m_shadow_camnodes, m_suncam);
+    parseSceneManager(List, ImmediateDrawList::getInstance(), camnode);
+
+#pragma omp parallel for
+    for (int i = 0; i < (int)DeferredUpdate.size(); i++)
+    {
+        scene::ISceneNode *node = dynamic_cast<scene::ISceneNode *>(DeferredUpdate[i]);
+        DeferredUpdate[i]->setCulledForPlayerCam(isCulled(camnode, node));
+        DeferredUpdate[i]->setCulledForRSMCam(isCulled(m_suncam, node));
+        DeferredUpdate[i]->setCulledForShadowCam(0, isCulled(m_shadow_camnodes[0], node));
+        DeferredUpdate[i]->setCulledForShadowCam(1, isCulled(m_shadow_camnodes[1], node));
+        DeferredUpdate[i]->setCulledForShadowCam(2, isCulled(m_shadow_camnodes[2], node));
+        DeferredUpdate[i]->setCulledForShadowCam(3, isCulled(m_shadow_camnodes[3], node));
+    }
+
     // Add a 1 s timeout
     if (!m_sync)
         m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
@@ -553,6 +541,8 @@ void IrrDriver::PrepareDrawCalls(scene::ICameraSceneNode *camnode)
     size_t SolidPoly = 0, ShadowPoly = 0, MiscPoly = 0;
 
     PROFILER_PUSH_CPU_MARKER("- Draw Command upload", 0xFF, 0x0, 0xFF);
+
+    auto playercamculling = [](const scene::ISceneNode *nd) {return dynamic_cast<const STKMeshCommon*>(nd)->isCulledForPlayerCam(); };
 #pragma omp parallel sections
     {
 #pragma omp section
@@ -566,34 +556,35 @@ void IrrDriver::PrepareDrawCalls(scene::ICameraSceneNode *camnode)
                 CmdBuffer = (DrawElementsIndirectCommand*)glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0, 10000 * sizeof(DrawElementsIndirectCommand), GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
             }
 
+
             // Default Material
             SolidPassCmd::getInstance()->Offset[MAT_DEFAULT] = current_cmd;
-            FillInstances(MeshForSolidPass[MAT_DEFAULT], ListInstancedMatDefault::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly);
+            FillInstances(MeshForSolidPass[MAT_DEFAULT], ListInstancedMatDefault::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly, playercamculling);
             SolidPassCmd::getInstance()->Size[MAT_DEFAULT] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_DEFAULT];
             // Alpha Ref
             SolidPassCmd::getInstance()->Offset[MAT_ALPHA_REF] = current_cmd;
-            FillInstances(MeshForSolidPass[MAT_ALPHA_REF], ListInstancedMatAlphaRef::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly);
+            FillInstances(MeshForSolidPass[MAT_ALPHA_REF], ListInstancedMatAlphaRef::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly, playercamculling);
             SolidPassCmd::getInstance()->Size[MAT_ALPHA_REF] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_ALPHA_REF];
             // Unlit
             SolidPassCmd::getInstance()->Offset[MAT_UNLIT] = current_cmd;
-            FillInstances(MeshForSolidPass[MAT_UNLIT], ListInstancedMatUnlit::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly);
+            FillInstances(MeshForSolidPass[MAT_UNLIT], ListInstancedMatUnlit::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly, playercamculling);
             SolidPassCmd::getInstance()->Size[MAT_UNLIT] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_UNLIT];
             // Spheremap
             SolidPassCmd::getInstance()->Offset[MAT_SPHEREMAP] = current_cmd;
-            FillInstances(MeshForSolidPass[MAT_SPHEREMAP], ListInstancedMatSphereMap::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly);
+            FillInstances(MeshForSolidPass[MAT_SPHEREMAP], ListInstancedMatSphereMap::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly, playercamculling);
             SolidPassCmd::getInstance()->Size[MAT_SPHEREMAP] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_SPHEREMAP];
             // Detail
             SolidPassCmd::getInstance()->Offset[MAT_DETAIL] = current_cmd;
-            FillInstances(MeshForSolidPass[MAT_DETAIL], ListInstancedMatDetails::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly);
+            FillInstances(MeshForSolidPass[MAT_DETAIL], ListInstancedMatDetails::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly, playercamculling);
             SolidPassCmd::getInstance()->Size[MAT_DETAIL] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_DETAIL];
             // Normal Map
             SolidPassCmd::getInstance()->Offset[MAT_NORMAL_MAP] = current_cmd;
-            FillInstances(MeshForSolidPass[MAT_NORMAL_MAP], ListInstancedMatNormalMap::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly);
+            FillInstances(MeshForSolidPass[MAT_NORMAL_MAP], ListInstancedMatNormalMap::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, SolidPoly, playercamculling);
             SolidPassCmd::getInstance()->Size[MAT_NORMAL_MAP] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_NORMAL_MAP];
 
             // Grass
             SolidPassCmd::getInstance()->Offset[MAT_GRASS] = current_cmd;
-            FillInstancesGrass(MeshForSolidPass[MAT_GRASS], ListInstancedMatGrass::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, windDir, SolidPoly);
+            FillInstancesGrass(MeshForSolidPass[MAT_GRASS], ListInstancedMatGrass::getInstance()->SolidPass, InstanceBuffer, CmdBuffer, offset, current_cmd, windDir, SolidPoly, playercamculling);
             SolidPassCmd::getInstance()->Size[MAT_GRASS] = current_cmd - SolidPassCmd::getInstance()->Offset[MAT_GRASS];
 
             if (!irr_driver->hasBufferStorageExtension())
@@ -621,7 +612,7 @@ void IrrDriver::PrepareDrawCalls(scene::ICameraSceneNode *camnode)
             auto It = MeshForGlowPass.begin(), E = MeshForGlowPass.end();
             for (; It != E; ++It)
             {
-                FillInstancesGlow_impl(It->second, GlowInstanceBuffer, GlowCmdBuffer, offset, current_cmd);
+                FillInstancesGlow_impl(It->second, GlowInstanceBuffer, GlowCmdBuffer, offset, current_cmd, playercamculling);
                 if (!UserConfigParams::m_azdo)
                     ListInstancedGlow::getInstance()->push_back(It->second.front().first);
             }
@@ -673,6 +664,7 @@ void IrrDriver::PrepareDrawCalls(scene::ICameraSceneNode *camnode)
         }
 #pragma omp section
         {
+            auto rsmcamculling = [](const scene::ISceneNode *nd) {return dynamic_cast<const STKMeshCommon*>(nd)->isCulledForRSMCam(); };
             size_t offset = 0, current_cmd = 0;
             if (!irr_driver->hasBufferStorageExtension())
             {
@@ -684,23 +676,23 @@ void IrrDriver::PrepareDrawCalls(scene::ICameraSceneNode *camnode)
 
             // Default Material
             RSMPassCmd::getInstance()->Offset[MAT_DEFAULT] = current_cmd;
-            FillInstances(MeshForRSMPass[MAT_DEFAULT], ListInstancedMatDefault::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly);
+            FillInstances(MeshForRSMPass[MAT_DEFAULT], ListInstancedMatDefault::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly, rsmcamculling);
             RSMPassCmd::getInstance()->Size[MAT_DEFAULT] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_DEFAULT];
             // Alpha Ref
             RSMPassCmd::getInstance()->Offset[MAT_ALPHA_REF] = current_cmd;
-            FillInstances(MeshForRSMPass[MAT_ALPHA_REF], ListInstancedMatAlphaRef::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly);
+            FillInstances(MeshForRSMPass[MAT_ALPHA_REF], ListInstancedMatAlphaRef::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly, rsmcamculling);
             RSMPassCmd::getInstance()->Size[MAT_ALPHA_REF] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_ALPHA_REF];
             // Unlit
             RSMPassCmd::getInstance()->Offset[MAT_UNLIT] = current_cmd;
-            FillInstances(MeshForRSMPass[MAT_UNLIT], ListInstancedMatUnlit::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly);
+            FillInstances(MeshForRSMPass[MAT_UNLIT], ListInstancedMatUnlit::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly, rsmcamculling);
             RSMPassCmd::getInstance()->Size[MAT_UNLIT] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_UNLIT];
             // Detail
             RSMPassCmd::getInstance()->Offset[MAT_DETAIL] = current_cmd;
-            FillInstances(MeshForRSMPass[MAT_DETAIL], ListInstancedMatDetails::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly);
+            FillInstances(MeshForRSMPass[MAT_DETAIL], ListInstancedMatDetails::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly, rsmcamculling);
             RSMPassCmd::getInstance()->Size[MAT_DETAIL] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_DETAIL];
             // Normal Map
             RSMPassCmd::getInstance()->Offset[MAT_NORMAL_MAP] = current_cmd;
-            FillInstances(MeshForRSMPass[MAT_NORMAL_MAP], ListInstancedMatNormalMap::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly);
+            FillInstances(MeshForRSMPass[MAT_NORMAL_MAP], ListInstancedMatNormalMap::getInstance()->RSM, RSMInstanceBuffer, RSMCmdBuffer, offset, current_cmd, MiscPoly, rsmcamculling);
             RSMPassCmd::getInstance()->Size[MAT_NORMAL_MAP] = current_cmd - RSMPassCmd::getInstance()->Offset[MAT_NORMAL_MAP];
 
             if (!irr_driver->hasBufferStorageExtension())