summaryrefslogtreecommitdiff
path: root/src/silx/gui/_glutils/gl.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/silx/gui/_glutils/gl.py')
-rw-r--r--src/silx/gui/_glutils/gl.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/silx/gui/_glutils/gl.py b/src/silx/gui/_glutils/gl.py
index 608d9ce..d33cf49 100644
--- a/src/silx/gui/_glutils/gl.py
+++ b/src/silx/gui/_glutils/gl.py
@@ -1,4 +1,3 @@
-# coding: utf-8
# /*##########################################################################
#
# Copyright (c) 2014-2017 European Synchrotron Radiation Facility
@@ -64,7 +63,7 @@ except NameError:
GLchar = c_char
-def testGL():
+def testGL() -> bool:
"""Test if required OpenGL version and extensions are available.
This MUST be run with an active OpenGL context.
@@ -72,18 +71,20 @@ def testGL():
version = glGetString(GL_VERSION).split()[0] # get version number
major, minor = int(version[0]), int(version[2])
if major < 2 or (major == 2 and minor < 1):
- raise RuntimeError(
- "Requires at least OpenGL version 2.1, running with %s" % version)
+ _logger.error("OpenGL version >=2.1 required, running with %s" % version)
+ return False
from OpenGL.GL.ARB.framebuffer_object import glInitFramebufferObjectARB
from OpenGL.GL.ARB.texture_rg import glInitTextureRgARB
if not glInitFramebufferObjectARB():
- raise RuntimeError(
- "OpenGL GL_ARB_framebuffer_object extension required !")
+ _logger.error("OpenGL GL_ARB_framebuffer_object extension required!")
+ return False
if not glInitTextureRgARB():
- raise RuntimeError("OpenGL GL_ARB_texture_rg extension required !")
+ _logger.error("OpenGL GL_ARB_texture_rg extension required!")
+ return False
+ return True
# Additional setup