diff options
| -rw-r--r-- | android/opengles.c | 6 | ||||
| -rw-r--r-- | android/opengles.h | 10 | ||||
| -rw-r--r-- | vl-android.c | 3 |
3 files changed, 6 insertions, 13 deletions
diff --git a/android/opengles.c b/android/opengles.c index f116f25..5a29d3a 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, OnPostFn onPost, void* onPostContext),(width,height,port,onPost,onPostContext),return) \ + DYNLINK_FUNC(int,initOpenGLRenderer,(int width, int height, int port),(width,height,port),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, OnPostFn onPost, void* onPostContext) +android_startOpenglesRenderer(int width, int height) { if (!rendererLib) { D("Can't start OpenGLES renderer without support libraries"); return -1; } - if (initOpenGLRenderer(width, height, ANDROID_OPENGLES_BASE_PORT, onPost, onPostContext) != 0) { + if (initOpenGLRenderer(width, height,ANDROID_OPENGLES_BASE_PORT) != 0) { D("Can't start OpenGLES renderer?"); return -1; } diff --git a/android/opengles.h b/android/opengles.h index 7bb6a3a..2202e92 100644 --- a/android/opengles.h +++ b/android/opengles.h @@ -16,10 +16,6 @@ #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. @@ -27,11 +23,9 @@ typedef void (*OnPostFn)(void* context, int width, int height, int ydir, 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. The onPost callback - * may be NULL. + * At the moment, this must be done before the VM starts. */ -int android_startOpenglesRenderer(int width, int height, - OnPostFn onPost, void* onPostContext); +int android_startOpenglesRenderer(int width, int height); int android_showOpenglesWindow(void* window, int x, int y, int width, int height, float rotation); diff --git a/vl-android.c b/vl-android.c index bf50b77..1ec910b 100644 --- a/vl-android.c +++ b/vl-android.c @@ -3877,8 +3877,7 @@ int main(int argc, char **argv, char **envp) if (android_hw->hw_gpu_enabled) { if (android_initOpenglesEmulation() == 0) { gles_emul = 1; - android_startOpenglesRenderer(android_hw->hw_lcd_width, android_hw->hw_lcd_height, - NULL, NULL); + android_startOpenglesRenderer(android_hw->hw_lcd_width, android_hw->hw_lcd_height); } else { dwarning("Could not initialize OpenglES emulation, using software renderer."); } |