Merge "EmuGL: Add OnPost callback to OpenGL renderer"

2 files changed, 11 insertions, 5 deletions

diff --git a/android/opengles.c b/android/opengles.c
index 5a29d3a..f116f25 100644
--- a/android/opengles.c
+++ b/android/opengles.c
@@ -41,7 +41,7 @@ int  android_gles_fast_pipes = 1;
 #define DYNLINK_FUNCTIONS  \
   DYNLINK_FUNC(int,initLibrary,(void),(),return) \
   DYNLINK_FUNC(int,setStreamMode,(int a),(a),return) \
-  DYNLINK_FUNC(int,initOpenGLRenderer,(int width, int height, int port),(width,height,port),return) \
+  DYNLINK_FUNC(int,initOpenGLRenderer,(int width, int height, int port, OnPostFn onPost, void* onPostContext),(width,height,port,onPost,onPostContext),return) \
   DYNLINK_FUNC(int,createOpenGLSubwindow,(void* window, int x, int y, int width, int height, float zRot),(window,x,y,width,height,zRot),return)\
   DYNLINK_FUNC(int,destroyOpenGLSubwindow,(void),(),return)\
   DYNLINK_FUNC(void,repaintOpenGLDisplay,(void),(),)\
@@ -141,14 +141,14 @@ BAD_EXIT:
 }
 
 int
-android_startOpenglesRenderer(int width, int height)
+android_startOpenglesRenderer(int width, int height, OnPostFn onPost, void* onPostContext)
 {
     if (!rendererLib) {
         D("Can't start OpenGLES renderer without support libraries");
         return -1;
     }
 
-    if (initOpenGLRenderer(width, height,ANDROID_OPENGLES_BASE_PORT) != 0) {
+    if (initOpenGLRenderer(width, height, ANDROID_OPENGLES_BASE_PORT, onPost, onPostContext) != 0) {
         D("Can't start OpenGLES renderer?");
         return -1;
     }
diff --git a/android/opengles.h b/android/opengles.h
index 2202e92..7bb6a3a 100644
--- a/android/opengles.h
+++ b/android/opengles.h
@@ -16,6 +16,10 @@
 
 #define ANDROID_OPENGLES_BASE_PORT  22468
 
+/* See the description in render_api.h. */
+typedef void (*OnPostFn)(void* context, int width, int height, int ydir,
+                         int format, int type, unsigned char* pixels);
+
 /* Call this function to initialize the hardware opengles emulation.
  * This function will abort if we can't find the corresponding host
  * libraries through dlopen() or equivalent.
@@ -23,9 +27,11 @@
 int android_initOpenglesEmulation(void);
 
 /* Tries to start the renderer process. Returns 0 on success, -1 on error.
- * At the moment, this must be done before the VM starts.
+ * At the moment, this must be done before the VM starts. The onPost callback
+ * may be NULL.
  */
-int android_startOpenglesRenderer(int width, int height);
+int android_startOpenglesRenderer(int width, int height,
+                                  OnPostFn onPost, void* onPostContext);
 
 int android_showOpenglesWindow(void* window, int x, int y, int width, int height, float rotation);