diff options
| author | Jesse Hall <jessehall@google.com> | 2012-03-22 14:02:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-22 14:02:28 -0700 |
| commit | 11c29fbcb16ef22a469a6014039888e0980b186e (patch) | |
| tree | 78692ae4b719a9dda080b4964f30cd0d502a66bf /android/opengles.h | |
| parent | bfc88b6eabf744f1f3fd59f9d38bccc87146bb14 (diff) | |
| parent | 82cb5a041bfa5fa0495e8c9e570371bf708af11a (diff) | |
| download | external_qemu-11c29fbcb16ef22a469a6014039888e0980b186e.zip external_qemu-11c29fbcb16ef22a469a6014039888e0980b186e.tar.gz external_qemu-11c29fbcb16ef22a469a6014039888e0980b186e.tar.bz2 | |
Merge "Revert "EmuGL: Add OnPost callback to OpenGL renderer""
Diffstat (limited to 'android/opengles.h')
| -rw-r--r-- | android/opengles.h | 10 |
1 files changed, 2 insertions, 8 deletions
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); |