diff options
| author | Mat M <mathew1800@gmail.com> | 2019-02-11 09:23:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-11 09:23:52 -0500 |
| commit | 6b22693e6ee783989f92c8a09a4912f4123235d5 (patch) | |
| tree | 9b2b5e693776b49695bebcb4c8c62244d1827dd3 /Source/Core/Common/GL/GLInterface/GLX.cpp | |
| parent | eb11d045d7263e79bbf51049500a2ffd12bfb09b (diff) | |
| parent | ef3306e954a7bed23ce78d7f54d1667bf5ed535f (diff) | |
Merge pull request #7796 from stenzek/glx-context
GLContext: Fix shared context creation error on Mesa
Diffstat (limited to 'Source/Core/Common/GL/GLInterface/GLX.cpp')
| -rw-r--r-- | Source/Core/Common/GL/GLInterface/GLX.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/GL/GLInterface/GLX.cpp b/Source/Core/Common/GL/GLInterface/GLX.cpp index c2e4491ff5..78814db80f 100644 --- a/Source/Core/Common/GL/GLInterface/GLX.cpp +++ b/Source/Core/Common/GL/GLInterface/GLX.cpp @@ -146,12 +146,12 @@ bool GLContextGLX::Initialize(void* display_handle, void* window_handle, bool st s_glxError = false; m_context = glXCreateContextAttribs(m_display, m_fbconfig, 0, True, &context_attribs[0]); XSync(m_display, False); - m_attribs.insert(m_attribs.end(), context_attribs.begin(), context_attribs.end()); if (!m_context || s_glxError) continue; // Got a context. INFO_LOG(VIDEO, "Created a GLX context with version %d.%d", version.first, version.second); + m_attribs.insert(m_attribs.end(), context_attribs.begin(), context_attribs.end()); break; } } |