Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid assertion failure in wxGLContext ctor

Browse Source 
Check for NULL pointers directly rather than making assumptions based
on a version check.
See #18155
This commit is contained in:
Paul Cornett
2018-06-28 10:38:14 -07:00
parent a824ee092d
commit 32db375e46
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/unix/glx11.cpp
View File

@@ -494,9 +494,13 @@ wxGLContext::wxGLContext(wxGLCanvas *win,
GLXContext tempContext = glXCreateContext(dpy, vi, NULL, x11Direct); GLXContext tempContext = glXCreateContext(dpy, vi, NULL, x11Direct);
wxCHECK_RET(tempContext, "glXCreateContext failed" ); wxCHECK_RET(tempContext, "glXCreateContext failed" );
PFNGLXCREATECONTEXTATTRIBSARBPROC wx_glXCreateContextAttribsARB GLXFBConfig* const fbc = win->GetGLXFBConfig();
= (PFNGLXCREATECONTEXTATTRIBSARBPROC) PFNGLXCREATECONTEXTATTRIBSARBPROC wx_glXCreateContextAttribsARB = 0;
glXGetProcAddress((GLubyte *)"glXCreateContextAttribsARB"); if (fbc)
{
wx_glXCreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC)
glXGetProcAddress((GLubyte*)"glXCreateContextAttribsARB");
}
glXDestroyContext( dpy, tempContext ); glXDestroyContext( dpy, tempContext );
@@ -514,9 +518,6 @@ wxGLContext::wxGLContext(wxGLCanvas *win,
if ( wx_glXCreateContextAttribsARB ) if ( wx_glXCreateContextAttribsARB )
{ {
GLXFBConfig *fbc = win->GetGLXFBConfig();
wxCHECK_RET( fbc, "Invalid GLXFBConfig for OpenGL" );
m_glContext = wx_glXCreateContextAttribsARB( dpy, fbc[0], m_glContext = wx_glXCreateContextAttribsARB( dpy, fbc[0],
other ? other->m_glContext : None, other ? other->m_glContext : None,
x11Direct, contextAttribs ); x11Direct, contextAttribs );
@@ -534,11 +535,8 @@ wxGLContext::wxGLContext(wxGLCanvas *win,
if ( !g_ctxErrorOccurred && !m_glContext ) if ( !g_ctxErrorOccurred && !m_glContext )
{ {
// Old-way, without context atributes. Up to GL 2.1 // Old-way, without context atributes. Up to GL 2.1
if ( wxGLCanvas::GetGLXVersion() >= 13 ) if (fbc)
{ {
GLXFBConfig *fbc = win->GetGLXFBConfig();
wxCHECK_RET( fbc, "Invalid GLXFBConfig for OpenGL" );
m_glContext = glXCreateNewContext( dpy, fbc[0], renderType, m_glContext = glXCreateNewContext( dpy, fbc[0], renderType,
other ? other->m_glContext : None, other ? other->m_glContext : None,
x11Direct ); x11Direct );