mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-15 09:40:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) Not sure if we have to do this 'event loop' in gfx_ctx_check_window

Browse Source 
- make it sample one frame of events and that is it - also comment out
accelerometer stuff for now
This commit is contained in:
twinaphex 2012-10-21 16:37:15 +02:00
parent 81b2cce5ac
commit 647fd0abf0
3 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
android/native/jni/Android.mk
View File

@ -1,8 +1,21 @@
RARCH_VERSION = "0.9.7" RARCH_VERSION = "0.9.7"
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
PERF_TEST := 1
include $(CLEAR_VARS) include $(CLEAR_VARS)
ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -DANDROID_ARM -marm
endif
ifeq ($(TARGET_ARCH),x86)
LOCAL_CFLAGS += -DANDROID_X86
endif
ifeq ($(TARGET_ARCH),mips)
LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
endif
LOCAL_MODULE := retroarch-activity LOCAL_MODULE := retroarch-activity
HAVE_OPENSL := 1 HAVE_OPENSL := 1
@ -44,8 +57,12 @@ LOCAL_SRC_FILES = $(RARCH_PATH)/retroarch.c \
$(RARCH_PATH)/thread.c \ $(RARCH_PATH)/thread.c \
main.c main.c
ifeq ($(PERF_TEST), 1)
LOCAL_SRC_FILES += $(RARCH_PATH)/benchmark.c
LOCAL_CFLAGS += -DPERF_TEST
endif
LOCAL_CFLAGS = -marm -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 LOCAL_CFLAGS += -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99
LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl -lz LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl -lz

1
android/native/jni/Application.mk
View File

@ -1 +1,2 @@
APP_PLATFORM := android-9 APP_PLATFORM := android-9
APP_ABI := armeabi armeabi-v7a

12
gfx/context/androidegl_ctx.c
View File

@ -171,22 +171,25 @@ static void gfx_ctx_check_window(bool *quit,
// If not animating, we will block forever waiting for events. // If not animating, we will block forever waiting for events.
// If animating, we loop until all events are read, then continue // If animating, we loop until all events are read, then continue
// to draw the next frame of animation. // to draw the next frame of animation.
while ((ident=ALooper_pollAll(g_android.animating ? 0 : -1, NULL, &events, ident=ALooper_pollAll(g_android.animating ? 0 : -1, NULL, &events,
(void**)&source)) >= 0) (void**)&source);
{
// Process this event. // Process this event.
if (source != NULL) if (source != NULL)
source->process(state, source); source->process(state, source);
// If a sensor has data, process it now. // If a sensor has data, process it now.
/*
if (ident == LOOPER_ID_USER && g_android.accelerometerSensor != NULL) if (ident == LOOPER_ID_USER && g_android.accelerometerSensor != NULL)
{ {
ASensorEvent event; ASensorEvent event;
while (ASensorEventQueue_getEvents(g_android.sensorEventQueue, &event, 1) > 0) while (ASensorEventQueue_getEvents(g_android.sensorEventQueue, &event, 1) > 0)
{ {
//RARCH_LOG("accelerometer: x=%f y=%f z=%f.\n", event.acceleration.x, event.acceleration.y, event.acceleration.z); RARCH_LOG("accelerometer: x=%f y=%f z=%f.\n", event.acceleration.x,
event.acceleration.y, event.acceleration.z);
} }
} }
*/
// Check if we are exiting. // Check if we are exiting.
if (state->destroyRequested != 0) if (state->destroyRequested != 0)
@ -196,7 +199,6 @@ static void gfx_ctx_check_window(bool *quit,
gfx_ctx_destroy(); gfx_ctx_destroy();
return; return;
} }
}
if (g_android.animating) if (g_android.animating)
{ {