summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java2
-rw-r--r--src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java118
-rw-r--r--src/nativewindow/classes/jogamp/nativewindow/BcmVCArtifacts.java12
3 files changed, 73 insertions, 59 deletions
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
index 038194d58..866e57ad7 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
@@ -55,7 +55,7 @@ public final class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundl
* Prefer libGLESv2.so over libGLESv2.so.2 for proprietary
* Broadcom graphics when the VC4 DRM Xorg driver isn't present
*/
- final boolean bcm_vc_iv_quirk = BcmVCArtifacts.guessVCIVUsed();
+ final boolean bcm_vc_iv_quirk = BcmVCArtifacts.guessVCIVUsed(false);
// ES3: This is the default lib name, according to the spec
libsGL.add("libGLESv3.so.3");
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java
index 23250db25..a41e9c349 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java
@@ -116,7 +116,7 @@ public abstract class NativeWindowFactory {
/** Generic DEFAULT type, where platform implementation don't care, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}. */
public static final String TYPE_DEFAULT = ".default";
- private static final String nativeWindowingTypePure; // canonical String via String.intern()
+ private static final String nativeWindowingTypeNative; // canonical String via String.intern()
private static final String nativeWindowingTypeCustom; // canonical String via String.intern()
private static NativeWindowFactory defaultFactory;
@@ -149,7 +149,7 @@ public abstract class NativeWindowFactory {
protected NativeWindowFactory() {
}
- private static String _getNativeWindowingType() {
+ private static String _getNativeWindowingType(final boolean debug) {
switch(PlatformPropsImpl.OS_TYPE) {
case ANDROID:
return TYPE_ANDROID;
@@ -166,50 +166,60 @@ public abstract class NativeWindowFactory {
case SUNOS:
case HPUX:
default:
- if( BcmVCArtifacts.guessVCIVUsed() ) {
- return TYPE_BCM_VC_IV;
+ if( debug ) {
+ guessX(true);
+ guessWayland(true);
+ guessGBM(true);
+ BcmVCArtifacts.guessVCIVUsed(true);
}
- if( guessX() ) {
+
+ if( guessX(false) ) {
return TYPE_X11;
}
- if( guessWayland() ) {
+ if( guessWayland(false) ) {
//TODO
return TYPE_WAYLAND;
}
- if( true || guessGBM() ) { // FIXME
+ if( guessGBM(false) ) {
return TYPE_EGL_GBM;
}
+ if( BcmVCArtifacts.guessVCIVUsed(false) ) {
+ return TYPE_BCM_VC_IV;
+ }
return TYPE_X11;
}
}
- private static boolean guessX() {
- return System.getProperty("DISPLAY") != null;
+ private static boolean guessX(final boolean debug) {
+ final String s = System.getenv("DISPLAY");
+ if ( debug ) {
+ System.err.println("guessX: <"+s+"> isSet "+(null!=s));
+ }
+ return null != s;
}
- private static boolean guessWayland() {
+ private static boolean guessWayland(final boolean debug) {
//TODO we can/should do a more elaborate check and try looking for a wayland-0 socket in $XDG_RUNTIME_DIR
- return System.getProperty("WAYLAND_DISPLAY") !=null;
+ final String s = System.getenv("WAYLAND_DISPLAY");
+ if ( debug ) {
+ System.err.println("guessWayland: <"+s+"> isSet "+(null!=s));
+ }
+ return null != s;
}
- private static boolean guessGBM() {
+ private static boolean guessGBM(final boolean debug) {
//FIXME this is not the best way to check if we have gbm-egl support, but does a good easy way actually exist?
- return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
- private final File vcliblocation = new File(
- "/dev/dri/card0");
- @Override
- public Boolean run() {
- if ( vcliblocation.isFile() ) {
- return Boolean.TRUE;
- }
- return Boolean.FALSE;
- }
- } ).booleanValue();
+ final File f = new File( "/dev/dri/card0" );
+ if ( debug ) {
+ System.err.println("guessGBM: <"+f.toString()+"> exists "+f.exists());
+ }
+ return f.exists(); // not a normal file
}
static {
final boolean[] _DEBUG = new boolean[] { false };
final String[] _tmp = new String[] { null };
+ final String[] _nativeWindowingTypeNative = new String[] { null };
AccessController.doPrivileged(new PrivilegedAction<Object>() {
@Override
@@ -217,6 +227,7 @@ public abstract class NativeWindowFactory {
Platform.initSingleton(); // last resort ..
_DEBUG[0] = Debug.debug("NativeWindow");
_tmp[0] = PropertyAccess.getProperty("nativewindow.ws.name", true);
+ _nativeWindowingTypeNative[0] = _getNativeWindowingType(_DEBUG[0]);
Runtime.getRuntime().addShutdownHook(
new InterruptSource.Thread(null, new Runnable() {
@Override
@@ -227,35 +238,43 @@ public abstract class NativeWindowFactory {
} } ) ;
DEBUG = _DEBUG[0];
- if(DEBUG) {
- System.err.println(Thread.currentThread().getName()+" - Info: NativeWindowFactory.<init>");
- // Thread.dumpStack();
- }
- // Gather the windowing TK first
- nativeWindowingTypePure = _getNativeWindowingType();
+ nativeWindowingTypeNative = _nativeWindowingTypeNative[0];
if(null==_tmp[0] || _tmp[0].length()==0) {
- nativeWindowingTypeCustom = nativeWindowingTypePure;
+ nativeWindowingTypeCustom = nativeWindowingTypeNative;
} else {
nativeWindowingTypeCustom = _tmp[0].intern(); // canonical representation
}
+ if(DEBUG) {
+ System.err.println(Thread.currentThread().getName()+" - Info: NativeWindowFactory.<init>: Type "+nativeWindowingTypeCustom+" custom / "+nativeWindowingTypeNative+" native");
+ // Thread.dumpStack();
+ }
}
private static boolean initialized = false;
- private static void initSingletonNativeImpl(final ClassLoader cl) {
+ private static String getNativeWindowingTypeClassName() {
final String clazzName;
- if( TYPE_X11 == nativeWindowingTypePure ) {
- clazzName = X11UtilClassName;
- } else if( TYPE_WINDOWS == nativeWindowingTypePure ) {
- clazzName = GDIClassName;
- } else if( TYPE_MACOSX == nativeWindowingTypePure ) {
- clazzName = OSXUtilClassName;
- } else if( TYPE_IOS == nativeWindowingTypePure ) {
- clazzName = IOSUtilClassName;
- } else {
- clazzName = null;
+ switch( nativeWindowingTypeNative ) {
+ case TYPE_X11:
+ clazzName = X11UtilClassName;
+ break;
+ case TYPE_WINDOWS:
+ clazzName = GDIClassName;
+ break;
+ case TYPE_MACOSX:
+ clazzName = OSXUtilClassName;
+ break;
+ case TYPE_IOS:
+ clazzName = IOSUtilClassName;
+ break;
+ default:
+ clazzName = null;
}
+ return clazzName;
+ }
+ private static void initSingletonNativeImpl(final ClassLoader cl) {
+ final String clazzName = getNativeWindowingTypeClassName();
if( null != clazzName ) {
ReflectionUtil.callStaticMethod(clazzName, "initSingleton", null, null, cl );
@@ -336,18 +355,7 @@ public abstract class NativeWindowFactory {
}
private static void shutdownNativeImpl(final ClassLoader cl) {
- final String clazzName;
- if( TYPE_X11 == nativeWindowingTypePure ) {
- clazzName = X11UtilClassName;
- } else if( TYPE_WINDOWS == nativeWindowingTypePure ) {
- clazzName = GDIClassName;
- } else if( TYPE_MACOSX == nativeWindowingTypePure ) {
- clazzName = OSXUtilClassName;
- } else if( TYPE_IOS == nativeWindowingTypePure ) {
- clazzName = IOSUtilClassName;
- } else {
- clazzName = null;
- }
+ final String clazzName = getNativeWindowingTypeClassName();
if( null != clazzName ) {
ReflectionUtil.callStaticMethod(clazzName, "shutdown", null, null, cl );
}
@@ -461,7 +469,7 @@ public abstract class NativeWindowFactory {
* Hence {@link String#equals(Object)} and <code>==</code> produce the same result.
*/
public static String getNativeWindowType(final boolean useCustom) {
- return useCustom?nativeWindowingTypeCustom:nativeWindowingTypePure;
+ return useCustom?nativeWindowingTypeCustom:nativeWindowingTypeNative;
}
/** Don't know if we shall add this factory here ..
@@ -510,7 +518,7 @@ public abstract class NativeWindowFactory {
* @see #getDefaultToolkitLock(java.lang.String)
*/
public static ToolkitLock getDefaultToolkitLock() {
- return getDefaultToolkitLock(nativeWindowingTypePure);
+ return getDefaultToolkitLock(nativeWindowingTypeNative);
}
/**
diff --git a/src/nativewindow/classes/jogamp/nativewindow/BcmVCArtifacts.java b/src/nativewindow/classes/jogamp/nativewindow/BcmVCArtifacts.java
index 216c55a3a..0fc0665bc 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/BcmVCArtifacts.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/BcmVCArtifacts.java
@@ -53,7 +53,7 @@ public class BcmVCArtifacts {
public Object run() {
res[0] = vcLibLocation.isFile();
res[1] = vc4ModLocation.isDirectory();
- res[2] = driCard0Location.isFile();
+ res[2] = driCard0Location.exists(); // not a normal file
return null;
} } );
hasVCLib = res[0];
@@ -64,13 +64,19 @@ public class BcmVCArtifacts {
/**
* @return True if proprietary BCM VC IV is probably being present
*/
- public static final boolean guessVCIVPresent() {
+ public static final boolean guessVCIVPresent(final boolean debug) {
+ if( debug ) {
+ System.err.println("guessVCIVPresent: hasVCLib "+hasVCLib);
+ }
return hasVCLib;
}
/**
* @return True if proprietary BCM VC IV is probably being used and not Xorg drivers
*/
- public static final boolean guessVCIVUsed() {
+ public static final boolean guessVCIVUsed(final boolean debug) {
+ if( debug ) {
+ System.err.println("guessVCIVUsed: hasVCLib = "+hasVCLib+" && !hasVC4ModLocation = !"+hasVC4ModLocation+" && !hasDriCard0File = !"+hasDriCard0File);
+ }
return hasVCLib && !hasVC4ModLocation && !hasDriCard0File;
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 19:39:38 +0000