|
Lines 12-18
Link Here
|
| 12 |
from xpra.os_util import POSIX, OSX, bytestostr |
12 |
from xpra.os_util import POSIX, OSX, bytestostr |
| 13 |
from xpra.log import Logger, CaptureHandler |
13 |
from xpra.log import Logger, CaptureHandler |
| 14 |
from xpra.client.gl.gl_drivers import WHITELIST, GREYLIST, VERSION_REQ, BLACKLIST, OpenGLFatalError |
14 |
from xpra.client.gl.gl_drivers import WHITELIST, GREYLIST, VERSION_REQ, BLACKLIST, OpenGLFatalError |
| 15 |
from xpra.sound.gstreamer_util import force_enabled |
|
|
| 16 |
|
15 |
|
| 17 |
log = Logger("opengl") |
16 |
log = Logger("opengl") |
| 18 |
|
17 |
|
|
Lines 130-136
Link Here
|
| 130 |
from OpenGL.GL import GL_VERSION, GL_EXTENSIONS |
129 |
from OpenGL.GL import GL_VERSION, GL_EXTENSIONS |
| 131 |
from OpenGL.GL import glGetString, glGetIntegerv |
130 |
from OpenGL.GL import glGetString, glGetIntegerv |
| 132 |
gl_version_str = glGetString(GL_VERSION) |
131 |
gl_version_str = glGetString(GL_VERSION) |
| 133 |
if gl_version_str is None and not force_enabled: |
132 |
if gl_version_str is None and not force_enable: |
| 134 |
raise_fatal_error("OpenGL version is missing - cannot continue") |
133 |
raise_fatal_error("OpenGL version is missing - cannot continue") |
| 135 |
return props |
134 |
return props |
| 136 |
#b'4.6.0 NVIDIA 440.59' -> ['4', '6', '0 NVIDIA...'] |
135 |
#b'4.6.0 NVIDIA 440.59' -> ['4', '6', '0 NVIDIA...'] |
|
Lines 147-153
Link Here
|
| 147 |
props["opengl"] = gl_major, gl_minor |
146 |
props["opengl"] = gl_major, gl_minor |
| 148 |
MIN_VERSION = (1,1) |
147 |
MIN_VERSION = (1,1) |
| 149 |
if (gl_major, gl_minor) < MIN_VERSION: |
148 |
if (gl_major, gl_minor) < MIN_VERSION: |
| 150 |
if not force_enabled: |
149 |
if not force_enable: |
| 151 |
raise_fatal_error("OpenGL output requires version %s or greater, not %s.%s" % |
150 |
raise_fatal_error("OpenGL output requires version %s or greater, not %s.%s" % |
| 152 |
(".".join([str(x) for x in MIN_VERSION]), gl_major, gl_minor)) |
151 |
(".".join([str(x) for x in MIN_VERSION]), gl_major, gl_minor)) |
| 153 |
return props |
152 |
return props |
