From ceb680ad01c306fd8b9637a8684bd3bb0e0bf6bb Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Thu, 12 Jan 2023 09:49:35 +0100 Subject: [PATCH] Fixed detection of support for texture compression and added information about texture compression and mipmap generation into system info data --- src/slic3r/GUI/OpenGLManager.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/OpenGLManager.cpp b/src/slic3r/GUI/OpenGLManager.cpp index 0366031d2..a1d585254 100644 --- a/src/slic3r/GUI/OpenGLManager.cpp +++ b/src/slic3r/GUI/OpenGLManager.cpp @@ -199,6 +199,8 @@ std::string OpenGLManager::GLInfo::to_string(bool for_github) const out << b_start << "Vendor: " << b_end << m_vendor << line_end; out << b_start << "Renderer: " << b_end << m_renderer << line_end; out << b_start << "GLSL version: " << b_end << m_glsl_version << line_end; + out << b_start << "Textures compression: " << b_end << (are_compressed_textures_supported() ? "Enabled" : "Disabled") << line_end; + out << b_start << "Textures mipmap generation: " << b_end << (use_manually_generated_mipmaps() ? "Manual" : "Automatic") << line_end; { #if ENABLE_GL_CORE_PROFILE @@ -347,17 +349,11 @@ bool OpenGLManager::init_gl() #endif // ENABLE_GL_CORE_PROFILE m_gl_initialized = true; -#if ENABLE_GL_CORE_PROFILE - if (GLEW_ARB_texture_compression) - s_compressed_textures_supported = true; - else - s_compressed_textures_supported = false; -#else + if (GLEW_EXT_texture_compression_s3tc) s_compressed_textures_supported = true; else s_compressed_textures_supported = false; -#endif // ENABLE_GL_CORE_PROFILE if (GLEW_ARB_framebuffer_object) s_framebuffers_type = EFramebufferType::Arb;