From 8bb7e1ce8b58925f5788c49d035735962fbafbcc Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 12 Jan 2025 11:42:06 -0500 Subject: [PATCH] Cleanup logic for GL fetching in glfx.py I feel like this codepath should have been removed in https://github.com/mcfletch/pyopengl/commit/b4e6cc6ede33166419f5bd495a556be8511435ad But I guess holdovers are easy --- OpenGL/platform/glx.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/OpenGL/platform/glx.py b/OpenGL/platform/glx.py index 99c1ca8a..9d1a5815 100644 --- a/OpenGL/platform/glx.py +++ b/OpenGL/platform/glx.py @@ -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):