OpenGLES 3.1

.github/workflows/of.yml

@@ -453,7 +453,10 @@ jobs:
       TARGET: ${{ matrix.cfg.target }}
       ARCH: ${{ matrix.cfg.opt }}
       ANDROID_SDK_ROOT: $ANDROID_HOME
-      ANDROID_NDK_ROOT: $ANDROID_NDK_LATEST_HOME
+      # keep in sync with apothecary build-android.yml (NDK r29, min API 25);
+      # cmake.sh resolves $ANDROID_HOME/ndk/$NDK, gradle uses ndkVersion
+      NDK: "29.0.14206865"
+      ANDROID_API: "25"
 
     steps:
       - name: checkout openFrameworks

addons/ofxAndroid/Java/cc/openframeworks/OFAndroidLifeCycleHelper.java

@@ -273,14 +273,14 @@ public static void onResume(){
 				OFAndroid.onStart();
 			}
 		}
-		else if( glView.getRenderer() == null){
+		else if(glView == null || glView.getRenderer() == null){
 			Log.w(TAG,"onResume glView is null or not setup");
 			OFAndroid.setupGL(OFAndroid.eglVersion, true);
 			if(OFAndroidLifeCycle.coreLibraryLoaded && OFAndroidLifeCycle.appLibraryLoaded) {
 				OFAndroid.onStart();
 			}
 		}
-		else if( glView != null && glView.getDisplay() == null) {
+		else if(glView.getDisplay() == null) {
 			Log.w(TAG,"onResume glView has a null display");
 			OFAndroid.setupGL(OFAndroid.eglVersion, true);
 			if(OFAndroidLifeCycle.coreLibraryLoaded && OFAndroidLifeCycle.appLibraryLoaded) {

addons/ofxAndroid/src/ofAppAndroidWindow.cpp

@@ -122,14 +122,27 @@ ofAppAndroidWindow::ofAppAndroidWindow()  {
 	window = this;
 	msaaSamples = 1;
 	glesVersion = 2;
-
+	glesVersionMinor = 0;
+#ifdef TARGET_PROGRAMMABLE_GL
+    #ifdef GL_ES_VERSION_3_0
+        glesVersion = 3;
+        #ifdef GL_ES_VERSION_3_1
+            glesVersionMinor = 1;
+        #endif
+    #else
+        glesVersion = 2;
+    #endif
+#else
+    glesVersion = 1;
+#endif
 	ofGetMainLoop()->setCurrentWindow(this);
 }
 
 ofAppAndroidWindow::ofAppAndroidWindow(ofAppBaseWindow & other) {
 	window = this;
 	msaaSamples = 1;
 	glesVersion = 2;
+	glesVersionMinor = 0;
 	setMultiWindowMode(other.getWindowMode());
 	ofGetMainLoop()->setCurrentWindow(this);
 }
@@ -164,47 +177,44 @@ ofAppAndroidWindow::~ofAppAndroidWindow() {
 	// TODO Auto-generated destructor stub
 }
 
+
 bool ofAppAndroidWindow::isSurfaceDestroyed() {
 	return surfaceDestroyed;
 }
 
 void ofAppAndroidWindow::setup(const ofGLESWindowSettings & settings)
 {
+	glesVersion = settings.getGLESVersionMajor();
+    glesVersionMinor = settings.getGLESVersionMinor();
 	setup( (const ofxAndroidWindowSettings &)settings );
 }
 
 void ofAppAndroidWindow::setup(const ofxAndroidWindowSettings & settings){
 
+	glesVersion = settings.getGLESVersionMajor();
+    glesVersionMinor = settings.getGLESVersionMinor();
 	if(window == nullptr) {
 		ofLogError("ofAppAndroidWindow") << "Setup and Window is nullptr ! Fixing";
 		setCurrentWindow();
 	}
-	glesVersion = settings.glesVersion;
 	ofLogError("ofAppAndroidWindow") << "Setup OpenGLES:" << glesVersion;
 	if(glesVersion<2){
 		currentRenderer = std::make_shared<ofGLRenderer>(this);
 	}else{
 		currentRenderer = std::make_shared<ofGLProgrammableRenderer>(this);
 	}
-
 	jclass javaClass = ofGetJNIEnv()->FindClass("cc/openframeworks/OFAndroid");
-
 	if(javaClass==nullptr){
 		ofLogError("ofAppAndroidWindow") << "setupOpenGL(): couldn't find OFAndroid java class";
 		return;
 	}
-
 	makeCurrent();
-
 	jmethodID method = ofGetJNIEnv()->GetStaticMethodID(javaClass,"setupGL","(IZ)V");
 	if(!method){
 		ofLogError("ofAppAndroidWindow") << "setupOpenGL(): couldn't find OFAndroid setupGL method";
 		return;
 	}
-
 	ofGetJNIEnv()->CallStaticVoidMethod(javaClass,method,glesVersion,settings.preserveContextOnPause);
-
-
 }
 
 void ofAppAndroidWindow::update(){
@@ -330,6 +340,10 @@ int ofAppAndroidWindow::getGlesVersion()
 	return glesVersion;
 }
 
+int ofAppAndroidWindow::getGlesVersionMinor()
+{
+	return glesVersionMinor;
+}
 
 extern "C"{
 
@@ -443,57 +457,46 @@ Java_cc_openframeworks_OFAndroid_onSurfaceDestroyed( JNIEnv*  env, jclass  thiz
 	}
 }
 
+
 JNIEXPORT void JNICALL
-Java_cc_openframeworks_OFAndroid_onSurfaceCreated( JNIEnv*  env, jclass  thiz ){
-	if(appSetup){
-		ofLogVerbose("ofAppAndroidWindow") << "onSurfaceCreated";
-		if(!surfaceDestroyed){
-			ofNotifyEvent(ofxAndroidEvents().unloadGL);
-		}
-		ofNotifyEvent(ofxAndroidEvents().reloadGL);
-		window->renderer()->pushStyle();
-		window->renderer()->setupGraphicDefaults();
-		window->renderer()->popStyle();
-		window->setThreadedEvents(false);
-        int glesVersion = window->getGlesVersion();
-		bSetupScreen = true;
-		if( glesVersion < 2 )
-		{
-			ofLogVerbose("ofAppAndroidWindow") << "onSurfaceCreated OpenGLES 1";
-			dynamic_cast<ofGLRenderer*>(window->renderer().get())->setup();
-		}
-		else
-		{
-			ofLogVerbose("ofAppAndroidWindow") << "onSurfaceCreated OpenGLES 2.0";
-			dynamic_cast<ofGLProgrammableRenderer*>(window->renderer().get())->setup(glesVersion,0);
-		}
+Java_cc_openframeworks_OFAndroid_onSurfaceCreated( JNIEnv* env, jclass thiz ){
+    ofLogVerbose("ofAppAndroidWindow") << "onSurfaceCreated";
 
-	}else{
-		if(window != nullptr) {
-			int glesVersion = window->getGlesVersion();
-			bSetupScreen = true;
-			if (glesVersion < 2) {
-				ofLogVerbose("ofAppAndroidWindow") << "onSurfaceCreated OpenGLES 1";
-				dynamic_cast<ofGLRenderer *>(window->renderer().get())->setup();
-			} else {
-				ofLogVerbose("ofAppAndroidWindow") << "onSurfaceCreated OpenGLES 2.0";
-				dynamic_cast<ofGLProgrammableRenderer *>(window->renderer().get())->setup(
-						glesVersion, 0);
-			}
-		}
-	}
+    if(!surfaceDestroyed && appSetup){
+        ofNotifyEvent(ofxAndroidEvents().unloadGL);
+    }
+    ofNotifyEvent(ofxAndroidEvents().reloadGL);
+
+    if(appSetup){
+        window->renderer()->pushStyle();
+        window->renderer()->setupGraphicDefaults();
+        window->renderer()->popStyle();
+        window->setThreadedEvents(false);
+    }
+
+    bSetupScreen = true;
+    int glesVersion = window->getGlesVersion();
+    int glesVersionMinor = window->getGlesVersionMinor();
+
+    if(glesVersion < 2){
+        ofLogVerbose("ofAppAndroidWindow") << "onSurfaceCreated OpenGLES 1";
+        dynamic_cast<ofGLRenderer*>(window->renderer().get())->setup();
+    }else{
+        ofLogVerbose("ofAppAndroidWindow") << "onSurfaceCreated OpenGLES 2.0+";
+        dynamic_cast<ofGLProgrammableRenderer*>(window->renderer().get())->setup(glesVersion, glesVersionMinor);
+    }
 
-	surfaceDestroyed = false;
+    surfaceDestroyed = false;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_cc_openframeworks_OFAndroid_isWindowReady( JNIEnv*  env, jclass  thiz) {
 
-          if(window != nullptr && window->renderer() != nullptr) {
-            return true;
-      } else {
+    if(window != nullptr && window->renderer() != nullptr) {
+        return true;
+    } else {
         return false;
-        }
+    }
 }
 
 JNIEXPORT void JNICALL
@@ -554,25 +557,19 @@ Java_cc_openframeworks_OFAndroid_setAssetManager(JNIEnv *env, jclass thiz,
 		jobject jAssetManager) {
 
 	env->NewGlobalRef(jAssetManager);
-
 	AAssetManager *aaAssetManager = AAssetManager_fromJava(env, jAssetManager);
 	if (aaAssetManager == nullptr) {
 		ofLogError("ofAppAndroidWindow") << "Could not obtain the AAssetManager";
 		return;
 	}
-
 	assetManager = aaAssetManager;
 
 	if(window == nullptr || (window != nullptr && window->renderer() == nullptr)) {
 		ofLogVerbose("ofAppAndroidWindow") << "setAssetManager window is null";
 		return;
 	}
-
 	window->setAssetManager(assetManager);
 
-
-
-
 }
 
 /* Call to render the next GL frame */

addons/ofxAndroid/src/ofAppAndroidWindow.h

@@ -110,16 +110,20 @@ class ofAppAndroidWindow: public ofAppBaseGLESWindow {
 
 
 	int 	getGlesVersion();
+	int     getGlesVersionMinor();
 
 	AAssetManager& getAssetManager();
 	void setAssetManager(AAssetManager* assetManager);
 
+	int glesVersion;
+	int glesVersionMinor;
+
 
 
 private:
 	ofCoreEvents coreEvents;
 	std::shared_ptr<ofBaseRenderer> currentRenderer;
-	int glesVersion;
+
 	int msaaSamples;
 	AAssetManager* assetManager = nullptr;
 

addons/ofxAndroid/src/ofxAndroidVideoGrabber.cpp

@@ -132,35 +132,34 @@ ofxAndroidVideoGrabber::Data::~Data(){
 }
 
 void ofxAndroidVideoGrabber::Data::loadTexture(){
-	ofTextureData td;
-	GLuint texId[1];
-	glGenTextures(1, texId);
-
-	glEnable(GL_TEXTURE_EXTERNAL_OES);
-	glBindTexture(GL_TEXTURE_EXTERNAL_OES, texId[0]);
-
-	glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	if (!ofIsGLProgrammableRenderer()) {
-		glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-	}
+    ofTextureData td;
+    GLuint texId[1];
+    glGenTextures(1, texId);
+
+    glEnable(GL_TEXTURE_EXTERNAL_OES);
+    glBindTexture(GL_TEXTURE_EXTERNAL_OES, texId[0]);
 
-	glDisable(GL_TEXTURE_EXTERNAL_OES);
+    glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
-	// Set the externally created texture reference
-	texture.setUseExternalTextureID(texId[0]);
-	texture.texData.width = width;
-	texture.texData.height = height;
-	texture.texData.tex_w = width;
-	texture.texData.tex_h = height;
-	texture.texData.tex_t = 1; // Hack!
-	texture.texData.tex_u = 1;
-	texture.texData.textureTarget = GL_TEXTURE_EXTERNAL_OES;
-	texture.texData.glInternalFormat = GL_RGBA;
+#ifndef TARGET_PROGRAMMABLE_GL
+    glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+#endif
 
+    glDisable(GL_TEXTURE_EXTERNAL_OES);
 
+    // Set the externally created texture reference
+    texture.setUseExternalTextureID(texId[0]);
+    texture.texData.width = width;
+    texture.texData.height = height;
+    texture.texData.tex_w = width;
+    texture.texData.tex_h = height;
+    texture.texData.tex_t = 1; // Hack!
+    texture.texData.tex_u = 1;
+    texture.texData.textureTarget = GL_TEXTURE_EXTERNAL_OES;
+    texture.texData.glInternalFormat = GL_RGBA;
 }
 
 
@@ -262,7 +261,7 @@ void ofxAndroidVideoGrabber::close(){
     } else {
         ofLogError("ofxAndroidVideoGrabber") << "close(): couldn't get OFAndroidVideoGrabber close grabber method";
     }
-    
+
     data->bGrabberInited = false;
 }
 

addons/ofxAndroid/src/ofxAndroidVideoPlayer.cpp

@@ -26,7 +26,9 @@ void ofxAndroidVideoPlayer::reloadTexture(){
 	glTexParameterf(texture.texData.textureTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameterf(texture.texData.textureTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 	glTexParameterf(texture.texData.textureTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+#ifndef TARGET_PROGRAMMABLE_GL
 	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+#endif
 
 	glDisable(texture.texData.textureTarget);
 

addons/ofxEmscripten/src/ofxAppEmscriptenWindow.cpp

@@ -43,12 +43,18 @@ void ofxAppEmscriptenWindow::setup(const ofGLESWindowSettings & settings){
 	attrs.alpha = 0;
 
 	context = emscripten_webgl_create_context("#canvas", &attrs);
+	int glesMajor = 3; // WebGL 2 == GLES 3
+	if (!context) {
+		attrs.majorVersion = 1;
+		context = emscripten_webgl_create_context("#canvas", &attrs);
+		glesMajor = 2; // WebGL 1 == GLES 2
+	}
 	assert(context);
 
 	makeCurrent();
 
 	_renderer = std::make_shared<ofGLProgrammableRenderer>(this);
-	((ofGLProgrammableRenderer*)_renderer.get())->setup(2,0);
+	((ofGLProgrammableRenderer*)_renderer.get())->setup(glesMajor, 0);
 
     emscripten_set_keydown_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,useCapture,&keydown_cb);
     emscripten_set_keyup_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,useCapture,&keyup_cb);
@@ -359,7 +365,7 @@ EM_BOOL ofxAppEmscriptenWindow::mousedown_cb(int eventType, const EmscriptenMous
 	return true;
 }
 EM_BOOL ofxAppEmscriptenWindow::rescale(int* x, int* y) {
-
+	return false;
 }
 
 //------------------------------------------------------------

addons/ofxEmscripten/src/ofxEmscriptenURLFileLoader.cpp

@@ -24,7 +24,7 @@ ofHttpResponse ofxEmscriptenURLFileLoader::get(const string & url){
 
 int ofxEmscriptenURLFileLoader::getAsync(const string & url, const string & name){
 	ofHttpRequest * req = new ofHttpRequest(url,name,false);
-#if __EMSCRIPTEN_major__>1 || (__EMSCRIPTEN_major__==1 && __EMSCRIPTEN_minor__>22)
+#if __EMSCRIPTEN_major__ > 1 || (__EMSCRIPTEN_major__ == 1 && __EMSCRIPTEN_minor__ > 22)
 	emscripten_async_wget2_data(url.c_str(), "GET", "", req, true, &onload_cb, &onerror_cb, NULL);
 #endif
 	return req->getId();
@@ -37,7 +37,7 @@ ofHttpResponse ofxEmscriptenURLFileLoader::saveTo(const string & url, const of::
 
 int ofxEmscriptenURLFileLoader::saveAsync(const string & url, const of::filesystem::path & path){
 	ofHttpRequest * req = new ofHttpRequest(url,url,true);
-#if __EMSCRIPTEN_major__>1 || (__EMSCRIPTEN_major__==1 && __EMSCRIPTEN_minor__>22)
+#if __EMSCRIPTEN_major__ > 1 || (__EMSCRIPTEN_major__ == 1 && __EMSCRIPTEN_minor__ > 22)
 	emscripten_async_wget2(url.c_str(), path.c_str(), "GET", "", req, &onload_file_cb, &onerror_file_cb, NULL);
 #endif
 	return 0;