Android NEWT*Activity: Request GL2ES2 instead of GLES2 (Be aware of ES3)

6 files changed, 23 insertions, 23 deletions

diff --git a/src/test/com/jogamp/opengl/test/android/NEWTElektronActivity.java b/src/test/com/jogamp/opengl/test/android/NEWTElektronActivity.java
index 88cd9a719..596c2c84e 100644
--- a/src/test/com/jogamp/opengl/test/android/NEWTElektronActivity.java
+++ b/src/test/com/jogamp/opengl/test/android/NEWTElektronActivity.java
@@ -51,7 +51,7 @@ public class NEWTElektronActivity extends NewtBaseActivity {
        super.onCreate(savedInstanceState);
        
        // create GLWindow (-> incl. underlying NEWT Display, Screen & Window)
-       GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GLES2));
+       GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2ES2));
        Log.d(TAG, "req caps: "+caps);
        GLWindow glWindow = GLWindow.create(caps);
        glWindow.setFullscreen(true);
diff --git a/src/test/com/jogamp/opengl/test/android/NEWTGearsES2Activity.java b/src/test/com/jogamp/opengl/test/android/NEWTGearsES2Activity.java
index 2e9774565..9572ef6de 100644
--- a/src/test/com/jogamp/opengl/test/android/NEWTGearsES2Activity.java
+++ b/src/test/com/jogamp/opengl/test/android/NEWTGearsES2Activity.java
@@ -3,14 +3,14 @@
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
+ *
  *    1. Redistributions of source code must retain the above copyright notice, this list of
  *       conditions and the following disclaimer.
- * 
+ *
  *    2. Redistributions in binary form must reproduce the above copyright notice, this list
  *       of conditions and the following disclaimer in the documentation and/or other materials
  *       provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
@@ -20,7 +20,7 @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * The views and conclusions contained in the software and documentation are those of the
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
@@ -50,28 +50,28 @@ import android.util.Log;
 
 public class NEWTGearsES2Activity extends NewtBaseActivity {
    static String TAG = "NEWTGearsES2Activity";
-   
+
    static final String forceRGBA5650 = "demo.force.rgba5650";
    static final String forceECT = "demo.force.ect";
    static final String forceKillProcessTest = "demo.force.killProcessTest";
-   
+
    @Override
    public void onCreate(Bundle savedInstanceState) {
        Log.d(TAG, "onCreate - 0");
        super.onCreate(savedInstanceState);
-       
+
        // create GLWindow (-> incl. underlying NEWT Display, Screen & Window)
-       GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GLES2));
+       GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2ES2));
        if( null != System.getProperty(forceRGBA5650) ) {
            Log.d(TAG, "forceRGBA5650");
-           caps.setRedBits(5); caps.setGreenBits(6); caps.setBlueBits(5);           
+           caps.setRedBits(5); caps.setGreenBits(6); caps.setBlueBits(5);
        }
-       
+
        Log.d(TAG, "req caps: "+caps);
        GLWindow glWindow = GLWindow.create(caps);
        glWindow.setFullscreen(true);
        setContentView(getWindow(), glWindow);
-       
+
        GearsES2 demo = new GearsES2(-1);
        // demo.enableAndroidTrace(true);
        glWindow.addGLEventListener(demo);
@@ -94,7 +94,7 @@ public class NEWTGearsES2Activity extends NewtBaseActivity {
                         public void run() {
                             ArrayList<Buffer> buffers = new ArrayList<Buffer>();
                             while(true) {
-                                final int halfMB = 512 * 1024; 
+                                final int halfMB = 512 * 1024;
                                 final float osizeMB = buffers.size() * 0.5f;
                                 final float nsizeMB = osizeMB + 0.5f;
                                 System.err.println("MemoryHog: ****** +4k: "+osizeMB+" MB +"+nsizeMB+" MB - Try");
@@ -102,27 +102,27 @@ public class NEWTGearsES2Activity extends NewtBaseActivity {
                                 System.err.println("MemoryHog: ****** +4k: "+osizeMB+" MB +"+nsizeMB+" MB - Done");
                                 try {
                                     Thread.sleep(500);
-                                } catch (Exception e) {};                            
+                                } catch (Exception e) {};
                             }
                         } }, "MemoryHog").start();
                 } else if( e.getPointerCount() == 4 ) {
                     Log.d(TAG, "ForceKill");
                     android.os.Process.killProcess( android.os.Process.myPid() );
-                }                
+                }
             }
            });
        }
        Animator animator = new Animator(glWindow);
        // animator.setRunAsFastAsPossible(true);
        // glWindow.setSkipContextReleaseThread(animator.getThread());
