GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-17 11:35:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Using Semver to check minimum required OpenGL version

Browse Source
This commit is contained in:
Lukas Matena 2024-01-19 16:12:27 +01:00
parent 1832c833a1
commit 3cab0cbecb
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/PrusaSlicer.cpp
View File

@ -184,18 +184,14 @@ int CLI::run(int argc, char **argv)
it = std::find(m_actions.begin(), m_actions.end(), "opengl-version"); it = std::find(m_actions.begin(), m_actions.end(), "opengl-version");
if (it != m_actions.end()) { if (it != m_actions.end()) {
std::string opengl_version_str = m_config.opt_string("opengl-version"); const Semver opengl_minimum = Semver(3,2,0);
if (std::find(Slic3r::GUI::OpenGLVersions::core_str.begin(), Slic3r::GUI::OpenGLVersions::core_str.end(), opengl_version_str) == Slic3r::GUI::OpenGLVersions::core_str.end()) { const std::string opengl_version_str = m_config.opt_string("opengl-version");
boost::nowide::cerr << "Required OpenGL version " << opengl_version_str << " is invalid. Must be greater than or equal to 3.2" << std::endl; boost::optional<Semver> semver = Semver::parse(opengl_version_str);
opengl_version_str.clear(); if (semver.has_value() && (*semver) >= opengl_minimum ) {
} opengl_version.first = semver->maj();
opengl_version.second = semver->min();
if (!opengl_version_str.empty()) { } else
std::vector<std::string> tokens; boost::nowide::cerr << "Required OpenGL version " << opengl_version_str << " is invalid. Must be greater than or equal to " << opengl_minimum.to_string() << std::endl;
boost::split(tokens, opengl_version_str, boost::is_any_of("."), boost::token_compress_on);
opengl_version.first = std::stoi(tokens[0].c_str());
opengl_version.second = std::stoi(tokens[1].c_str());
}
start_gui = true; start_gui = true;
m_actions.erase(it); m_actions.erase(it);
} }

4
src/slic3r/GUI/GUI_Init.cpp
View File

@ -30,11 +30,7 @@
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {
const std::vector<std::string> OpenGLVersions::core_str = { "3.2", "3.3", "4.0", "4.1", "4.2", "4.3", "4.4", "4.5", "4.6" };
const std::vector<std::string> OpenGLVersions::precore_str = { "2.0", "2.1", "3.0", "3.1" };
const std::vector<std::pair<int, int>> OpenGLVersions::core = { {3,2}, {3,3}, {4,0}, {4,1}, {4,2}, {4,3}, {4,4}, {4,5}, {4,6} }; const std::vector<std::pair<int, int>> OpenGLVersions::core = { {3,2}, {3,3}, {4,0}, {4,1}, {4,2}, {4,3}, {4,4}, {4,5}, {4,6} };
const std::vector<std::pair<int, int>> OpenGLVersions::precore = { {2,0}, {2,1}, {3,0}, {3,1} };
int GUI_Run(GUI_InitParams &params) int GUI_Run(GUI_InitParams &params)
{ {

4
src/slic3r/GUI/GUI_Init.hpp
View File

@ -14,11 +14,7 @@ namespace GUI {
struct OpenGLVersions struct OpenGLVersions
{ {
static const std::vector<std::string> core_str;
static const std::vector<std::string> precore_str;
static const std::vector<std::pair<int, int>> core; static const std::vector<std::pair<int, int>> core;
static const std::vector<std::pair<int, int>> precore;
}; };
struct GUI_InitParams struct GUI_InitParams