diff options
author | Sven Gothel <[email protected]> | 2012-02-25 19:21:43 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-02-25 19:21:43 +0100 |
commit | aee3a75ad87ef3da0652c6b917ccdfda63a1230d (patch) | |
tree | 087637968ca3e1a6bf81a92e7dfaaef2cceb9ada /src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java | |
parent | 9db2d90e5398e7b2abe45f0799a9d00729575b49 (diff) |
X11: Fix unavailable GLX (Server): Use fallback GraphicsConfigurationFactory (X11GLX -> X11)
- GraphicsConfigurationFactory.registerFactory(..) returns previous mapped GraphicsConfigurationFactory.
This allows daisy chaining of GraphicsConfigurationFactory, in case one is not suitable.
- X11GLXGraphicsConfigurationFactory:
- Store the previously mapped factory as fallback
- choose*Impl(): If GLX is not available, use fallback
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java')
-rw-r--r-- | src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java index 2ba067b02..55d0e9400 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java @@ -220,8 +220,8 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl { // NativeWindowFactory.getNullToolkitLock(), true); // own non-shared display connection, no locking sharedDevice.lock(); try { - if(!GLXUtil.isGLXAvailable(sharedDevice.getHandle())) { - throw new GLException("GLX not available on device: "+sharedDevice); + if(!GLXUtil.isGLXAvailableOnServer(sharedDevice)) { + throw new GLException("GLX not available on device/server: "+sharedDevice); } GLXUtil.initGLXClientDataSingleton(sharedDevice); final String glXServerVendorName = GLX.glXQueryServerString(sharedDevice.getHandle(), 0, GLX.GLX_VENDOR); |