From 93094928489adb0b12889f7b35c75a28303e18e8 Mon Sep 17 00:00:00 2001 From: gohai Date: Wed, 10 Feb 2016 15:52:13 +0100 Subject: Change BCM VC IV detection to handle presence of vc4 DRI module The recent Raspbian release comes with a vc4 kernel module that can be activated with a device tree overlay. In this case, we want to use the DRI & Mesa / Gallium3D driver instead of the BCM VC IV one, whose userspace library remains in /opt/vc. --- .../classes/com/jogamp/nativewindow/NativeWindowFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/nativewindow/classes') diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java index 5da7974b0..cf3819b85 100644 --- a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java +++ b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java @@ -140,9 +140,11 @@ public abstract class NativeWindowFactory { return AccessController.doPrivileged(new PrivilegedAction() { private final File vcliblocation = new File( "/opt/vc/lib/libbcm_host.so"); + private final File vc4modlocation = new File( + "/sys/module/vc4"); @Override public Boolean run() { - if ( vcliblocation.isFile() ) { + if ( vcliblocation.isFile() && !vc4modlocation.isDirectory() ) { return Boolean.TRUE; } return Boolean.FALSE; -- cgit v1.2.3