From 394ee26b8411958c1643b88b412bb9e9f9c512c0 Mon Sep 17 00:00:00 2001 From: Kenneth Russel Date: Sun, 21 Jan 2007 01:27:28 +0000 Subject: Fixed Issue 262: DRIHack problems with ATI and possibly other drivers Added support to GlueGen's NativeLibrary class for relative library path names which do not require expansion; for example, "libGL.so.1". Changed the DRIHack to first attempt to open libGL.so.1 instead of "GL", which expanded to "libGL.so". For some reason, this causes ATI's drivers to be picked up properly. Tested with various JOGL demos. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1093 232f8b59-042b-4e1e-8c03-345bb8c30851 --- src/classes/com/sun/opengl/impl/x11/DRIHack.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/classes/com/sun') diff --git a/src/classes/com/sun/opengl/impl/x11/DRIHack.java b/src/classes/com/sun/opengl/impl/x11/DRIHack.java index 4dda1305f..35a1c8fc7 100644 --- a/src/classes/com/sun/opengl/impl/x11/DRIHack.java +++ b/src/classes/com/sun/opengl/impl/x11/DRIHack.java @@ -106,13 +106,8 @@ public class DRIHack { // Try a few different variants for best robustness // In theory probably only the first is necessary - oglLib = NativeLibrary.open("GL", null); - if (DEBUG && oglLib != null) System.err.println(" Found libGL.so"); - // Allow ATI's fglrx to supersede version in /usr/lib - if (oglLib == null) { - oglLib = NativeLibrary.open("/usr/lib/ati-fglrx/libGL.so.1.2", null); - if (DEBUG && oglLib != null) System.err.println(" Found /usr/lib/ati-fglrx/libGL.so.1.2"); - } + oglLib = NativeLibrary.open("libGL.so.1", null); + if (DEBUG && oglLib != null) System.err.println(" Found libGL.so.1"); if (oglLib == null) { oglLib = NativeLibrary.open("/usr/lib/libGL.so.1", null); if (DEBUG && oglLib != null) System.err.println(" Found /usr/lib/libGL.so.1"); -- cgit v1.2.3