diff options
| author | Glenn | 2017-12-11 06:42:51 +1100 |
|---|---|---|
| committer | Glenn | 2017-12-11 06:42:51 +1100 |
| commit | 778ad9ceb24770bfb4d3b9d697429475c55009ee (patch) | |
| tree | 292da3162181f04743914be773714f3362636434 | |
| parent | 8fb0f7c5551ed450ef3ed56615e0d86f1b56739d (diff) | |
| download | pcsx_rearmed-778ad9ceb24770bfb4d3b9d697429475c55009ee.tar.gz pcsx_rearmed-778ad9ceb24770bfb4d3b9d697429475c55009ee.tar.bz2 pcsx_rearmed-778ad9ceb24770bfb4d3b9d697429475c55009ee.zip | |
checks arm64 properly now
| -rw-r--r-- | Makefile.libretro | 12 | ||||
| -rw-r--r-- | frontend/cspace.c | 30 |
2 files changed, 21 insertions, 21 deletions
diff --git a/Makefile.libretro b/Makefile.libretro index de818aa..c1e4051 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -63,6 +63,8 @@ else ifeq ($(platform),$(filter $(platform),ios9 ios-arm64)) else ifneq (,$(findstring ios,$(platform))) ARCH := arm USE_DYNAREC ?= 1 + HAVE_NEON = 1 + BUILTIN_GPU = neon TARGET := $(TARGET_NAME)_libretro_ios.dylib ifeq ($(USE_DYNAREC),0) # Override @@ -79,8 +81,6 @@ endif CC_AS = perl ./tools/gas-preprocessor.pl $(CC) CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon - HAVE_NEON = 1 - BUILTIN_GPU = neon CFLAGS += -DIOS ifeq ($(platform),ios9) CC += -miphoneos-version-min=8.0 @@ -129,7 +129,7 @@ else ifeq ($(platform), vita) AR = arm-vita-eabi-ar$(EXE_EXT) CFLAGS += -DVITA CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm - CFLAGS += -fsingle-precision-constant -mword-relocations -fno-unwind-tables + CFLAGS += -fsingle-precision-constant -mword-relocations -fno-unwind-tables CFLAGS += -fno-asynchronous-unwind-tables -ftree-vectorize -funroll-loops CFLAGS += -fno-optimize-sibling-calls CFLAGS += -I$(VITASDK)/include -Ifrontend/vita @@ -155,7 +155,7 @@ else ifeq ($(platform), ctr) CFLAGS += -DARM11 -D_3DS -DNO_OS -DNO_DYLIB -DNO_SOCKET CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft CFLAGS += -Wall -mword-relocations - CFLAGS += -fomit-frame-pointer -ffast-math + CFLAGS += -fomit-frame-pointer -ffast-math CFLAGS += -Ifrontend/3ds CFLAGS += -Werror=implicit-function-declaration @@ -216,7 +216,7 @@ else ifeq ($(platform), rpi2) ARCH = arm BUILTIN_GPU = neon USE_DYNAREC = 1 - + #Raspberry Pi 3 else ifeq ($(platform), rpi3) TARGET := $(TARGET_NAME)_libretro.so @@ -263,7 +263,7 @@ else BUILTIN_GPU = peops PLATFORM = libretro MAIN_LDFLAGS += -static-libgcc -static-libstdc++ -s - CFLAGS += -D__WIN32__ -DNO_DYLIB + CFLAGS += -D__WIN32__ -DNO_DYLIB MMAP_WIN32=1 MAIN_LDLIBS += -lws2_32 LIBPTHREAD := diff --git a/frontend/cspace.c b/frontend/cspace.c index 26f311f..55d4ac6 100644 --- a/frontend/cspace.c +++ b/frontend/cspace.c @@ -34,7 +34,7 @@ void bgr555_to_rgb565(void *dst_, const void *src_, int bytes) #endif -#ifndef __ARM64__ +#ifdef __arm64__ void bgr888_to_rgb565(void *dst_, const void *src_, int bytes) { @@ -60,20 +60,20 @@ void bgr888_to_rgb565(void *dst_, const void *src_, int bytes) void bgr888_to_rgb565(void *dst_, const void *src_, int bytes) { - const unsigned char *src = src_; - unsigned int *dst = dst_; - unsigned int r1, g1, b1, r2, g2, b2; - - for (; bytes >= 6; bytes -= 6, src += 6, dst++) { - r1 = src[0] & 0xf8; - g1 = src[1] & 0xfc; - b1 = src[2] & 0xf8; - r2 = src[3] & 0xf8; - g2 = src[4] & 0xfc; - b2 = src[5] & 0xf8; - *dst = (r2 << 24) | (g2 << 19) | (b2 << 13) | - (r1 << 8) | (g1 << 3) | (b1 >> 3); - } + const unsigned char *src = src_; + unsigned int *dst = dst_; + unsigned int r1, g1, b1, r2, g2, b2; + + for (; bytes >= 6; bytes -= 6, src += 6, dst++) { + r1 = src[0] & 0xf8; + g1 = src[1] & 0xfc; + b1 = src[2] & 0xf8; + r2 = src[3] & 0xf8; + g2 = src[4] & 0xfc; + b2 = src[5] & 0xf8; + *dst = (r2 << 24) | (g2 << 19) | (b2 << 13) | + (r1 << 8) | (g1 << 3) | (b1 >> 3); + } } // TODO? |