X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=501b0671aa63505473f5edc56934db43902f6767;hb=0eacae49115dd106c08437c88500979b859f2370;hp=d8a01093f0b64c94798ed15d9104342dbe909f12;hpb=07ade526c4a0b1ddb316aff1459c1bdff31c267a;p=pcsx_rearmed.git

diff --git a/jni/Android.mk b/jni/Android.mk
index d8a01093..501b0671 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -113,16 +113,21 @@ endif
 HAVE_ARI64=0
 HAVE_LIGHTREC=0
 LIGHTREC_CUSTOM_MAP=0
+HAVE_GPU_NEON=0
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
   HAVE_ARI64=1
+  HAVE_GPU_NEON=1
 else ifeq ($(TARGET_ARCH_ABI),armeabi)
   HAVE_ARI64=1
 else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
   HAVE_ARI64=1
+  HAVE_GPU_NEON=1
 else ifeq ($(TARGET_ARCH_ABI),x86_64)
   HAVE_LIGHTREC=1
+  HAVE_GPU_NEON=1
 else ifeq ($(TARGET_ARCH_ABI),x86)
   HAVE_LIGHTREC=1
+  HAVE_GPU_NEON=1
 else
   COREFLAGS   += -DDRC_DISABLE
 endif
@@ -172,12 +177,17 @@ endif
 endif
 
 
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+ifeq ($(HAVE_GPU_NEON),1)
   COREFLAGS   += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP -DGPU_NEON
-  COREFLAGS   += -DHAVE_bgr555_to_rgb565 -DHAVE_bgr888_to_x
-  SOURCES_ASM += $(CORE_DIR)/gte_neon.S \
-                 $(NEON_DIR)/psx_gpu/psx_gpu_arm_neon.S \
-                 $(FRONTEND_DIR)/cspace_neon.S
+  ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+    COREFLAGS   += -DHAVE_bgr555_to_rgb565 -DHAVE_bgr888_to_x
+    SOURCES_ASM += $(CORE_DIR)/gte_neon.S \
+                   $(NEON_DIR)/psx_gpu/psx_gpu_arm_neon.S \
+                   $(FRONTEND_DIR)/cspace_neon.S
+  else
+    COREFLAGS   += -DSIMD_BUILD
+    SOURCES_C   += $(NEON_DIR)/psx_gpu/psx_gpu_simd.c
+  endif
   SOURCES_C   += $(NEON_DIR)/psx_gpu_if.c
 else ifeq ($(TARGET_ARCH_ABI),armeabi)
   COREFLAGS   += -DUSE_GPULIB=1 -DGPU_UNAI