From 4d99d93df04330ccc04d73755465b69d94179fda Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 31 Oct 2012 18:10:38 +0100 Subject: [PATCH] (Android) remove Android save state for now - unused and will probably reimplement it later --- android/native/jni/android-general.h | 9 --------- android/native/jni/main.c | 6 ------ gfx/context/androidegl_ctx.c | 2 -- 3 files changed, 17 deletions(-) diff --git a/android/native/jni/android-general.h b/android/native/jni/android-general.h index 60fcaa7b05..98d87878c6 100644 --- a/android/native/jni/android-general.h +++ b/android/native/jni/android-general.h @@ -1,23 +1,14 @@ #ifndef _ANDROID_GENERAL_H #define _ANDROID_GENERAL_H -#include #include #include "../../../boolean.h" -struct saved_state -{ - float angle; - int32_t x; - int32_t y; -}; - struct droid { struct android_app* app; bool init_quit; bool window_inited; - struct saved_state state; }; extern struct droid g_android; diff --git a/android/native/jni/main.c b/android/native/jni/main.c index 0648996b10..01cd106540 100644 --- a/android/native/jni/main.c +++ b/android/native/jni/main.c @@ -38,9 +38,6 @@ static void engine_handle_cmd(struct android_app* app, int32_t cmd) case APP_CMD_SAVE_STATE: RARCH_LOG("engine_handle_cmd: APP_CMD_SAVE_STATE.\n"); // The system has asked us to save our current state. Do so. - g_android.app->savedState = malloc(sizeof(struct saved_state)); - *((struct saved_state*)g_android.app->savedState) = g_android.state; - g_android.app->savedStateSize = sizeof(struct saved_state); break; case APP_CMD_INIT_WINDOW: RARCH_LOG("engine_handle_cmd: APP_CMD_INIT_WINDOW.\n"); @@ -138,9 +135,6 @@ void android_main(struct android_app* state) g_android.app->onAppCmd = engine_handle_cmd; - if (g_android.app->savedState != NULL) // We are starting with a previous saved state; restore from it. - g_android.state = *(struct saved_state*)g_android.app->savedState; - int argc = 0; char *argv[MAX_ARGS] = {NULL}; diff --git a/gfx/context/androidegl_ctx.c b/gfx/context/androidegl_ctx.c index 0606e4f78e..ee28704d16 100644 --- a/gfx/context/androidegl_ctx.c +++ b/gfx/context/androidegl_ctx.c @@ -114,8 +114,6 @@ static bool gfx_ctx_init(void) !eglQuerySurface(g_egl_dpy, g_egl_surf, EGL_HEIGHT, &height)) goto error; - g_android.state.angle = 0; - return true; error: