summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/com/sun/opengl/impl
diff options
context:
space:
mode:
authorMorris Meyer <[email protected]>2009-07-28 17:34:20 -0400
committerMorris Meyer <[email protected]>2009-07-28 17:39:14 -0400
commitb6d75cac68340878b20d35b23c8449c97ad9d819 (patch)
tree2cbd05b91739249458ea5f4e18556601ac2b9c2a /src/jogl/classes/com/sun/opengl/impl
parentd73af059e836943fa37b9f7aab93154f530763d9 (diff)
EGL changes for device
Diffstat (limited to 'src/jogl/classes/com/sun/opengl/impl')
-rw-r--r--src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java19
-rwxr-xr-xsrc/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java6
-rwxr-xr-xsrc/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java14
-rwxr-xr-xsrc/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java2
4 files changed, 35 insertions, 6 deletions
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java
index c381f68f5..e71cf33a0 100644
--- a/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java
+++ b/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java
@@ -52,7 +52,24 @@ public abstract class GLDrawableImpl implements GLDrawable {
this.factory = factory;
this.component = comp;
this.realized = realized;
- this.requestedCapabilities = (GLCapabilities)component.getGraphicsConfiguration().getNativeGraphicsConfiguration().getRequestedCapabilities(); // a copy ..
+
+ AbstractGraphicsConfiguration agc = component.getGraphicsConfiguration();
+ if (agc == null) {
+ System.out.println("GLDrawableImpl no AbstractGraphicsConfiguration");
+ System.out.println(component.getClass().getName());
+ return;
+ }
+ AbstractGraphicsConfiguration ngc = agc.getNativeGraphicsConfiguration();
+ if (ngc == null) {
+ System.out.println("GLDrawableImpl no native AbstractGraphicsConfiguration");
+ return;
+ }
+ Capabilities caps = ngc.getRequestedCapabilities();
+ if (caps == null) {
+ System.out.println("GLDrawableImpl no native Capabilities");
+ return;
+ }
+ this.requestedCapabilities = (GLCapabilities)caps; // a copy ..
}
/**
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java
index 396580c1d..e2ee65d27 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java
@@ -45,15 +45,19 @@ import com.sun.gluegen.runtime.NativeLibrary;
public class EGLDrawableFactory extends GLDrawableFactoryImpl {
static {
+ try {
// Register our GraphicsConfigurationFactory implementations
// The act of constructing them causes them to be registered
new EGLGraphicsConfigurationFactory();
// Check for other underlying stuff ..
- if(NativeWindowFactory.TYPE_X11.equals(NativeWindowFactory.getNativeWindowType(false))) {
+ /* if(NativeWindowFactory.TYPE_X11.equals(NativeWindowFactory.getNativeWindowType(false))) {
try {
NWReflection.createInstance("com.sun.opengl.impl.x11.glx.X11GLXGraphicsConfigurationFactory");
} catch (Throwable t) {}
+ } */
+ } catch (Throwable th) {
+ th.printStackTrace();
}
}
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java
index 8bed0eb35..99f163ca1 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java
@@ -50,7 +50,7 @@ import com.sun.gluegen.runtime.DynamicLookupHelper;
* Currently two implementations exist, one for ES1 and one for ES2.
*/
public abstract class EGLDynamicLookupHelper implements DynamicLookupHelper {
- protected static final boolean DEBUG = com.sun.opengl.impl.Debug.debug("EGL");
+ protected static final boolean DEBUG = true; /* com.sun.opengl.impl.Debug.debug("EGL"); */
private static final EGLDynamicLookupHelper eglES1DynamicLookupHelper;
private static final EGLDynamicLookupHelper eglES2DynamicLookupHelper;
@@ -136,9 +136,13 @@ public abstract class EGLDynamicLookupHelper implements DynamicLookupHelper {
private NativeLibrary loadFirstAvailable(List/*<String>*/ libNames, ClassLoader loader) {
for (Iterator iter = libNames.iterator(); iter.hasNext(); ) {
- NativeLibrary lib = NativeLibrary.open((String) iter.next(), loader, false /*global*/);
+ String libname = (String) iter.next();
+ NativeLibrary lib = NativeLibrary.open(libname, loader, false /*global*/);
if (lib != null) {
+ System.out.println("found: " + libname);
return lib;
+ } else {
+ System.out.println("looked for: " + libname);
}
}
return null;
@@ -164,9 +168,11 @@ public abstract class EGLDynamicLookupHelper implements DynamicLookupHelper {
// EGL libraries ..
lib = loadFirstAvailable(eglLibNames, loader);
if (lib == null) {
- throw new GLException("Unable to dynamically load EGL library for profile ES" + esProfile);
+ // throw new GLException("Unable to dynamically load EGL library for profile ES" + esProfile);
+ System.out.println("Unable to dynamically load EGL library for profile ES" + esProfile);
+ } else {
+ glesLibraries.add(lib);
}
- glesLibraries.add(lib);
}
if (esProfile==2) {
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java
index 7e60e25c0..68630344a 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java
@@ -58,6 +58,8 @@ public class EGLES1DynamicLookupHelper extends EGLDynamicLookupHelper {
protected List/*<String>*/ getGLESLibNames() {
List/*<String>*/ glesLibNames = new ArrayList();
+ glesLibNames.add("nexus");
+
glesLibNames.add("GLES_CM");
glesLibNames.add("GLES_CL");
glesLibNames.add("GLESv1_CM");