ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION set as default

1 files changed, 0 insertions, 28 deletions

diff --git a/src/slic3r/GUI/GLCanvas3DManager.hpp b/src/slic3r/GUI/GLCanvas3DManager.hpp
index 3ad30411c..e6e12ca5d 100644
--- a/src/slic3r/GUI/GLCanvas3DManager.hpp
+++ b/src/slic3r/GUI/GLCanvas3DManager.hpp
@@ -29,7 +29,6 @@ struct Camera;
 
 class GLCanvas3DManager
 {
-#if ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
 public:
     class GLInfo
     {
@@ -61,26 +60,8 @@ public:
     private:
         void detect() const;
     };
-#else
-    struct GLInfo
-    {
-        std::string version;
-        std::string glsl_version;
-        std::string vendor;
-        std::string renderer;
-
-        GLInfo();
-
-        void detect();
-        bool is_version_greater_or_equal_to(unsigned int major, unsigned int minor) const;
-
-        std::string to_string(bool format_as_html, bool extensions) const;
-    };
-#endif // ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
 
-#if ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
 private:
-#endif // ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
     enum EMultisampleState : unsigned char
     {
         MS_Unknown,
@@ -92,11 +73,7 @@ private:
 
     CanvasesMap m_canvases;
     wxGLContext* m_context;
-#if ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
     static GLInfo s_gl_info;
-#else
-    GLInfo m_gl_info;
-#endif // ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
     bool m_gl_initialized;
     bool m_use_legacy_opengl;
     bool m_use_VBOs;
@@ -116,9 +93,6 @@ public:
     unsigned int count() const;
 
     void init_gl();
-#if !ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
-    std::string get_gl_info(bool format_as_html, bool extensions) const;
-#endif // !ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
 
     bool init(wxGLCanvas* canvas);
 
@@ -131,9 +105,7 @@ public:
 
     static wxGLCanvas* create_wxglcanvas(wxWindow *parent);
 
-#if ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
     static const GLInfo& get_gl_info() { return s_gl_info; }
-#endif // ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
 
 private:
     CanvasesMap::iterator do_get_canvas(wxGLCanvas* canvas);