From 4011e70eed8c88aee0fcd051a50ab3f15bb94f68 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 13 Feb 2012 07:00:01 +0100
Subject: OpenGL ES/EGL Overhaul

- GLProfile properly detects native EGL/ES1/ES2 on the 'desktop' device factory.
  This allows usage of Mesa's EGL/ES or Imageon's PVR emulation, etc.

- GLProfile drops getDefaultDesktopDevice() and getDefaultEGLDevice()
  since both are aligned by getDefaultDevice().

- Fix GL_ARB_ES2_compatibility detection and utilize
  resulting isGLES2Compatible() where possible.
  This allows ES2 compatible desktop profiles to use core ES2 functionality
  (glShaderBinary() .. etc) even with a GL2ES2 desktop implementation.

- EGLDrawable: If createSurface(..) fails (BAD_NATIVE_WINDOW) w/ surfaceHandle
  it uses windowHandle if available and differs.
  This allows the ANGLE impl. to work.

- Properly order of EGL/ES library lookup:
  ES2: libGLESv2.so.2, libGLESv2.so, GLES20, GLESv2_CM
  EGL: libEGL.so.1, libEGL.so, EGL

- *DynamicLookupHelper reference will be null if it's library is not complete
   (all tool libs, all glue libs and a ProcAddressFunc lookup function - if named).

- Enhance GL version string (incl. ES2 compatible, hw/sw, ..)

- GLBase: Fix docs and remove redundancies

- Prepared (disabled) DesktopES2DynamicLibraryBundleInfo
  to be used for a real EGL/ES2 implementation within the desktop GL lib (AMD).
  Sadly it currenly crashed within eglGetDisplay(EGL_DEFAULT_DISPLAY),
  hence it's disabled.
---
 .../classes/com/jogamp/newt/opengl/GLWindow.java     |  8 ++------
 src/newt/classes/jogamp/newt/driver/android/MD.java  | 20 +++++---------------
 2 files changed, 7 insertions(+), 21 deletions(-)

(limited to 'src/newt/classes')

diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
index 92f57577d..dc2db7f74 100644
--- a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
@@ -35,7 +35,6 @@
 package com.jogamp.newt.opengl;
 
 import java.io.PrintStream;
-import java.util.List;
 
 import com.jogamp.common.GlueGenVersion;
 import com.jogamp.common.util.VersionUtil;
@@ -901,12 +900,9 @@ public class GLWindow implements GLAutoDrawable, Window, NEWTEventConsumer, FPSC
         System.err.println(GlueGenVersion.getInstance());
         System.err.println(JoglVersion.getInstance());
 
+        System.err.println(JoglVersion.getDefaultOpenGLInfo(null).toString());
+
         final GLProfile glp = GLProfile.getDefault();
-        final GLDrawableFactory factory = GLDrawableFactory.getFactory(glp);
-        final List<GLCapabilitiesImmutable> availCaps = factory.getAvailableCapabilities(null);
-        for(int i=0; i<availCaps.size(); i++) {
-            System.err.println(availCaps.get(i));
-        }
         final GLCapabilitiesImmutable caps = new GLCapabilities( glp );
 
         GLWindow glWindow = GLWindow.create(caps);
diff --git a/src/newt/classes/jogamp/newt/driver/android/MD.java b/src/newt/classes/jogamp/newt/driver/android/MD.java
index 06f787233..150dea9c7 100644
--- a/src/newt/classes/jogamp/newt/driver/android/MD.java
+++ b/src/newt/classes/jogamp/newt/driver/android/MD.java
@@ -27,11 +27,6 @@
  */
 package jogamp.newt.driver.android;
 
-import java.util.List;
-
-import javax.media.opengl.GLDrawableFactory;
-import javax.media.opengl.GLProfile;
-
 import com.jogamp.common.GlueGenVersion;
 import com.jogamp.common.os.Platform;
 import com.jogamp.common.util.VersionUtil;
@@ -40,22 +35,17 @@ import com.jogamp.opengl.JoglVersion;
 public class MD {
    public static final String TAG = "JogAmp.NEWT";
    
-   public static String getInfo() { 
-       
-        StringBuffer sb = new StringBuffer();
+   public static String getInfo() {        
+        StringBuilder sb = new StringBuilder();
         
         sb.append(VersionUtil.getPlatformInfo()).append(Platform.NEWLINE)
               .append(GlueGenVersion.getInstance()).append(Platform.NEWLINE)
               .append(JoglVersion.getInstance()).append(Platform.NEWLINE)
               .append(Platform.NEWLINE);
               
-        final GLDrawableFactory factory = GLDrawableFactory.getEGLFactory();
-        final List/*<GLCapabilitiesImmutable>*/ availCaps = factory.getAvailableCapabilities(null);
-        for(int i=0; i<availCaps.size(); i++) {
-            sb.append(availCaps.get(i)).append(Platform.NEWLINE);
-        }
-       
-       return sb.toString();       
+        JoglVersion.getDefaultOpenGLInfo(sb);
+
+        return sb.toString();       
    }
    
     public static void main(String args[]) {
-- 
cgit v1.2.3