3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tech ENABLE_GL_CORE_PROFILE - Fix in generate_system_info_json()

Browse source 
Fixed conflicts during rebase with master
This commit is contained in:
enricoturri1966 2022-04-06 12:45:41 +02:00
parent 9dda2b0ed5
commit 172929259a
4 changed files with 42 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/SendSystemInfoDialog.cpp
View file

@ -55,8 +55,10 @@ static const std::string SEND_SYSTEM_INFO_DOMAIN = "prusa3d.com";
static const std::string SEND_SYSTEM_INFO_URL = "https://files." + SEND_SYSTEM_INFO_DOMAIN + "/wp-json/v1/ps";
#if !ENABLE_GL_CORE_PROFILE
// Declaration of a free function defined in OpenGLManager.cpp:
std::string gl_get_string_safe(GLenum param, const std::string& default_value);
#endif // !ENABLE_GL_CORE_PROFILE
// A dialog with the information text and buttons send/dont send/ask later.
@ -507,9 +509,13 @@ static std::string generate_system_info_json()
opengl_node.put("Vendor", OpenGLManager::get_gl_info().get_vendor());
opengl_node.put("Renderer", OpenGLManager::get_gl_info().get_renderer());
// Generate list of OpenGL extensions:
#if ENABLE_GL_CORE_PROFILE
std::vector<std::string> extensions_list = OpenGLManager::get_gl_info().get_extensions_list();
#else
std::string extensions_str = gl_get_string_safe(GL_EXTENSIONS, "");
std::vector<std::string> extensions_list;
boost::split(extensions_list, extensions_str, boost::is_any_of(" "), boost::token_compress_off);
#endif // ENABLE_GL_CORE_PROFILE
std::sort(extensions_list.begin(), extensions_list.end());
pt::ptree extensions_node;
for (const std::string& s : extensions_list) {