diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 7387a76762..3af81068d7 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -123,14 +123,14 @@ void GLCanvas3D::LayersEditing::init() { glsafe(::glGenTextures(1, (GLuint*)&m_z_texture_id)); glsafe(::glBindTexture(GL_TEXTURE_2D, m_z_texture_id)); -#if ENABLE_GL_CORE_PROFILE +#if _WIN32 && ENABLE_GL_CORE_PROFILE if (!OpenGLManager::get_gl_info().is_core_profile() || !OpenGLManager::get_gl_info().is_mesa()) { -#endif // ENABLE_GL_CORE_PROFILE +#endif // _WIN32 && ENABLE_GL_CORE_PROFILE glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP)); glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP)); -#if ENABLE_GL_CORE_PROFILE +#if _WIN32 && ENABLE_GL_CORE_PROFILE } -#endif // ENABLE_GL_CORE_PROFILE +#endif // _WIN32 && ENABLE_GL_CORE_PROFILE glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)); glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST)); glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 1)); diff --git a/src/slic3r/GUI/OpenGLManager.cpp b/src/slic3r/GUI/OpenGLManager.cpp index 743ee8a6de..14336931b9 100644 --- a/src/slic3r/GUI/OpenGLManager.cpp +++ b/src/slic3r/GUI/OpenGLManager.cpp @@ -72,10 +72,12 @@ bool OpenGLManager::GLInfo::is_core_profile() const return !GLEW_ARB_compatibility; } +#if _WIN32 bool OpenGLManager::GLInfo::is_mesa() const { return boost::icontains(m_version, "mesa"); } +#endif // _WIN32 #endif // ENABLE_GL_CORE_PROFILE int OpenGLManager::GLInfo::get_max_tex_size() const diff --git a/src/slic3r/GUI/OpenGLManager.hpp b/src/slic3r/GUI/OpenGLManager.hpp index 892a1ac3f1..6f3b990651 100644 --- a/src/slic3r/GUI/OpenGLManager.hpp +++ b/src/slic3r/GUI/OpenGLManager.hpp @@ -45,7 +45,9 @@ public: #if ENABLE_GL_CORE_PROFILE bool is_core_profile() const; +#if _WIN32 bool is_mesa() const; +#endif // _WIN32 #endif // ENABLE_OPENGL_ES int get_max_tex_size() const;