Fixed selection of GLES version on android. (#6088)

Fixes #6086 Fixes #6047
openframeworks · Jul 31, 2018 · 432b122 · 432b122
1 parent b3a250a
commit 432b122
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 38 deletions.
diff --git a/addons/ofxAndroid/ofAndroidLib/src/cc/openframeworks/OFActivity.java b/addons/ofxAndroid/ofAndroidLib/src/cc/openframeworks/OFActivity.java
@@ -20,6 +20,10 @@ public void onUnpackingResourcesDone(){}
 	//gesture handler member
 	private ViewGroup mOFGlSurfaceContainer;
 
+	public ViewGroup getSurfaceContainer(){
+		return mOFGlSurfaceContainer;
+	}
+
 	public void initView(){  
 		String packageName = this.getPackageName();
         try {

diff --git a/addons/ofxAndroid/ofAndroidLib/src/cc/openframeworks/OFAndroid.java b/addons/ofxAndroid/ofAndroidLib/src/cc/openframeworks/OFAndroid.java
@@ -37,6 +37,7 @@
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
+import java.util.concurrent.Semaphore;
 
 public class OFAndroid {
 
@@ -822,13 +823,22 @@ public static void disableOrientationChangeEvents(){
 
 	public static void setupGL(int version){	
 		final int finalversion = version;
+		final Semaphore mutex = new Semaphore( 0 );
+
 		runOnMainThread(new Runnable() {
-
 			@Override
 			public void run() {
 		        OFEGLConfigChooser.setGLESVersion(finalversion);
+		        OFAndroidLifeCycle.glCreateSurface();
+		        mutex.release();
 			}
 		});
+
+		try{
+			mutex.acquire();
+		} catch( Exception ex ){
+			Log.w( "OF", "setupGL mutex acquire failed" );
+		}
 	}
 
 	/**

diff --git a/addons/ofxAndroid/ofAndroidLib/src/cc/openframeworks/OFAndroidLifeCycle.java b/addons/ofxAndroid/ofAndroidLib/src/cc/openframeworks/OFAndroidLifeCycle.java
@@ -262,51 +262,63 @@ public static void init()
 	}
 
 	static String TAG = "OF";
-
+		
 	public static void glCreate()
-	{
+	{	
 		Log.d(TAG, "glCreate");
+
+		if(m_countActivities == 0)
+			pushState(State.create);
+		m_countActivities++;
+	}
+
+	public static void glCreateSurface()
+	{
 		if(mGLView == null)
 		{
 			Log.d(TAG, "Create surface");
 			mGLView = new OFGLSurfaceView(m_activity);
+
+			glResume( getActivity().getSurfaceContainer() );
 		}
-		if(m_countActivities == 0)
-			pushState(State.create);
-		m_countActivities++;
 	}
 
 	public static void glResume(ViewGroup glContainer)
 	{
 		Log.d(TAG, "glResume");
 
 		OFGLSurfaceView glView = getGLView();
-		glView.setVisibility(View.INVISIBLE);
+		if( glView != null )
+		{
+			glView.setVisibility(View.INVISIBLE);
+
+			glContainer.addView(glView, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+			Log.d(TAG, "addView surface");
 
-		glContainer.addView(glView, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
-		Log.d(TAG, "addView surface");
-
-		glView.onResume();
-
-		pushState(State.resume);
+			glView.onResume();
+
+			pushState(State.resume);
+		}
 	}
 
 	public static void glPause()
 	{
 		Log.d(TAG, "glPause");
 
 		OFGLSurfaceView glView = getGLView();
-
-		glView.onPause();
-
-		ViewGroup parent = (ViewGroup)glView.getParent();
-
-		if(parent != null){
-			Log.d(TAG, "remove surface");
-			parent.removeView(glView);
+		if( glView != null )
+		{
+			glView.onPause();
+
+			ViewGroup parent = (ViewGroup)glView.getParent();
+
+			if(parent != null){
+				Log.d(TAG, "remove surface");
+				parent.removeView(glView);
+			}
+
+			pushState(State.pause);
 		}
-
-		pushState(State.pause);
 	}
 
 	public static void glDestroy()

diff --git a/addons/ofxAndroid/ofAndroidLib/src/cc/openframeworks/OFAndroidWindow.java b/addons/ofxAndroid/ofAndroidLib/src/cc/openframeworks/OFAndroidWindow.java
@@ -25,12 +25,14 @@ public OFEGLConfigChooser(int r, int g, int b, int a, int depth, int stencil) {
     }
 
     public static void setGLESVersion(int version){
+		GLES_VERSION = version; 
+
     	if(version==1) EGL_OPENGL_ES_BIT=1;
     	else EGL_OPENGL_ES_BIT=4;
     }
 
     public static int getGLESVersion(){
-    	return EGL_OPENGL_ES_BIT==1?1:2;
+    	return GLES_VERSION;
     }
 
     /* This EGL config specification is used to specify 1.x rendering.
@@ -39,6 +41,7 @@ public static int getGLESVersion(){
      */
     private static boolean DEBUG = false;
     private static int EGL_OPENGL_ES_BIT = 1;
+    private static int GLES_VERSION = 1;
     private static int[] s_configAttribs2 =
     {
         EGL10.EGL_RED_SIZE, 4,
@@ -220,8 +223,8 @@ class OFGLSurfaceView extends GLSurfaceView{
 	public OFGLSurfaceView(Context context) {
         super(context);
         mRenderer = new OFAndroidWindow(getWidth(),getHeight());
-        if(OFEGLConfigChooser.getGLESVersion()==2){
-        	setEGLContextClientVersion(2);
+        if(OFEGLConfigChooser.getGLESVersion()>=2){
+        	setEGLContextClientVersion(OFEGLConfigChooser.getGLESVersion());
         }
         getHolder().setFormat( PixelFormat.OPAQUE );
         OFEGLConfigChooser configChooser = new OFEGLConfigChooser(8,8,8,0,16,0);
@@ -233,8 +236,8 @@ public OFGLSurfaceView(Context context) {
 	public OFGLSurfaceView(Context context,AttributeSet attributes) {
         super(context,attributes);
         mRenderer = new OFAndroidWindow(getWidth(),getHeight());
-        if(OFEGLConfigChooser.getGLESVersion()==2){
-        	setEGLContextClientVersion(2);
+        if(OFEGLConfigChooser.getGLESVersion()>=2){
+        	setEGLContextClientVersion(OFEGLConfigChooser.getGLESVersion());
         }
         getHolder().setFormat( PixelFormat.OPAQUE );
         OFEGLConfigChooser configChooser = new OFEGLConfigChooser(8,8,8,0,16,0);

diff --git a/addons/ofxAndroid/src/ofAppAndroidWindow.cpp b/addons/ofxAndroid/src/ofAppAndroidWindow.cpp
@@ -236,6 +236,11 @@ shared_ptr<ofBaseRenderer> & ofAppAndroidWindow::renderer(){
 	return currentRenderer;
 }
 
+int ofAppAndroidWindow::getGlesVersion()
+{
+	return glesVersion;
+}
+
 extern "C"{
 
 jint JNI_OnLoad(JavaVM* vm, void* reserved)
@@ -323,15 +328,15 @@ Java_cc_openframeworks_OFAndroid_onSurfaceCreated( JNIEnv*  env, jclass  thiz ){
 		window->renderer()->popStyle();
 
 	}else{
-
-	    if(window->renderer()->getType()==ofGLProgrammableRenderer::TYPE)
-	    {
-	    	static_cast<ofGLProgrammableRenderer*>(window->renderer().get())->setup(2,0);
-	    }
-	    else
-	    {
-	    	static_cast<ofGLRenderer*>(window->renderer().get())->setup();
-	    }
+		int glesVersion = window->getGlesVersion();
+		if( glesVersion < 2 )
+		{
+			static_cast<ofGLRenderer*>(window->renderer().get())->setup();
+		}
+		else
+		{
+			static_cast<ofGLProgrammableRenderer*>(window->renderer().get())->setup(glesVersion,0);
+		}
 	}
 
 	surfaceDestroyed = false;

diff --git a/addons/ofxAndroid/src/ofAppAndroidWindow.h b/addons/ofxAndroid/src/ofAppAndroidWindow.h
@@ -63,6 +63,8 @@ class ofAppAndroidWindow: public ofAppBaseGLESWindow {
 	void	setThreadedEvents(bool threadedEvents);
 	void 	setAccumulateTouchEvents(bool accumEvents);
 
+	int 	getGlesVersion();
+
 private:
 	ofCoreEvents coreEvents;
 	std::shared_ptr<ofBaseRenderer> currentRenderer;

diff --git a/libs/openFrameworksCompiled/project/android/common-functions.gradle b/libs/openFrameworksCompiled/project/android/common-functions.gradle
@@ -431,4 +431,4 @@ ext {
     javaDependencies = this.&javaDependencies
 
 
-}
+}