-       
+
        if( null != System.getProperty(forceECT) ) {
            Log.d(TAG, "forceECT");
-           animator.setExclusiveContext(true);           
+           animator.setExclusiveContext(true);
        }
-       
+
        glWindow.setVisible(true);
-       
+
        animator.setUpdateFPSFrames(60, System.err);
        animator.resetFPSCounter();
        glWindow.resetFPSCounter();
diff --git a/src/test/com/jogamp/opengl/test/android/NEWTGearsES2TransActivity.java b/src/test/com/jogamp/opengl/test/android/NEWTGearsES2TransActivity.java
index 98e6b7c5f..beaf60460 100644
--- a/src/test/com/jogamp/opengl/test/android/NEWTGearsES2TransActivity.java
+++ b/src/test/com/jogamp/opengl/test/android/NEWTGearsES2TransActivity.java
@@ -53,7 +53,7 @@ public class NEWTGearsES2TransActivity extends NewtBaseActivity {
        super.onCreate(savedInstanceState);
        
        // create GLWindow (-> incl. underlying NEWT Display, Screen & Window)
-       GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GLES2));
+       GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2ES2));
        caps.setBackgroundOpaque(false);
        
        Log.d(TAG, "req caps: "+caps);
diff --git a/src/test/com/jogamp/opengl/test/android/NEWTGraphUI1pActivity.java b/src/test/com/jogamp/opengl/test/android/NEWTGraphUI1pActivity.java
index 42db9d8dd..26adf0c4b 100644
--- a/src/test/com/jogamp/opengl/test/android/NEWTGraphUI1pActivity.java
+++ b/src/test/com/jogamp/opengl/test/android/NEWTGraphUI1pActivity.java
@@ -51,7 +51,7 @@ public class NEWTGraphUI1pActivity extends NewtBaseActivity {
        super.onCreate(savedInstanceState);
        
        // create GLWindow (-> incl. underlying NEWT Display, Screen & Window)
-       GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GLES2));
+       GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2ES2));
        caps.setAlphaBits(4);
        caps.setNumSamples(4);
        caps.setSampleBuffers(true);
diff --git a/src/test/com/jogamp/opengl/test/android/NEWTGraphUI2pActivity.java b/src/test/com/jogamp/opengl/test/android/NEWTGraphUI2pActivity.java
index c68de95cc..ebabfb01b 100644
--- a/src/test/com/jogamp/opengl/test/android/NEWTGraphUI2pActivity.java
+++ b/src/test/com/jogamp/opengl/test/android/NEWTGraphUI2pActivity.java
@@ -52,7 +52,7 @@ public class NEWTGraphUI2pActivity extends NewtBaseActivity {
        super.onCreate(savedInstanceState);
        
        // create GLWindow (-> incl. underlying NEWT Display, Screen & Window)
-       GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GLES2));
+       GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2ES2));
        caps.setAlphaBits(4);
        caps.setNumSamples(4);
        caps.setSampleBuffers(true);
diff --git a/src/test/com/jogamp/opengl/test/android/NEWTRedSquareES2Activity.java b/src/test/com/jogamp/opengl/test/android/NEWTRedSquareES2Activity.java
index cefdd842b..75ae94e89 100644
--- a/src/test/com/jogamp/opengl/test/android/NEWTRedSquareES2Activity.java
+++ b/src/test/com/jogamp/opengl/test/android/NEWTRedSquareES2Activity.java
@@ -51,7 +51,7 @@ public class NEWTRedSquareES2Activity extends NewtBaseActivity {
        super.onCreate(savedInstanceState);
        
        // create GLWindow (-> incl. underlying NEWT Display, Screen & Window)
-       GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GLES2));
+       GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2ES2));
        Log.d(TAG, "req caps: "+caps);
        GLWindow glWindow = GLWindow.create(caps);
        // glWindow.setSize(200, 200);