From ff2c2bfb69699ad00ba80f90cbfea6d4ce1ab778 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 9 Aug 2011 20:12:00 +0200 Subject: Adapt to DynamicLibraryBundleInfo API change ; Remove non std EGL/ES libs (Android) --- .../com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java | 6 +++++- .../jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java | 5 +++++ .../jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java | 13 ++++++++----- .../jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java | 5 ----- .../jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java | 5 ----- .../macosx/cgl/MacOSXCGLDynamicLibraryBundleInfo.java | 2 +- .../windows/wgl/WindowsWGLDynamicLibraryBundleInfo.java | 2 +- .../opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java | 2 +- 8 files changed, 21 insertions(+), 19 deletions(-) (limited to 'src/jogl/classes') diff --git a/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java b/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java index 5655d1a7a..08c755cd3 100644 --- a/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java @@ -59,9 +59,13 @@ public class CgDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo { } /** Tool has none **/ - public final long toolDynamicLookupFunction(long toolGetProcAddressHandle, String funcName) { + public final long toolGetProcAddress(long toolGetProcAddressHandle, String funcName) { return 0; } + + public boolean useToolGetProcAdressFirst(String funcName) { + return false; + } public List/*>*/ getToolLibNames() { List/**/ libNamesList = new ArrayList(); diff --git a/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java index e548ad624..1b8c3c1e5 100644 --- a/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java @@ -47,5 +47,10 @@ public abstract class DesktopGLDynamicLibraryBundleInfo extends GLDynamicLibrary public final List/**/ getGlueLibNames() { return glueLibNames; } + + public boolean useToolGetProcAdressFirst(String funcName) { + return true; + } + } diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java index ff838dd0b..4182c4666 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java @@ -60,23 +60,26 @@ public abstract class EGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundle /** Might be a desktop GL library, and might need to allow symbol access to subsequent libs */ public boolean shallLinkGlobal() { return true; } + + public boolean shallLookupGlobal() { return true; } + public final List getToolGetProcAddressFuncNameList() { List res = new ArrayList(); res.add("eglGetProcAddress"); return res; } - public final long toolDynamicLookupFunction(long toolGetProcAddressHandle, String funcName) { + public final long toolGetProcAddress(long toolGetProcAddressHandle, String funcName) { return EGL.eglGetProcAddress(toolGetProcAddressHandle, funcName); } + public final boolean useToolGetProcAdressFirst(String funcName) { + return false; // JAU / FIXME funcName.startsWith("egl"); + } + protected List/**/ getEGLLibNamesList() { List/**/ eglLibNames = new ArrayList(); - if(Platform.getOSType() == Platform.OSType.ANDROID) { - // using the android-EGL fails - eglLibNames.add("/system/lib/egl/libEGL_POWERVR_SGX530_125.so"); - } // try default generic names first eglLibNames.add("EGL"); diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java index 8d59899f2..4c38a29b1 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java @@ -44,11 +44,6 @@ public class EGLES1DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo List/**/ glesLibNames = new ArrayList(); - if(Platform.getOSType() == Platform.OSType.ANDROID) { - // using the android-EGL fails - glesLibNames.add("/system/lib/egl/libGLESv1_CM_POWERVR_SGX530_125.so"); - } - // try default generic names first glesLibNames.add("GLES_CM"); glesLibNames.add("GLES_CL"); diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java index 175c97854..7943e1946 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java @@ -44,11 +44,6 @@ public class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo List/**/ glesLibNames = new ArrayList(); - if(Platform.getOSType() == Platform.OSType.ANDROID) { - // using the android-EGL fails - glesLibNames.add("/system/lib/egl/libGLESv2_POWERVR_SGX530_125.so"); - } - // try default generic names first glesLibNames.add("GLES20"); glesLibNames.add("GLESv2"); diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDynamicLibraryBundleInfo.java index 94d790cee..e81a9f4c5 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDynamicLibraryBundleInfo.java @@ -62,7 +62,7 @@ public class MacOSXCGLDynamicLibraryBundleInfo extends DesktopGLDynamicLibraryBu return res; */ } - public final long toolDynamicLookupFunction(long toolGetProcAddressHandle, String funcName) { + public final long toolGetProcAddress(long toolGetProcAddressHandle, String funcName) { return 0; /** OSX manual says: NSImage use is discouraged return CGL.getProcAddress(glFuncName); // manual implementation diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDynamicLibraryBundleInfo.java index 0fb7f4510..c7feb83c7 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDynamicLibraryBundleInfo.java @@ -51,7 +51,7 @@ public class WindowsWGLDynamicLibraryBundleInfo extends DesktopGLDynamicLibraryB return res; } - public final long toolDynamicLookupFunction(long toolGetProcAddressHandle, String funcName) { + public final long toolGetProcAddress(long toolGetProcAddressHandle, String funcName) { return WGL.wglGetProcAddress(toolGetProcAddressHandle, funcName); } } diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java index 60e163c46..aa6e3e849 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java @@ -76,7 +76,7 @@ public class X11GLXDynamicLibraryBundleInfo extends DesktopGLDynamicLibraryBundl return res; } - public final long toolDynamicLookupFunction(long toolGetProcAddressHandle, String funcName) { + public final long toolGetProcAddress(long toolGetProcAddressHandle, String funcName) { return GLX.glXGetProcAddress(toolGetProcAddressHandle, funcName); } } -- cgit v1.2.3