From c82f907a99f7d0d3071471489d247f4b4394a8b7 Mon Sep 17 00:00:00 2001 From: notaz Date: Fri, 8 Feb 2013 02:05:48 +0200 Subject: [PATCH] move cspace back to frontend plugins no longer depend on it --- Makefile | 10 +++++----- {plugins/gpulib => frontend}/cspace.c | 0 {plugins/gpulib => frontend}/cspace.h | 0 {plugins/gpulib => frontend}/cspace_neon.s | 0 frontend/libretro.c | 2 +- frontend/menu.c | 2 +- frontend/plat_pollux.c | 2 +- frontend/plat_sdl.c | 2 +- frontend/plugin_lib.c | 2 +- jni/Android.mk | 10 ++++++---- plugins/dfxvideo/draw_pl.c | 1 - plugins/gpu_unai/gpu.cpp | 1 - plugins/gpulib/Makefile | 5 ----- plugins/gpulib/gpulib.mak | 2 +- plugins/gpulib/vout_pl.c | 1 - 15 files changed, 17 insertions(+), 23 deletions(-) rename {plugins/gpulib => frontend}/cspace.c (100%) rename {plugins/gpulib => frontend}/cspace.h (100%) rename {plugins/gpulib => frontend}/cspace_neon.s (100%) diff --git a/Makefile b/Makefile index 0d72dea0..b6f381cc 100644 --- a/Makefile +++ b/Makefile @@ -99,10 +99,6 @@ endif # builtin gpu OBJS += plugins/gpulib/gpu.o plugins/gpulib/vout_pl.o -OBJS += plugins/gpulib/cspace.o -ifeq "$(HAVE_NEON)" "1" -OBJS += plugins/gpulib/cspace_neon.o -endif ifeq "$(BUILTIN_GPU)" "neon" OBJS += plugins/gpu_neon/psx_gpu_if.o plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP @@ -115,7 +111,6 @@ plugins/dfxvideo/gpulib_if.o: plugins/dfxvideo/prim.c plugins/dfxvideo/soft.c OBJS += plugins/dfxvideo/gpulib_if.o endif ifeq "$(BUILTIN_GPU)" "unai" -OBJS += plugins/gpulib/cspace.o OBJS += plugins/gpu_unai/gpulib_if.o ifeq "$(ARCH)" "arm" OBJS += plugins/gpu_unai/gpu_arm.o @@ -131,6 +126,11 @@ OBJS += plugins/cdrcimg/cdrcimg.o OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o # frontend/gui +OBJS += frontend/cspace.o +ifeq "$(HAVE_NEON)" "1" +OBJS += frontend/cspace_neon.o +endif + ifeq "$(PLATFORM)" "generic" OBJS += frontend/libpicofe/in_sdl.o OBJS += frontend/libpicofe/plat_sdl.o diff --git a/plugins/gpulib/cspace.c b/frontend/cspace.c similarity index 100% rename from plugins/gpulib/cspace.c rename to frontend/cspace.c diff --git a/plugins/gpulib/cspace.h b/frontend/cspace.h similarity index 100% rename from plugins/gpulib/cspace.h rename to frontend/cspace.h diff --git a/plugins/gpulib/cspace_neon.s b/frontend/cspace_neon.s similarity index 100% rename from plugins/gpulib/cspace_neon.s rename to frontend/cspace_neon.s diff --git a/frontend/libretro.c b/frontend/libretro.c index 4f6879ed..c6d113ff 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -15,7 +15,7 @@ #include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "../libpcsxcore/cheat.h" #include "../plugins/dfsound/out.h" -#include "../plugins/gpulib/cspace.h" +#include "cspace.h" #include "main.h" #include "plugin.h" #include "plugin_lib.h" diff --git a/frontend/menu.c b/frontend/menu.c index b25e1927..46e42987 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -26,6 +26,7 @@ #include "plugin_lib.h" #include "plat.h" #include "pcnt.h" +#include "cspace.h" #include "libpicofe/plat.h" #include "libpicofe/input.h" #include "libpicofe/linux/in_evdev.h" @@ -36,7 +37,6 @@ #include "../libpcsxcore/cheat.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "../plugins/dfinput/externals.h" -#include "../plugins/gpulib/cspace.h" #include "psemu_plugin_defs.h" #include "revision.h" diff --git a/frontend/plat_pollux.c b/frontend/plat_pollux.c index c9322611..252feba7 100644 --- a/frontend/plat_pollux.c +++ b/frontend/plat_pollux.c @@ -46,8 +46,8 @@ #include "main.h" #include "menu.h" #include "plat.h" +#include "cspace.h" #include "../libpcsxcore/psxmem_map.h" -#include "../plugins/gpulib/cspace.h" static int fbdev = -1; diff --git a/frontend/plat_sdl.c b/frontend/plat_sdl.c index 2aa199fb..dacf5840 100644 --- a/frontend/plat_sdl.c +++ b/frontend/plat_sdl.c @@ -17,7 +17,7 @@ #include "libpicofe/fonts.h" #include "libpicofe/plat_sdl.h" #include "libpicofe/gl.h" -#include "../plugins/gpulib/cspace.h" +#include "cspace.h" #include "plugin_lib.h" #include "plugin.h" #include "main.h" diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c index 180ee4aa..a3dcbab9 100644 --- a/frontend/plugin_lib.c +++ b/frontend/plugin_lib.c @@ -28,10 +28,10 @@ #include "plat.h" #include "pcnt.h" #include "pl_gun_ts.h" +#include "cspace.h" #include "psemu_plugin_defs.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "../libpcsxcore/psxmem_map.h" -#include "../plugins/gpulib/cspace.h" #include "../plugins/dfinput/externals.h" int in_type1, in_type2; diff --git a/jni/Android.mk b/jni/Android.mk index 06b43795..05a92d46 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -29,14 +29,16 @@ ifeq ($(TARGET_ARCH),arm) # spu LOCAL_SRC_FILES += ../plugins/dfsound/arm_utils.S + # misc + ifeq ($(NO_NEON_BUILD),1) # gpu LOCAL_CFLAGS += -DREARMED - LOCAL_SRC_FILES += ../plugins/gpulib/cspace.c ../plugins/gpu_unai/gpulib_if.cpp ../plugins/gpu_unai/gpu_arm.s + LOCAL_SRC_FILES += ../plugins/gpu_unai/gpulib_if.cpp ../plugins/gpu_unai/gpu_arm.s else LOCAL_ARM_NEON := true LOCAL_CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP - LOCAL_SRC_FILES += ../libpcsxcore/gte_neon.S ../plugins/gpulib/cspace_neon.s + LOCAL_SRC_FILES += ../libpcsxcore/gte_neon.S ../frontend/cspace_neon.s # gpu LOCAL_SRC_FILES += ../plugins/gpu_neon/psx_gpu_if.c ../plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S @@ -54,7 +56,7 @@ endif ifneq ($(TARGET_ARCH),arm) # gpu LOCAL_CFLAGS += -DREARMED - LOCAL_SRC_FILES += ../plugins/gpulib/cspace.c ../plugins/gpu_unai/gpulib_if.cpp + LOCAL_SRC_FILES += ../plugins/gpu_unai/gpulib_if.cpp endif $(shell cd "$(LOCAL_PATH)" && ((git describe || echo) | sed -e 's/.*/#define REV "\0"/' > ../frontend/revision.h_)) @@ -84,7 +86,7 @@ LOCAL_SRC_FILES += ../plugins/cdrcimg/cdrcimg.c LOCAL_SRC_FILES += ../plugins/dfinput/main.c ../plugins/dfinput/pad.c ../plugins/dfinput/guncon.c # misc -LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c +LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c ../frontend/cspace.c # libretro LOCAL_SRC_FILES += ../frontend/libretro.c diff --git a/plugins/dfxvideo/draw_pl.c b/plugins/dfxvideo/draw_pl.c index 61fb94c7..37dbfff1 100644 --- a/plugins/dfxvideo/draw_pl.c +++ b/plugins/dfxvideo/draw_pl.c @@ -9,7 +9,6 @@ #include "gpu.h" -#include "../gpulib/cspace.h" #include "../../frontend/plugin_lib.h" #include "pcnt.h" diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai/gpu.cpp index df5e0cf9..d5096170 100644 --- a/plugins/gpu_unai/gpu.cpp +++ b/plugins/gpu_unai/gpu.cpp @@ -819,7 +819,6 @@ void GPU_updateLace(void) #else #include "../../frontend/plugin_lib.h" -#include "../gpulib/cspace.h" extern "C" { diff --git a/plugins/gpulib/Makefile b/plugins/gpulib/Makefile index 4a45aa21..cff61410 100644 --- a/plugins/gpulib/Makefile +++ b/plugins/gpulib/Makefile @@ -16,11 +16,6 @@ else OBJS += vout_pl.o EXT = $(ARCH).a endif -ifeq "$(HAVE_NEON)" "1" -OBJS += cspace_neon.o -else -OBJS += cspace.o -endif CFLAGS += $(PLUGIN_CFLAGS) # need to compile to another dir, same files are compiled diff --git a/plugins/gpulib/gpulib.mak b/plugins/gpulib/gpulib.mak index 035983c0..6377274e 100644 --- a/plugins/gpulib/gpulib.mak +++ b/plugins/gpulib/gpulib.mak @@ -1,5 +1,5 @@ # depends on ARCH definition -# always adding gpulib to deps in case cspace is needed +# always adding gpulib to deps (XXX might be no longer needed) # users must include ../../config.mak LDFLAGS += -shared -Wl,--no-undefined diff --git a/plugins/gpulib/vout_pl.c b/plugins/gpulib/vout_pl.c index 7f031feb..541b5e0b 100644 --- a/plugins/gpulib/vout_pl.c +++ b/plugins/gpulib/vout_pl.c @@ -11,7 +11,6 @@ #include #include "gpu.h" -#include "cspace.h" #include "../../frontend/plugin_lib.h" static const struct rearmed_cbs *cbs; -- 2.39.2