- solid wip hooking in surface create, starting user thread

Author: polymonster

core/pen/source/android/os.cpp

@@ -9,13 +9,21 @@
 #include <jni.h>
 #include <stdio.h>
 
+#include <android/asset_manager.h>
+#include <android/asset_manager_jni.h>
+#include <android/native_window_jni.h>
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+
 // need to copy example/src/main/jniLibs (fmod)
 // inject strings for other samples res/values
 
 // BLOG NOTES:
 // - gradle version, always changing
 // - depracated maven etc
 // - trying to link .so vs .a
+// - EGL_NONE, array terminator.
 // - No implementation found for void cc.pmtech.pen_activity.entry() (tried Java_cc_pmtech_pen_1activity_entry and Java_cc_pmtech_pen_1activity_entry__) - is the library loaded, e.g. System.loadLibrary?
 
 // DONE:
@@ -43,6 +51,84 @@ PEN_JNIFUNC(void, pen_1activity, entry)(JNIEnv* env, jclass thiz)
     PEN_LOG("hello print %i\n", 69);
 }
 
+PEN_JNIFUNC(void, SurfaceWrapper, render)(JNIEnv* env, jclass thiz, jobject caller)
+{
+    PEN_LOG("render%i\n", 79);
+}
+
+PEN_JNIFUNC(void, SurfaceWrapper, surface_1created)(JNIEnv* env, jclass thiz, jobject surface, int window_width, int window_height, int device_width, int device_height, int orientation, long app_ptr)
+{
+    auto window = ANativeWindow_fromSurface(env, surface);
+
+    EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+    PEN_ASSERT(display != EGL_NO_DISPLAY);
+    EGLBoolean res = eglInitialize(display, nullptr, nullptr);
+    PEN_ASSERT(res == EGL_TRUE);
+
+    EGLint attr[] = {
+        EGL_BUFFER_SIZE, 32,
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES3_BIT_KHR,
+        EGL_NONE
+    };
+
+    EGLint num_configs;
+    EGLConfig config;
+    res = eglChooseConfig(display, &attr[0], &config, 1, &num_configs);
+    PEN_ASSERT(res == EGL_TRUE);
+
+    EGLint ctx_attr[] = {
+        EGL_CONTEXT_MAJOR_VERSION, 2,
+        EGL_NONE
+    };
+
+    eglBindAPI(EGL_OPENGL_ES_API);
+    EGLContext context = eglCreateContext(display, config, EGL_NO_CONTEXT, ctx_attr);
+    PEN_ASSERT(context != EGL_NO_CONTEXT);
+
+    EGLSurface egl_surface = eglCreateWindowSurface(display, config, window, nullptr);
+    PEN_ASSERT(surface != EGL_NO_SURFACE);
+
+    res = eglMakeCurrent(
+            display,
+            egl_surface,
+            egl_surface,
+            context
+    );
+    PEN_ASSERT(res == EGL_TRUE);
+
+    eglSwapBuffers(display, egl_surface);
+
+    // TODO: call user_setup
+    pen::pen_creation_params params = pen::pen_entry(0, nullptr);
+
+    pen::jobs_create_job(params.user_thread_function, 1024 * 1024, params.user_data, pen::e_thread_start_flags::detached);
+
+    /*
+    // for get elapsed time
+    s_startTime = getElapsedTimeMs();
+
+    s_context.m_windowWidth = windowWidth;
+    s_context.m_windowHeight = windowHeight;
+
+    if(s_context.m_device.m_window)
+        ANativeWindow_release(s_context.m_device.m_window);
+    s_context.m_device.m_window = ANativeWindow_fromSurface(env, surface);
+    s_context.m_device.m_surfaceWrapperClass = thiz;
+
+    fw::gfx::createMainContext((fw::gfx::Device)&s_context.m_device);
+
+    fw::AppConfig::get()->setupSystemInfo();
+
+    if (!s_context.m_app && appPtr != 0)
+    {
+        FW_LOG_CONSOLE("Surface created with width=%d, height=%d\n", s_context.m_windowWidth, s_context.m_windowHeight);
+
+        s_context.m_app = (App*)((intptr_t)appPtr);
+        s_context.m_app->setup();
+    }
+    */
+}
+
 namespace pen
 {
     u32 window_init(void* params)

core/pen/source/posix/threads.cpp

@@ -108,11 +108,17 @@ namespace pen
     {
         pen::semaphore* new_semaphore = (pen::semaphore*)pen::memory_alloc(sizeof(pen::semaphore));
 
+#ifndef PEN_PLATFORM_ANDROID
         c8 name_buf[32];
         pen::string_format(&name_buf[0], 32, "sem%i%i", semaphone_index++, window_get_id());
 
         sem_unlink(name_buf);
         new_semaphore->handle = sem_open(name_buf, O_CREAT, 0, 0);
+#else
+        new_semaphore->handle = (sem_t*)malloc(sizeof(sem_t));
+        memset(new_semaphore->handle, 0x0, sizeof(sem_t));
+        sem_init(new_semaphore->handle, 0, 0);
+#endif
 
         assert(!(new_semaphore->handle == (void*)-1));
         return new_semaphore;

core/template/android/activity/pen_activity.java

@@ -49,6 +49,8 @@ class VideoSurfaceTexture extends SurfaceTexture
 // new graphics api agnostic implementation of android surface to support native egl and vulkan
 class SurfaceWrapper extends SurfaceView implements SurfaceHolder.Callback, SurfaceTexture.OnFrameAvailableListener {
 
+	public static native void surface_created(Surface surface, int window_width, int window_height, int display_width, int display_height, int orientation, long app_ptr);
+	public static native void render(SurfaceWrapper caller);
     /*
     public static native void render(SurfaceWrapper caller);
     public static native long fwEntry();
@@ -97,28 +99,31 @@ protected void onDraw(Canvas canvas)
     {
         Log.d("PMTECH", "onDraw");
 
-        // render(this);
+        render(this);
         invalidate();
     }
 
     @Override
     public void surfaceCreated(SurfaceHolder holder)
     {
         Log.d("PMTECH", "surfaceCreated");
+
         /*
-        setWillNotDraw(false);
         if(appPtr == 0) {
-        
+
         }
-        Surface surf = holder.getSurface();
-        onSurfaceCreated(surf, m_windowWidth, m_windowHeight, m_displayWidth, m_displayHeight, orientation, appPtr); // creates entry point and stuff
         */
+
+        setWillNotDraw(false);
+        Surface surf = holder.getSurface();
+        surface_created(surf, m_windowWidth, m_windowHeight, m_displayWidth, m_displayHeight, orientation, appPtr); // creates entry point and stuff
     }
 
     @Override
     public void surfaceChanged(SurfaceHolder holder, int format, int width, int height)
     {
         Log.d("PMTECH", "surfaceChanged");
+
         // m_touchHeight = height;
         //onSurfaceChanged(width, height);
     }
@@ -289,6 +294,10 @@ protected void onCreate(Bundle arg0) {
 
         android.view.SurfaceView view = new SurfaceWrapper(this);
 
+        // device dims
+
+        setContentView(view);
+
 		entry();
 
 		super.onCreate(arg0);