From 7be2f81544baa29fd43d3201742100612a0a6a65 Mon Sep 17 00:00:00 2001 From: Munir Date: Sun, 17 Jan 2016 23:34:25 +0100 Subject: [PATCH 1/6] Initial support x64-android --- android/jni/Android.mk | 20 ++++++++++++++++++++ android/jni/Application.mk | 4 ++-- android/jni/Locals.mk | 12 ++++++++++++ ext/native/Android.mk | 5 +++++ ext/native/gfx/gl_common.h | 2 +- 5 files changed, 40 insertions(+), 3 deletions(-) diff --git a/android/jni/Android.mk b/android/jni/Android.mk index a4cdbbaa34..365b03b47f 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -31,6 +31,26 @@ ARCH_FILES := \ $(SRC)/GPU/Common/VertexDecoderX86.cpp endif +ifeq ($(TARGET_ARCH_ABI),x86_64) +ARCH_FILES := \ + $(SRC)/Common/ABI.cpp \ + $(SRC)/Common/x64Emitter.cpp \ + $(SRC)/Common/CPUDetect.cpp \ + $(SRC)/Common/Thunk.cpp \ + $(SRC)/Core/MIPS/x86/CompALU.cpp \ + $(SRC)/Core/MIPS/x86/CompBranch.cpp \ + $(SRC)/Core/MIPS/x86/CompFPU.cpp \ + $(SRC)/Core/MIPS/x86/CompLoadStore.cpp \ + $(SRC)/Core/MIPS/x86/CompVFPU.cpp \ + $(SRC)/Core/MIPS/x86/CompReplace.cpp \ + $(SRC)/Core/MIPS/x86/Asm.cpp \ + $(SRC)/Core/MIPS/x86/Jit.cpp \ + $(SRC)/Core/MIPS/x86/JitSafeMem.cpp \ + $(SRC)/Core/MIPS/x86/RegCache.cpp \ + $(SRC)/Core/MIPS/x86/RegCacheFPU.cpp \ + $(SRC)/GPU/Common/VertexDecoderX86.cpp +endif + ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a) ARCH_FILES := \ $(SRC)/GPU/Common/TextureDecoderNEON.cpp.neon \ diff --git a/android/jni/Application.mk b/android/jni/Application.mk index 2700b54041..85f2502981 100644 --- a/android/jni/Application.mk +++ b/android/jni/Application.mk @@ -1,5 +1,5 @@ APP_STL := gnustl_static APP_PLATFORM := android-9 -APP_ABI := arm64-v8a armeabi-v7a x86 +APP_ABI := arm64-v8a armeabi-v7a x86 x86_64 APP_GNUSTL_CPP_FEATURES := -# NDK_TOOLCHAIN_VERSION := 4.9 +NDK_TOOLCHAIN_VERSION := 4.9 diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk index 1e566d3298..45c3e33dd1 100644 --- a/android/jni/Locals.mk +++ b/android/jni/Locals.mk @@ -48,6 +48,18 @@ ifeq ($(TARGET_ARCH_ABI),x86) LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -D_M_IX86 -fomit-frame-pointer -mtune=atom -mfpmath=sse -mssse3 -mstackrealign endif + +ifeq ($(TARGET_ARCH_ABI),x86_64) + LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86_64/lib/libavformat.a + LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86_64/lib/libavcodec.a + LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86_64/lib/libswresample.a + LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86_64/lib/libswscale.a + LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86_64/lib/libavutil.a + LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/x86_64/include + + LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_64 -D_M_IX64 -fomit-frame-pointer -mtune=atom -mfpmath=sse -mssse3 -mstackrealign +endif + ifeq ($(TARGET_ARCH_ABI),arm64-v8a) LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/arm64/lib/libavformat.a LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/arm64/lib/libavcodec.a diff --git a/ext/native/Android.mk b/ext/native/Android.mk index 74dcec3855..eed7f0da13 100644 --- a/ext/native/Android.mk +++ b/ext/native/Android.mk @@ -116,5 +116,10 @@ LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_IX86 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ math/fast/fast_matrix_sse.c endif +else ifeq ($(TARGET_ARCH_ABI),x86_64) +LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_X64 +LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ + math/fast/fast_matrix_sse.c +endif include $(BUILD_STATIC_LIBRARY) diff --git a/ext/native/gfx/gl_common.h b/ext/native/gfx/gl_common.h index dc654ee77b..7a1bc97ef2 100644 --- a/ext/native/gfx/gl_common.h +++ b/ext/native/gfx/gl_common.h @@ -55,7 +55,7 @@ extern PFNGLDRAWTEXTURENVPROC glDrawTextureNV; typedef void (EGLAPIENTRYP PFNGLBLITFRAMEBUFFERNVPROC) ( GLint srcX0, GLint srcY0, GLint srcX1, GLuint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLuint dstY1, - GLint mask, GLenum filter); + GLbitfield mask, GLenum filter); #endif extern PFNGLBLITFRAMEBUFFERNVPROC glBlitFramebufferNV; From b7b93eec0b845e29c3f3eee5905f741dadc79dd0 Mon Sep 17 00:00:00 2001 From: Carlos Estrague Date: Sun, 17 Jan 2016 23:42:19 +0100 Subject: [PATCH 2/6] fix typo. --- android/jni/Locals.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk index 45c3e33dd1..327f81c1b4 100644 --- a/android/jni/Locals.mk +++ b/android/jni/Locals.mk @@ -57,7 +57,7 @@ ifeq ($(TARGET_ARCH_ABI),x86_64) LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86_64/lib/libavutil.a LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/x86_64/include - LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_64 -D_M_IX64 -fomit-frame-pointer -mtune=atom -mfpmath=sse -mssse3 -mstackrealign + LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_64 -D_M_X64 -fomit-frame-pointer -mtune=atom -mfpmath=sse -mssse3 -mstackrealign endif ifeq ($(TARGET_ARCH_ABI),arm64-v8a) From 2564314c0f03d48794ae6e33752bda3073d481a9 Mon Sep 17 00:00:00 2001 From: Carlos Estrague Date: Mon, 18 Jan 2016 01:11:19 +0100 Subject: [PATCH 3/6] fix typo again. fault copy/past. --- ext/native/Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/ext/native/Android.mk b/ext/native/Android.mk index eed7f0da13..28542deac3 100644 --- a/ext/native/Android.mk +++ b/ext/native/Android.mk @@ -115,7 +115,6 @@ else ifeq ($(TARGET_ARCH_ABI),x86) LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_IX86 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ math/fast/fast_matrix_sse.c -endif else ifeq ($(TARGET_ARCH_ABI),x86_64) LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_X64 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ From 76f22aaa46164c21758e6987bd4d1134ee188def Mon Sep 17 00:00:00 2001 From: Carlos Estrague Date: Mon, 18 Jan 2016 01:36:48 +0100 Subject: [PATCH 4/6] API changed --- ext/native/gfx/gl_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/native/gfx/gl_common.h b/ext/native/gfx/gl_common.h index 7a1bc97ef2..101869464d 100644 --- a/ext/native/gfx/gl_common.h +++ b/ext/native/gfx/gl_common.h @@ -53,8 +53,8 @@ typedef void (EGLAPIENTRYP PFNGLDRAWTEXTURENVPROC) (GLuint texture, GLuint sampl extern PFNGLDRAWTEXTURENVPROC glDrawTextureNV; #ifndef ARM64 typedef void (EGLAPIENTRYP PFNGLBLITFRAMEBUFFERNVPROC) ( - GLint srcX0, GLint srcY0, GLint srcX1, GLuint srcY1, - GLint dstX0, GLint dstY0, GLint dstX1, GLuint dstY1, + GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, + GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); #endif extern PFNGLBLITFRAMEBUFFERNVPROC glBlitFramebufferNV; From 64f492be65005dc2ea811764b4bf9e601d073012 Mon Sep 17 00:00:00 2001 From: Munir Date: Mon, 18 Jan 2016 11:17:47 +0100 Subject: [PATCH 5/6] update submodule --- ext/armips | 2 +- ffmpeg | 2 +- lang | 2 +- pspautotests | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/armips b/ext/armips index a192a20ac8..e47b9b575c 160000 --- a/ext/armips +++ b/ext/armips @@ -1 +1 @@ -Subproject commit a192a20ac87111f8de62d6c0e678b0e052e5ed63 +Subproject commit e47b9b575c235ef185ffbd0370d094860382aaef diff --git a/ffmpeg b/ffmpeg index 4deafba06d..a7cae9c5a5 160000 --- a/ffmpeg +++ b/ffmpeg @@ -1 +1 @@ -Subproject commit 4deafba06dffc373dd7fd61fa4a732b63401bf5b +Subproject commit a7cae9c5a5b48e903ae97f4c8afecc82b41eb218 diff --git a/lang b/lang index 68c2f7139d..8048183ff4 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 68c2f7139d64b99d3fa84769ea53b5a388a7f90e +Subproject commit 8048183ff4f4a122d92406f8e624745d624f5254 diff --git a/pspautotests b/pspautotests index 905c3018d0..e18cface3d 160000 --- a/pspautotests +++ b/pspautotests @@ -1 +1 @@ -Subproject commit 905c3018d01af9dfb511c87e65e07a49257a33ac +Subproject commit e18cface3db64ccb96738dc128fe769b28fff65c From e8097de515c0c0e4490ec3373a0d762f47dd7291 Mon Sep 17 00:00:00 2001 From: Munir Date: Tue, 19 Jan 2016 10:32:19 +0100 Subject: [PATCH 6/6] update --- ext/armips | 2 +- ffmpeg | 2 +- lang | 2 +- pspautotests | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/armips b/ext/armips index a192a20ac8..38573f0613 160000 --- a/ext/armips +++ b/ext/armips @@ -1 +1 @@ -Subproject commit a192a20ac87111f8de62d6c0e678b0e052e5ed63 +Subproject commit 38573f06133dc78db09e34fab81f9fa56f8b2292 diff --git a/ffmpeg b/ffmpeg index 4deafba06d..a7cae9c5a5 160000 --- a/ffmpeg +++ b/ffmpeg @@ -1 +1 @@ -Subproject commit 4deafba06dffc373dd7fd61fa4a732b63401bf5b +Subproject commit a7cae9c5a5b48e903ae97f4c8afecc82b41eb218 diff --git a/lang b/lang index 68c2f7139d..268952cc80 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 68c2f7139d64b99d3fa84769ea53b5a388a7f90e +Subproject commit 268952cc8045eabdeda21bd1c470cf93924f7d84 diff --git a/pspautotests b/pspautotests index 905c3018d0..e18cface3d 160000 --- a/pspautotests +++ b/pspautotests @@ -1 +1 @@ -Subproject commit 905c3018d01af9dfb511c87e65e07a49257a33ac +Subproject commit e18cface3db64ccb96738dc128fe769b28fff65c