From af8e86988063f3beb9735ce50cdb6ad4df0563c7 Mon Sep 17 00:00:00 2001
From: Enrico Turri <enricoturri@seznam.cz>
Date: Mon, 4 Jun 2018 14:28:59 +0200
Subject: [PATCH] 3rd attempt to fix opengl initialization on linux

---
 lib/Slic3r/GUI/3DScene.pm               | 2 +-
 xs/src/slic3r/GUI/3DScene.cpp           | 5 +++++
 xs/src/slic3r/GUI/3DScene.hpp           | 1 +
 xs/src/slic3r/GUI/GLCanvas3D.cpp        | 5 +++++
 xs/src/slic3r/GUI/GLCanvas3D.hpp        | 1 +
 xs/src/slic3r/GUI/GLCanvas3DManager.cpp | 6 ++++++
 xs/src/slic3r/GUI/GLCanvas3DManager.hpp | 1 +
 xs/xsp/GUI_3DScene.xsp                  | 8 ++++++++
 8 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/lib/Slic3r/GUI/3DScene.pm b/lib/Slic3r/GUI/3DScene.pm
index e787fb5a1..b8a45dd46 100644
--- a/lib/Slic3r/GUI/3DScene.pm
+++ b/lib/Slic3r/GUI/3DScene.pm
@@ -2194,7 +2194,7 @@ sub load_object {
     $instance_idxs ||= [0..$#{$model_object->instances}];
 #==============================================================================================================================
     my $volume_indices = $self->volumes->load_object(
-        $model_object, $obj_idx, $instance_idxs, $self->color_by, $self->select_by, $self->drag_by, $useVBOs);
+        $model_object, $obj_idx, $instance_idxs, $self->color_by, $self->select_by, $self->drag_by, $useVBOs && Slic3r::GUI::_3DScene::is_shader_enabled($self));
 #    my $volume_indices = $self->volumes->load_object(
 #        $model_object, $obj_idx, $instance_idxs, $self->color_by, $self->select_by, $self->drag_by,
 #        $self->UseVBOs);
diff --git a/xs/src/slic3r/GUI/3DScene.cpp b/xs/src/slic3r/GUI/3DScene.cpp
index fc609caac..e03ed3cc3 100644
--- a/xs/src/slic3r/GUI/3DScene.cpp
+++ b/xs/src/slic3r/GUI/3DScene.cpp
@@ -1839,6 +1839,11 @@ bool _3DScene::is_layers_editing_allowed(wxGLCanvas* canvas)
     return s_canvas_mgr.is_layers_editing_allowed(canvas);
 }
 
+bool _3DScene::is_shader_enabled(wxGLCanvas* canvas)
+{
+    return s_canvas_mgr.is_shader_enabled(canvas);
+}
+
 void _3DScene::enable_layers_editing(wxGLCanvas* canvas, bool enable)
 {
     s_canvas_mgr.enable_layers_editing(canvas, enable);
diff --git a/xs/src/slic3r/GUI/3DScene.hpp b/xs/src/slic3r/GUI/3DScene.hpp
index 266c48ce5..06500cf33 100644
--- a/xs/src/slic3r/GUI/3DScene.hpp
+++ b/xs/src/slic3r/GUI/3DScene.hpp
@@ -571,6 +571,7 @@ public:
 
     static bool is_layers_editing_enabled(wxGLCanvas* canvas);
     static bool is_layers_editing_allowed(wxGLCanvas* canvas);
+    static bool is_shader_enabled(wxGLCanvas* canvas);
 
     static void enable_layers_editing(wxGLCanvas* canvas, bool enable);
     static void enable_warning_texture(wxGLCanvas* canvas, bool enable);
diff --git a/xs/src/slic3r/GUI/GLCanvas3D.cpp b/xs/src/slic3r/GUI/GLCanvas3D.cpp
index 72d27a00a..8a4bdd9a2 100644
--- a/xs/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/xs/src/slic3r/GUI/GLCanvas3D.cpp
@@ -1175,6 +1175,11 @@ bool GLCanvas3D::is_layers_editing_allowed() const
     return m_layers_editing.is_allowed();
 }
 
+bool GLCanvas3D::is_shader_enabled() const
+{
+    return m_shader_enabled;
+}
+
 void GLCanvas3D::enable_layers_editing(bool enable)
 {
     m_layers_editing.set_enabled(enable);
diff --git a/xs/src/slic3r/GUI/GLCanvas3D.hpp b/xs/src/slic3r/GUI/GLCanvas3D.hpp
index f71827327..cb6ed64e9 100644
--- a/xs/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/xs/src/slic3r/GUI/GLCanvas3D.hpp
@@ -359,6 +359,7 @@ public:
 
     bool is_layers_editing_enabled() const;
     bool is_layers_editing_allowed() const;
+    bool is_shader_enabled() const;
 
     void enable_layers_editing(bool enable);
     void enable_warning_texture(bool enable);
diff --git a/xs/src/slic3r/GUI/GLCanvas3DManager.cpp b/xs/src/slic3r/GUI/GLCanvas3DManager.cpp
index 85caa2476..1dd679c0c 100644
--- a/xs/src/slic3r/GUI/GLCanvas3DManager.cpp
+++ b/xs/src/slic3r/GUI/GLCanvas3DManager.cpp
@@ -352,6 +352,12 @@ bool GLCanvas3DManager::is_layers_editing_allowed(wxGLCanvas* canvas) const
     return (it != m_canvases.end()) ? it->second->is_layers_editing_allowed() : false;
 }
 
+bool GLCanvas3DManager::is_shader_enabled(wxGLCanvas* canvas) const
+{
+    CanvasesMap::const_iterator it = _get_canvas(canvas);
+    return (it != m_canvases.end()) ? it->second->is_shader_enabled() : false;
+}
+
 void GLCanvas3DManager::enable_layers_editing(wxGLCanvas* canvas, bool enable)
 {
     CanvasesMap::iterator it = _get_canvas(canvas);
diff --git a/xs/src/slic3r/GUI/GLCanvas3DManager.hpp b/xs/src/slic3r/GUI/GLCanvas3DManager.hpp
index 1ebf39320..6739b03df 100644
--- a/xs/src/slic3r/GUI/GLCanvas3DManager.hpp
+++ b/xs/src/slic3r/GUI/GLCanvas3DManager.hpp
@@ -75,6 +75,7 @@ public:
 
     bool is_layers_editing_enabled(wxGLCanvas* canvas) const;
     bool is_layers_editing_allowed(wxGLCanvas* canvas) const;
+    bool is_shader_enabled(wxGLCanvas* canvas) const;
 
     void enable_layers_editing(wxGLCanvas* canvas, bool enable);
     void enable_warning_texture(wxGLCanvas* canvas, bool enable);
diff --git a/xs/xsp/GUI_3DScene.xsp b/xs/xsp/GUI_3DScene.xsp
index ac1ae1420..60c86eaa2 100644
--- a/xs/xsp/GUI_3DScene.xsp
+++ b/xs/xsp/GUI_3DScene.xsp
@@ -294,6 +294,14 @@ is_layers_editing_allowed(canvas)
     OUTPUT:
         RETVAL
 
+bool
+is_shader_enabled(canvas)
+        SV *canvas;
+    CODE:
+        RETVAL = _3DScene::is_shader_enabled((wxGLCanvas*)wxPli_sv_2_object(aTHX_ canvas, "Wx::GLCanvas"));
+    OUTPUT:
+        RETVAL
+
 void
 enable_layers_editing(canvas, enable)
         SV   *canvas;