diff options
author | Florian Bruhin <me@the-compiler.org> | 2021-03-17 21:01:20 +0100 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2021-03-17 21:02:40 +0100 |
commit | 3309ee65ede64286eb231c9203696b736ff7bcf3 (patch) | |
tree | 27e12fac68f23001c2bca6484c719ed46706a823 /qutebrowser/utils | |
parent | ec919b0f790e2290fb13459ed9043fcb5708143e (diff) | |
download | qutebrowser-3309ee65ede64286eb231c9203696b736ff7bcf3.tar.gz qutebrowser-3309ee65ede64286eb231c9203696b736ff7bcf3.zip |
Drop libgl workaround entirely
Diffstat (limited to 'qutebrowser/utils')
-rw-r--r-- | qutebrowser/utils/utils.py | 15 | ||||
-rw-r--r-- | qutebrowser/utils/version.py | 3 |
2 files changed, 0 insertions, 18 deletions
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py index 03a3c7842..afc4c4f8d 100644 --- a/qutebrowser/utils/utils.py +++ b/qutebrowser/utils/utils.py @@ -32,8 +32,6 @@ import functools import contextlib import shlex import mimetypes -import ctypes -import ctypes.util from typing import (Any, Callable, IO, Iterator, Optional, Sequence, Tuple, Type, Union, TypeVar, TYPE_CHECKING) @@ -753,19 +751,6 @@ def ceil_log(number: int, base: int) -> int: return result -def libgl_workaround() -> None: - """Work around QOpenGLShaderProgram issues, especially for Nvidia. - - See https://bugs.launchpad.net/ubuntu/+source/python-qt4/+bug/941826 - """ - if os.environ.get('QUTE_SKIP_LIBGL_WORKAROUND'): - return - - libgl = ctypes.util.find_library("GL") - if libgl is not None: # pragma: no branch - ctypes.CDLL(libgl, mode=ctypes.RTLD_GLOBAL) - - def parse_duration(duration: str) -> int: """Parse duration in format XhYmZs into milliseconds duration.""" if duration.isdigit(): diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index a1b8e6c72..97b286fba 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -882,9 +882,6 @@ def opengl_info() -> Optional[OpenGLInfo]: # pragma: no cover """ assert QApplication.instance() - # Some setups can segfault in here if we don't do this. - utils.libgl_workaround() - override = os.environ.get('QUTE_FAKE_OPENGL') if override is not None: log.init.debug("Using override {}".format(override)) |