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.
sgothel · Feb 10, 2016 · 36c99c3 · 36c99c3
1 parent 45cc13c
commit 36c99c3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java
@@ -140,9 +140,11 @@ private static final boolean guessBroadcomVCIV() {
         return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
             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.isDir() ) {
                         return Boolean.TRUE;
                     }
                     return Boolean.FALSE;