diff options
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/egl')
3 files changed, 56 insertions, 49 deletions
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java index 137599650..33154b089 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java @@ -48,9 +48,9 @@ import java.security.*; * Currently two implementations exist, one for ES1 and one for ES2. */ public abstract class EGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundleInfo { - static List/*<String>*/ glueLibNames; + static List<String> glueLibNames; static { - glueLibNames = new ArrayList(); + glueLibNames = new ArrayList<String>(); glueLibNames.addAll(GLDynamicLibraryBundleInfo.getGlueLibNamesPreload()); glueLibNames.add("jogl_mobile"); } @@ -71,8 +71,8 @@ public abstract class EGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundle return false; } - public final List getToolGetProcAddressFuncNameList() { - List res = new ArrayList(); + public final List<String> getToolGetProcAddressFuncNameList() { + List<String> res = new ArrayList<String>(); res.add("eglGetProcAddress"); return res; } @@ -85,21 +85,21 @@ public abstract class EGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundle return false; // JAU / FIXME funcName.startsWith("egl"); } - protected List/*<String>*/ getEGLLibNamesList() { - List/*<String>*/ eglLibNames = new ArrayList(); + protected List<String> getEGLLibNamesList() { + List<String> eglLibNames = new ArrayList<String>(); // try default generic names first - eglLibNames.add("EGL"); - + eglLibNames.add("EGL"); // for windows distributions using the 'unlike' lib prefix, // where our tool does not add it. eglLibNames.add("libEGL"); // this is the default EGL lib name, according to the spec eglLibNames.add("libEGL.so.1"); + return eglLibNames; } - public final List/*<String>*/ getGlueLibNames() { + public final List<String> getGlueLibNames() { return glueLibNames; } } diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java index 4c38a29b1..e96e79ee2 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java @@ -39,26 +39,30 @@ public class EGLES1DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo super(); } - public List getToolLibNames() { - List/*<List>*/ libNames = new ArrayList(); - - List/*<String>*/ glesLibNames = new ArrayList(); + public List<List<String>> getToolLibNames() { + final List<List<String>> libsList = new ArrayList<List<String>>(); + { + final List<String> libsGL = new ArrayList<String>(); + + // try default generic names first + libsGL.add("GLES_CM"); + libsGL.add("GLES_CL"); + libsGL.add("GLESv1_CM"); + + // for windows distributions using the 'unlike' lib prefix, + // where our tool does not add it. + libsGL.add("libGLES_CM"); + libsGL.add("libGLES_CL"); + libsGL.add("libGLESv1_CM"); + + // this is the default lib name, according to the spec + libsGL.add("libGLESv1_CM.so.1"); + + libsList.add(libsGL); + } + libsList.add(getEGLLibNamesList()); - // try default generic names first - glesLibNames.add("GLES_CM"); - glesLibNames.add("GLES_CL"); - glesLibNames.add("GLESv1_CM"); - // for windows distributions using the 'unlike' lib prefix, - // where our tool does not add it. - glesLibNames.add("libGLES_CM"); - glesLibNames.add("libGLES_CL"); - glesLibNames.add("libGLESv1_CM"); - // this is the default lib name, according to the spec - glesLibNames.add("libGLESv1_CM.so.1"); - - libNames.add(glesLibNames); - libNames.add(getEGLLibNamesList()); - return libNames; - } + return libsList; + } } diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java index 7943e1946..ac6d76220 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java @@ -39,26 +39,29 @@ public class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo super(); } - public List getToolLibNames() { - List/*<List>*/ libNames = new ArrayList(); - - List/*<String>*/ glesLibNames = new ArrayList(); - - // try default generic names first - glesLibNames.add("GLES20"); - glesLibNames.add("GLESv2"); - glesLibNames.add("GLESv2_CM"); - // for windows distributions using the 'unlike' lib prefix - // where our tool does not add it. - glesLibNames.add("libGLES20"); - glesLibNames.add("libGLESv2"); - glesLibNames.add("libGLESv2_CM"); - // this is the default lib name, according to the spec - glesLibNames.add("libGLESv2.so.2"); + public List<List<String>> getToolLibNames() { + final List<List<String>> libsList = new ArrayList<List<String>>(); + { + final List<String> libsGL = new ArrayList<String>(); + + // try default generic names first + libsGL.add("GLES20"); + libsGL.add("GLESv2"); + libsGL.add("GLESv2_CM"); + // for windows distributions using the 'unlike' lib prefix + // where our tool does not add it. + libsGL.add("libGLES20"); + libsGL.add("libGLESv2"); + libsGL.add("libGLESv2_CM"); + // this is the default lib name, according to the spec + libsGL.add("libGLESv2.so.2"); + + libsList.add(libsGL); + } + libsList.add(getEGLLibNamesList()); - libNames.add(glesLibNames); - libNames.add(getEGLLibNamesList()); - return libNames; - } + return libsList; + } + } |