From 347271ffdd09153a2334fda593774d49050f84e0 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 16 Jan 2018 06:45:46 +0100 Subject: Bug 1290: Expand query whether BCM IV is being used, exclude '/dev/dri/card0' Also refactor query to jogamp.nativewindow.BcmVCArtifacts --- .../opengl/egl/EGLES2DynamicLibraryBundleInfo.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java') diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java index 6b4a3ea99..038194d58 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java @@ -28,10 +28,11 @@ package jogamp.opengl.egl; -import java.io.File; import java.util.ArrayList; import java.util.List; +import jogamp.nativewindow.BcmVCArtifacts; + /** *

* Covering ES3 and ES2. @@ -42,21 +43,20 @@ public final class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundl super(); } + @Override public final List> getToolLibNames() { - // Prefer libGLESv2.so over libGLESv2.so.2 for Broadcom graphics - // when the VC4 DRM driver isn't present - final File vcliblocation = new File( - "/opt/vc/lib/libbcm_host.so"); - final File vc4modlocation = new File( - "/sys/module/vc4"); - final boolean bcm_vc_iv_quirk = vcliblocation.isFile() && !vc4modlocation.isDirectory(); - final List> libsList = new ArrayList>(); { final List libsGL = new ArrayList(); + /** + * 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(); + // ES3: This is the default lib name, according to the spec libsGL.add("libGLESv3.so.3"); -- cgit v1.2.3