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

Fixed crashes on OpenGL < 2 due to printing null pointers returned

Browse source 
by glGetString().
This commit is contained in:
bubnikv 2017-03-31 15:29:34 +02:00
parent 7b5158f5f2
commit 8ac1d37b10
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xs/src/slic3r/GUI/GLShader.cpp
View file

@ -15,17 +15,24 @@ GLShader::~GLShader()
assert(shader_program_id == 0); assert(shader_program_id == 0);
} }
// A safe wrapper around glGetString to report a "N/A" string in case glGetString returns nullptr.
inline std::string gl_get_string_safe(GLenum param)
{
const char *value = (const char*)glGetString(param);
return std::string(value ? value : "N/A");
}
bool GLShader::load(const char *fragment_shader, const char *vertex_shader) bool GLShader::load(const char *fragment_shader, const char *vertex_shader)
{ {
std::string gl_version = (const char*)glGetString(GL_VERSION); std::string gl_version = gl_get_string_safe(GL_VERSION);
int major = atoi(gl_version.c_str()); int major = atoi(gl_version.c_str());
//int minor = atoi(gl_version.c_str() + gl_version.find('.') + 1); //int minor = atoi(gl_version.c_str() + gl_version.find('.') + 1);
if (major < 2) { if (major < 2) {
// Cannot create a shader object on OpenGL 1.x. // Cannot create a shader object on OpenGL 1.x.
// Form an error message. // Form an error message.
std::string gl_vendor = (const char*)glGetString(GL_VENDOR); std::string gl_vendor = gl_get_string_safe(GL_VENDOR);
std::string gl_renderer = (const char*)glGetString(GL_RENDERER); std::string gl_renderer = gl_get_string_safe(GL_RENDERER);
std::string glsl_version = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION); std::string glsl_version = gl_get_string_safe(GL_SHADING_LANGUAGE_VERSION);
last_error = "Your computer does not support OpenGL shaders.\n"; last_error = "Your computer does not support OpenGL shaders.\n";
#ifdef _WIN32 #ifdef _WIN32
if (gl_vendor == "Microsoft Corporation" && gl_renderer == "GDI Generic") { if (gl_vendor == "Microsoft Corporation" && gl_renderer == "GDI Generic") {