diff -ur -X excl mythtvopengl11/libs/libmythtv/openglcontext.cpp mythtvopengl12/libs/libmythtv/openglcontext.cpp
|
old
|
new
|
|
| 287 | 287 | { |
| 288 | 288 | if (IsGLXSupported(1,3)) |
| 289 | 289 | { |
| 290 | | X11S(ok = glXMakeCurrent(m_display, |
| | 290 | X11S(ok = glXMakeContextCurrent(m_display, |
| | 291 | m_priv->m_glx_window, |
| 291 | 292 | m_priv->m_glx_window, |
| 292 | 293 | m_priv->m_glx_context)); |
| 293 | 294 | } |
| … |
… |
|
| 305 | 306 | m_lock_level--; |
| 306 | 307 | if (m_lock_level == 0) |
| 307 | 308 | { |
| 308 | | X11S(ok = glXMakeCurrent(m_display, None, NULL)); |
| | 309 | if (IsGLXSupported(1,3)) |
| | 310 | { |
| | 311 | X11S(ok = glXMakeContextCurrent(m_display, None, None, NULL)); |
| | 312 | } |
| | 313 | else |
| | 314 | { |
| | 315 | X11S(ok = glXMakeCurrent(m_display, None, NULL)); |
| | 316 | } |
| 309 | 317 | } |
| 310 | 318 | else if (m_lock_level < 0) |
| 311 | 319 | { |
