diff options
| author | Sven Gothel <[email protected]> | 2015-08-05 16:31:36 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-08-05 16:31:36 +0200 |
| commit | 1e4bfc26e2f220e046f42f7d26c05e4971bc509d (patch) | |
| tree | 4f9373cb7e4b05a5f066640221d6246499cc6645 /src/jogl/classes/com/jogamp/opengl | |
| parent | ebadf5eec00b99e96567ba685cdfeae2005e5969 (diff) | |
Bug 1062: Utilize 'GLProfile.disableOpenGLDesktop' for EGLDrawableFactory desktop mapping as well.
Commit 35622a7cef4a28ce7e32bf008ef331d9a0d9e3e2 introduced GLProfile.disableOpenGLDesktop,
as enabled by system property 'jogl.disable.opengldesktop'.
Desktop OpenGL shall also be disabled within EGLDrawableFactory.
Provide verbose DEBUG info for all disabled desktop OpenGL cases.
Diffstat (limited to 'src/jogl/classes/com/jogamp/opengl')
| -rw-r--r-- | src/jogl/classes/com/jogamp/opengl/GLDrawableFactory.java | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/GLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/GLDrawableFactory.java index 07c3e77e0..7d78e3409 100644 --- a/src/jogl/classes/com/jogamp/opengl/GLDrawableFactory.java +++ b/src/jogl/classes/com/jogamp/opengl/GLDrawableFactory.java @@ -144,23 +144,29 @@ public abstract class GLDrawableFactory { } } } - if (null != factoryClassName && !GLProfile.disableOpenGLDesktop) { - if (DEBUG || GLProfile.DEBUG) { - System.err.println("GLDrawableFactory.static - Native OS Factory for: "+nwt+": "+factoryClassName); - } - try { - tmp = (GLDrawableFactory) ReflectionUtil.createInstance(factoryClassName, cl); - } catch (final Exception jre) { - if (DEBUG || GLProfile.DEBUG) { - System.err.println("Info: GLDrawableFactory.static - Native Platform: "+nwt+" - not available: "+factoryClassName); - jre.printStackTrace(); - } - } - } - if(null != tmp && tmp.isComplete()) { - nativeOSFactory = tmp; + if ( !GLProfile.disableOpenGLDesktop ) { + if ( null != factoryClassName ) { + if (DEBUG || GLProfile.DEBUG) { + System.err.println("GLDrawableFactory.static - Native OS Factory for: "+nwt+": "+factoryClassName); + } + try { + tmp = (GLDrawableFactory) ReflectionUtil.createInstance(factoryClassName, cl); + } catch (final Exception jre) { + if (DEBUG || GLProfile.DEBUG) { + System.err.println("Info: GLDrawableFactory.static - Native Platform: "+nwt+" - not available: "+factoryClassName); + jre.printStackTrace(); + } + } + if(null != tmp && tmp.isComplete()) { + nativeOSFactory = tmp; + } + tmp = null; + } else if( DEBUG || GLProfile.DEBUG ) { + System.err.println("Info: GLDrawableFactory.static - Desktop GLDrawableFactory unspecified!"); + } + } else if( DEBUG || GLProfile.DEBUG ) { + System.err.println("Info: GLDrawableFactory.static - Desktop GLDrawableFactory - disabled!"); } - tmp = null; if(!GLProfile.disableOpenGLES) { try { |