Commit 9472c596 authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Merge branch 'mnt/gl-init' into 'master'

MNT: Don't attempt to request core GL profile on GTK2 wxpy builds.

See merge request fsl/fsleyes/fsleyes!324
parents 849d8fd9 a30493fa
......@@ -10,6 +10,18 @@ This document contains the ``fsleyes`` release history in reverse
chronological order.
1.4.3 (Tuesdsay 17th May 2022)
------------------------------
Fixed
^^^^^
* Changed GL initialisation logic so that it is compatible with newer GTK2/GLX
versions of wxPython (!324).
1.4.2 (Friday 13th May 2022)
----------------------------
......
......@@ -275,7 +275,6 @@ def _selectPyOpenGLPlatform():
os.environ['PYOPENGL_PLATFORM'] = 'egl'
_selectPyOpenGLPlatform()
......@@ -918,8 +917,10 @@ class GLContext:
# with no arguments, and just hope.
candidates = []
wxver = fwidgets.wxVersion()
wxplat = fwidgets.wxPlatform()
if wxver is not None and \
if wxplat in (fwidgets.WX_GTK3, fwidgets.WX_MAC_COCOA) and \
wxver is not None and \
fslversion.compareVersions(wxver, '4.1.1') >= 0:
# Request 3.3 core profile unless caller
# has requested an older version.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment