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

Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate

Browse source
This commit is contained in:
Enrico Turri 2018-07-12 15:17:08 +02:00
commit 3839d26e9b
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
xs/src/slic3r/GUI/GLCanvas3DManager.cpp
View file

@ -91,17 +91,13 @@ std::string GLCanvas3DManager::GLInfo::to_string(bool format_as_html, bool exten
if (extensions)
{
out << h2_start << "Installed extensions:" << h2_end << line_end;
std::vector<std::string> extensions_list;
GLint num_extensions;
::glGetIntegerv(GL_NUM_EXTENSIONS, &num_extensions);
std::string extensions_str = (const char*)::glGetString(GL_EXTENSIONS);
boost::split(extensions_list, extensions_str, boost::is_any_of(" "), boost::token_compress_off);
for (GLint i = 0; i < num_extensions; ++i)
if (!extensions_list.empty())
{
const char* e = (const char*)::glGetStringi(GL_EXTENSIONS, i);
extensions_list.push_back(e);
}
out << h2_start << "Installed extensions:" << h2_end << line_end;
std::sort(extensions_list.begin(), extensions_list.end());
for (const std::string& ext : extensions_list)
@ -109,6 +105,7 @@ std::string GLCanvas3DManager::GLInfo::to_string(bool format_as_html, bool exten
out << ext << line_end;
}
}
}
return out.str();
}