diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-09-03 14:25:57 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-09-03 15:09:56 +0200 |
| commit | 6f5b639d4af0618cbb071a30a66aa5b9581f315c (patch) | |
| tree | e1c4e9ff12a083769b70a8a9a95f5b75817eee09 /vcl | |
| parent | create a 3.2 core context if supported in dbgutil mode (diff) | |
| download | core-6f5b639d4af0618cbb071a30a66aa5b9581f315c.tar.gz core-6f5b639d4af0618cbb071a30a66aa5b9581f315c.zip | |
don't create a core context if we need a legacy one
Change-Id: Ieb8a26e0495f537ca78898e6d49df2c1271537a0
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index b1efb89890e9..ffd0e284c151 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -487,16 +487,20 @@ bool OpenGLContext::ImplInit() #elif defined( UNX ) #if DBG_UTIL - int best_fbc = -1; - const SystemEnvData* sysData(m_pChildWindow->GetSystemData()); - GLXFBConfig* pFBC = getFBConfig(sysData, best_fbc); - int nContextAttribs[] = + if (!mbRequestLegacyContext) { - GLX_CONTEXT_MAJOR_VERSION_ARB, 3, - GLX_CONTEXT_MINOR_VERSION_ARB, 2, - None - }; - m_aGLWin.ctx = glXCreateContextAttribsARB(m_aGLWin.dpy, pFBC[best_fbc], 0, GL_TRUE, nContextAttribs); + int best_fbc = -1; + const SystemEnvData* sysData(m_pChildWindow->GetSystemData()); + GLXFBConfig* pFBC = getFBConfig(sysData, best_fbc); + int nContextAttribs[] = + { + GLX_CONTEXT_MAJOR_VERSION_ARB, 3, + GLX_CONTEXT_MINOR_VERSION_ARB, 2, + None + }; + m_aGLWin.ctx = glXCreateContextAttribsARB(m_aGLWin.dpy, pFBC[best_fbc], 0, GL_TRUE, nContextAttribs); + + } #endif if (!m_aGLWin.ctx) { |