ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(ARM) Add mrc ARM define for benchmark.c 

- Some Android build fixes
- Removed doubly defined static inline function
This commit is contained in:
twinaphex 2012-10-02 23:59:19 +02:00
parent 8dd51016dc
commit 0a20857a44
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/jni/Android.mk
View File

@ -7,7 +7,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := retroarch LOCAL_MODULE := retroarch
LOCAL_SRC_FILES = ../../console/griffin/griffin.c ../../console/rzlib/rzlib.c ../bifrost.c LOCAL_SRC_FILES = ../../console/griffin/griffin.c ../../console/rzlib/rzlib.c ../bifrost.c
LOCAL_CFLAGS = -DANDROID -DHAVE_DYNAMIC -DHAVE_DYLIB -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_VID_CONTEXT -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DINLINE=inline -DRARCH_CONSOLE -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -std=gnu99 LOCAL_CFLAGS = -DPERF_TEST -DANDROID -DHAVE_DYNAMIC -DHAVE_DYLIB -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_VID_CONTEXT -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DINLINE=inline -DRARCH_CONSOLE -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -std=gnu99
LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -lGLESv2 -llog LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -lGLESv2 -llog

3
benchmark.c
View File

@ -45,7 +45,8 @@ rarch_perf_tick_t rarch_get_perf_counter(void)
asm volatile ("rdtsc" : "=a" (a), "=d" (d)); asm volatile ("rdtsc" : "=a" (a), "=d" (d));
time = (rarch_perf_tick_t)a | ((rarch_perf_tick_t)d << 32); time = (rarch_perf_tick_t)a | ((rarch_perf_tick_t)d << 32);
#endif #endif
#elif defined(__ARM_ARCH_6__)
asm volatile( "mrc p15, 0, %0, c9, c13, 0" : "=r"(time) );
#elif defined(__CELLOS_LV2__) || defined(GEKKO) || defined(_XBOX360) #elif defined(__CELLOS_LV2__) || defined(GEKKO) || defined(_XBOX360)
time = __mftb(); time = __mftb();
#endif #endif

9
console/griffin/griffin.c
View File

@ -99,8 +99,6 @@ VIDEO CONTEXT
#include "../../gfx/context/xdk_ctx.c" #include "../../gfx/context/xdk_ctx.c"
#elif defined(HAVE_EGL) #elif defined(HAVE_EGL)
#include "../../gfx/context/egl_ctx.c" #include "../../gfx/context/egl_ctx.c"
#else
#include "../../gfx/context/null_ctx.c"
#endif #endif
#endif #endif
@ -135,6 +133,13 @@ VIDEO IMAGE
VIDEO DRIVER VIDEO DRIVER
============================================================ */ ============================================================ */
#if defined(ANDROID)
#include "../../gfx/scaler/scaler.c"
#include "../../gfx/scaler/pixconv.c"
#include "../../gfx/scaler/scaler_int.c"
#include "../../gfx/scaler/filter.c"
#endif
#if defined(HAVE_OPENGL) #if defined(HAVE_OPENGL)
#include "../../gfx/math/matrix.c" #include "../../gfx/math/matrix.c"
#include "../../gfx/gl.c" #include "../../gfx/gl.c"

14
gfx/scaler/filter.c
View File

@ -16,6 +16,7 @@
#include "filter.h" #include "filter.h"
#include "scaler_int.h" #include "scaler_int.h"
#include "../../general.h"
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -102,19 +103,6 @@ static inline double sinc(double phase)
return sin(phase) / phase; return sin(phase) / phase;
} }
static inline unsigned next_pow2(unsigned v)
{
v--;
v |= v >> 1;
v |= v >> 2;
v |= v >> 4;
v |= v >> 8;
v |= v >> 16;
v++;
return v;
}
static void gen_filter_sinc_sub(struct scaler_filter *filter, int len, int pos, int step, double phase_mul) static void gen_filter_sinc_sub(struct scaler_filter *filter, int len, int pos, int step, double phase_mul)
{ {
const int sinc_size = filter->filter_len; const int sinc_size = filter->filter_len;