AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check minor and major versions from GL_VERSION

Browse Source 
GL_MAJOR_VERSION is only supported on OpenGL 3.0+

Fixes #116
This commit is contained in:
David Vierra 2015-06-12 23:10:19 -10:00
parent c9076b2c53
commit 60c4026151
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mcedit2/util/qglcontext.py
View File

@ -5,6 +5,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
from OpenGL import GL
from PySide import QtOpenGL, QtGui
import logging
import re
log = logging.getLogger(__name__)
@ -39,10 +40,13 @@ def validateQGLContext(context):
# Qt 4.8.6 on OS X always returns (1, 0) for the QGLFormat's major and minor versions.
# (QTBUG-40415)
# Check GL_MAJOR_VERSION and GL_MINOR_VERSION instead.
major = GL.glGetInteger(GL.GL_MAJOR_VERSION)
minor = GL.glGetInteger(GL.GL_MINOR_VERSION)
# Check GL_VERSION instead.
version = GL.glGetString(GL.GL_VERSION)
match = re.match(r'^(\d+)\.(\d+)', version)
major, minor = match.groups()
major = int(major)
minor = int(minor)
detailedText = "Obtained a GL context with this format:\n"
detailedText += "Valid: %s\n" % (context.isValid(),)
@ -52,7 +56,7 @@ def validateQGLContext(context):
detailedText += "Double buffer: %s\n" % (actualFormat.doubleBuffer(), )
detailedText += "\n"
detailedText += "Driver info:\n"
detailedText += "GL_VERSION: %s (%s, %s)\n" % (GL.glGetString(GL.GL_VERSION), major, minor)
detailedText += "GL_VERSION: %s (%s, %s)\n" % (version, major, minor)
detailedText += "GL_VENDOR: %s\n" % GL.glGetString(GL.GL_VENDOR)
detailedText += "GL_RENDERER: %s\n" % GL.glGetString(GL.GL_RENDERER)