Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup logic for GL fetching in glfx.py #134

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions OpenGL/platform/glx.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,13 @@ class GLXPlatform(baseplatform.BasePlatform):
# references to GL/GLU functions).
@baseplatform.lazy_property
def GL(self):
try:
for name in ('OpenGL', 'GL'):
lib = ctypesloader.loadLibrary(
ctypes.cdll, name, mode=ctypes.RTLD_GLOBAL
)
if lib:
return lib
raise ImportError("Unable to find an OpenGL or GL library")
except OSError as err:
try:
# libGL was the original name, older devices likely still need it...
return ctypesloader.loadLibrary(
ctypes.cdll, "GL", mode=ctypes.RTLD_GLOBAL
)
except OSError as err:
raise ImportError("Unable to load OpenGL library", *err.args)
for name in ('OpenGL', 'GL'):
lib = ctypesloader.loadLibrary(
ctypes.cdll, name, mode=ctypes.RTLD_GLOBAL
)
if lib is not None:
return lib
raise ImportError("Unable to find an OpenGL or GL library")

@baseplatform.lazy_property
def GLU(self):
Expand Down