rename gpu_unai to gpu_unai_old

Because libretro's gpu_unai is different, making syncing the branches
a PITA.

diff --git a/Makefile b/Makefile
index af1216f..85886d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -142,12 +142,12 @@ plugins/dfxvideo/gpulib_if.o: CFLAGS += -fno-strict-aliasing
 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/gpu_unai/gpulib_if.o
+ifeq "$(BUILTIN_GPU)" "unai_old"
+OBJS += plugins/gpu_unai_old/gpulib_if.o
 ifeq "$(ARCH)" "arm"
-OBJS += plugins/gpu_unai/gpu_arm.o
+OBJS += plugins/gpu_unai_old/gpu_arm.o
 endif
-plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3 
+plugins/gpu_unai_old/gpulib_if.o: CFLAGS += -DREARMED -O3
 CC_LINK = $(CXX)
 endif
 

diff --git a/configure b/configure
index a72c059..01f26b4 100755 (executable)
--- a/configure
+++ b/configure
@@ -39,12 +39,12 @@ check_define_val()
 
 platform_list="generic pandora maemo caanoo libretro"
 platform="generic"
-builtin_gpu_list="peops unai neon senquack"
+builtin_gpu_list="neon peops senquack unai_old"
 builtin_gpu=""
 sound_driver_list="oss alsa pulseaudio sdl libretro"
 sound_drivers=""
 plugins="plugins/spunull/spunull.so \
-plugins/dfxvideo/gpu_peops.so plugins/gpu_unai/gpu_unai.so plugins/gpu_senquack/gpu_senquack.so"
+plugins/dfxvideo/gpu_peops.so plugins/gpu_unai_old/gpu_unai_old.so plugins/gpu_senquack/gpu_senquack.so"
 drc_cache_base="no"
 have_armv5=""
 have_armv6=""
@@ -250,7 +250,7 @@ arm*)
       builtin_gpu="neon"
     elif [ "$have_armv7" != "yes" ]; then
       # pre-ARMv7 hardware is usually not fast enough for peops
-      builtin_gpu="unai"
+      builtin_gpu="unai_old"
     else
       builtin_gpu="peops"
     fi

diff --git a/frontend/main.c b/frontend/main.c
index 18ca6e5..45e2581 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -148,9 +148,9 @@ void emu_set_default_config(void)
        pl_rearmed_cbs.gpu_senquack.fast_lighting = 0;
        pl_rearmed_cbs.gpu_senquack.blending = 1;
        pl_rearmed_cbs.gpu_senquack.dithering = 0;
-       pl_rearmed_cbs.gpu_unai.abe_hack =
-       pl_rearmed_cbs.gpu_unai.no_light =
-       pl_rearmed_cbs.gpu_unai.no_blend = 0;
+       pl_rearmed_cbs.gpu_unai_old.abe_hack =
+       pl_rearmed_cbs.gpu_unai_old.no_light =
+       pl_rearmed_cbs.gpu_unai_old.no_blend = 0;
        memset(&pl_rearmed_cbs.gpu_peopsgl, 0, sizeof(pl_rearmed_cbs.gpu_peopsgl));
        pl_rearmed_cbs.gpu_peopsgl.iVRamSize = 64;
        pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1;

diff --git a/frontend/menu.c b/frontend/menu.c
index 5a21e96..b2d50aa 100644 (file)
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -434,10 +434,10 @@ static const struct {
        CE_INTVAL_V(frameskip, 4),
        CE_INTVAL_P(gpu_peops.iUseDither),
        CE_INTVAL_P(gpu_peops.dwActFixes),
-       CE_INTVAL_P(gpu_unai.lineskip),
-       CE_INTVAL_P(gpu_unai.abe_hack),
-       CE_INTVAL_P(gpu_unai.no_light),
-       CE_INTVAL_P(gpu_unai.no_blend),
+       CE_INTVAL_P(gpu_unai_old.lineskip),
+       CE_INTVAL_P(gpu_unai_old.abe_hack),
+       CE_INTVAL_P(gpu_unai_old.no_light),
+       CE_INTVAL_P(gpu_unai_old.no_blend),
        CE_INTVAL_P(gpu_senquack.ilace_force),
        CE_INTVAL_P(gpu_senquack.pixel_skip),
        CE_INTVAL_P(gpu_senquack.lighting),
@@ -1384,19 +1384,19 @@ static int menu_loop_plugin_gpu_neon(int id, int keys)
 
 #endif
 
-static menu_entry e_menu_plugin_gpu_unai[] =
+static menu_entry e_menu_plugin_gpu_unai_old[] =
 {
-       mee_onoff     ("Skip every 2nd line",        0, pl_rearmed_cbs.gpu_unai.lineskip, 1),
-       mee_onoff     ("Abe's Odyssey hack",         0, pl_rearmed_cbs.gpu_unai.abe_hack, 1),
-       mee_onoff     ("Disable lighting",           0, pl_rearmed_cbs.gpu_unai.no_light, 1),
-       mee_onoff     ("Disable blending",           0, pl_rearmed_cbs.gpu_unai.no_blend, 1),
+       mee_onoff     ("Skip every 2nd line",        0, pl_rearmed_cbs.gpu_unai_old.lineskip, 1),
+       mee_onoff     ("Abe's Odyssey hack",         0, pl_rearmed_cbs.gpu_unai_old.abe_hack, 1),
+       mee_onoff     ("Disable lighting",           0, pl_rearmed_cbs.gpu_unai_old.no_light, 1),
+       mee_onoff     ("Disable blending",           0, pl_rearmed_cbs.gpu_unai_old.no_blend, 1),
        mee_end,
 };
 
-static int menu_loop_plugin_gpu_unai(int id, int keys)
+static int menu_loop_plugin_gpu_unai_old(int id, int keys)
 {
        int sel = 0;
-       me_loop(e_menu_plugin_gpu_unai, &sel);
+       me_loop(e_menu_plugin_gpu_unai_old, &sel);
        return 0;
 }
 
@@ -1519,7 +1519,7 @@ static const char h_plugin_gpu[] =
                                   "builtin_gpu is the NEON GPU, very fast and accurate\n"
 #endif
                                   "gpu_peops is Pete's soft GPU, slow but accurate\n"
-                                  "gpu_unai is GPU from PCSX4ALL, fast but glitchy\n"
+                                  "gpu_unai_old is from old PCSX4ALL, fast but glitchy\n"
                                   "gpu_senquack is more accurate but slower\n"
                                   "gpu_gles Pete's hw GPU, uses 3D chip but is glitchy\n"
                                   "must save config and reload the game if changed";
@@ -1527,8 +1527,8 @@ static const char h_plugin_spu[] = "spunull effectively disables sound\n"
                                   "must save config and reload the game if changed";
 static const char h_gpu_peops[]  = "Configure P.E.Op.S. SoftGL Driver V1.17";
 static const char h_gpu_peopsgl[]= "Configure P.E.Op.S. MesaGL Driver V1.78";
-static const char h_gpu_unai[]   = "Configure Unai/PCSX4ALL Team GPU plugin";
-static const char h_gpu_senquack[]   = "Configure Unai/PCSX4ALL Senquack plugin";
+static const char h_gpu_unai_old[] = "Configure Unai/PCSX4ALL Team GPU plugin (old)";
+static const char h_gpu_senquack[] = "Configure Unai/PCSX4ALL Senquack plugin";
 static const char h_spu[]        = "Configure built-in P.E.Op.S. Sound Driver V1.7";
 
 static menu_entry e_menu_plugin_options[] =
@@ -1540,7 +1540,7 @@ static menu_entry e_menu_plugin_options[] =
        mee_handler_h ("Configure built-in GPU plugin", menu_loop_plugin_gpu_neon, h_gpu_neon),
 #endif
        mee_handler_h ("Configure gpu_peops plugin",    menu_loop_plugin_gpu_peops, h_gpu_peops),
-       mee_handler_h ("Configure gpu_unai GPU plugin", menu_loop_plugin_gpu_unai, h_gpu_unai),
+       mee_handler_h ("Configure gpu_unai_old GPU plugin", menu_loop_plugin_gpu_unai_old, h_gpu_unai_old),
        mee_handler_h ("Configure gpu_senquack GPU plugin", menu_loop_plugin_gpu_senquack, h_gpu_senquack),
        mee_handler_h ("Configure gpu_gles GPU plugin", menu_loop_plugin_gpu_peopsgl, h_gpu_peopsgl),
        mee_handler_h ("Configure built-in SPU plugin", menu_loop_plugin_spu, h_spu),

diff --git a/frontend/plugin_lib.h b/frontend/plugin_lib.h
index 2ac49f2..cb1f4f7 100644 (file)
--- a/frontend/plugin_lib.h
+++ b/frontend/plugin_lib.h
@@ -93,7 +93,7 @@ struct rearmed_cbs {
                int   abe_hack;
                int   no_light, no_blend;
                int   lineskip;
-       } gpu_unai;
+       } gpu_unai_old;
        struct {
                int ilace_force;
                int pixel_skip;

diff --git a/plugins/gpu_neon/Makefile b/plugins/gpu_neon/Makefile
index 955feab..8108099 100644 (file)
--- a/plugins/gpu_neon/Makefile
+++ b/plugins/gpu_neon/Makefile
@@ -4,6 +4,7 @@ include ../../config.mak
 
 SRC += psx_gpu_if.c
 
+CFLAGS += -I../../include
 CFLAGS += -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
 CFLAGS += -DNEON_BUILD
 ifeq "$(HAVE_NEON)" "1"

diff --git a/plugins/gpu_unai/Makefile b/plugins/gpu_unai_old/Makefile
similarity index 90%
rename from plugins/gpu_unai/Makefile
rename to plugins/gpu_unai_old/Makefile
index 1075ee5..ed3eff0 100644 (file)
--- a/plugins/gpu_unai/Makefile
+++ b/plugins/gpu_unai_old/Makefile
@@ -12,5 +12,5 @@ SRC += gpu_arm.s
 endif
 
 #BIN_STANDALONE = gpuPCSX4ALL.so
-BIN_GPULIB = gpu_unai.so
+BIN_GPULIB = gpu_unai_old.so
 include ../gpulib/gpulib.mak

diff --git a/plugins/gpu_unai/debug.h b/plugins/gpu_unai_old/debug.h
similarity index 100%
rename from plugins/gpu_unai/debug.h
rename to plugins/gpu_unai_old/debug.h

diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai_old/gpu.cpp
similarity index 100%
rename from plugins/gpu_unai/gpu.cpp
rename to plugins/gpu_unai_old/gpu.cpp

diff --git a/plugins/gpu_unai/gpu.h b/plugins/gpu_unai_old/gpu.h
similarity index 100%
rename from plugins/gpu_unai/gpu.h
rename to plugins/gpu_unai_old/gpu.h

diff --git a/plugins/gpu_unai/gpu_arm.h b/plugins/gpu_unai_old/gpu_arm.h
similarity index 100%
rename from plugins/gpu_unai/gpu_arm.h
rename to plugins/gpu_unai_old/gpu_arm.h

diff --git a/plugins/gpu_unai/gpu_arm.s b/plugins/gpu_unai_old/gpu_arm.s
similarity index 100%
rename from plugins/gpu_unai/gpu_arm.s
rename to plugins/gpu_unai_old/gpu_arm.s

diff --git a/plugins/gpu_unai/gpu_blit.h b/plugins/gpu_unai_old/gpu_blit.h
similarity index 100%
rename from plugins/gpu_unai/gpu_blit.h
rename to plugins/gpu_unai_old/gpu_blit.h

diff --git a/plugins/gpu_unai/gpu_command.h b/plugins/gpu_unai_old/gpu_command.h
similarity index 100%
rename from plugins/gpu_unai/gpu_command.h
rename to plugins/gpu_unai_old/gpu_command.h

diff --git a/plugins/gpu_unai/gpu_fixedpoint.h b/plugins/gpu_unai_old/gpu_fixedpoint.h
similarity index 100%
rename from plugins/gpu_unai/gpu_fixedpoint.h
rename to plugins/gpu_unai_old/gpu_fixedpoint.h

diff --git a/plugins/gpu_unai/gpu_inner.h b/plugins/gpu_unai_old/gpu_inner.h
similarity index 100%
rename from plugins/gpu_unai/gpu_inner.h
rename to plugins/gpu_unai_old/gpu_inner.h

diff --git a/plugins/gpu_unai/gpu_inner_blend.h b/plugins/gpu_unai_old/gpu_inner_blend.h
similarity index 100%
rename from plugins/gpu_unai/gpu_inner_blend.h
rename to plugins/gpu_unai_old/gpu_inner_blend.h

diff --git a/plugins/gpu_unai/gpu_inner_light.h b/plugins/gpu_unai_old/gpu_inner_light.h
similarity index 100%
rename from plugins/gpu_unai/gpu_inner_light.h
rename to plugins/gpu_unai_old/gpu_inner_light.h

diff --git a/plugins/gpu_unai/gpu_raster_image.h b/plugins/gpu_unai_old/gpu_raster_image.h
similarity index 100%
rename from plugins/gpu_unai/gpu_raster_image.h
rename to plugins/gpu_unai_old/gpu_raster_image.h

diff --git a/plugins/gpu_unai/gpu_raster_line.h b/plugins/gpu_unai_old/gpu_raster_line.h
similarity index 100%
rename from plugins/gpu_unai/gpu_raster_line.h
rename to plugins/gpu_unai_old/gpu_raster_line.h

diff --git a/plugins/gpu_unai/gpu_raster_polygon.h b/plugins/gpu_unai_old/gpu_raster_polygon.h
similarity index 100%
rename from plugins/gpu_unai/gpu_raster_polygon.h
rename to plugins/gpu_unai_old/gpu_raster_polygon.h

diff --git a/plugins/gpu_unai/gpu_raster_sprite.h b/plugins/gpu_unai_old/gpu_raster_sprite.h
similarity index 100%
rename from plugins/gpu_unai/gpu_raster_sprite.h
rename to plugins/gpu_unai_old/gpu_raster_sprite.h

diff --git a/plugins/gpu_unai/gpulib_if.cpp b/plugins/gpu_unai_old/gpulib_if.cpp
similarity index 97%
rename from plugins/gpu_unai/gpulib_if.cpp
rename to plugins/gpu_unai_old/gpulib_if.cpp
index 02f6b92..cc32802 100644 (file)
--- a/plugins/gpu_unai/gpulib_if.cpp
+++ b/plugins/gpu_unai_old/gpulib_if.cpp
@@ -104,10 +104,10 @@ static u32   GPU_GP1;
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "../gpu_unai/gpu_fixedpoint.h"
+#include "gpu_fixedpoint.h"
 
 //  Inner loop driver instanciation file
-#include "../gpu_unai/gpu_inner.h"
+#include "gpu_inner.h"
 
 //  GPU Raster Macros
 #define        GPU_RGB16(rgb)        ((((rgb)&0xF80000)>>9)|(((rgb)&0xF800)>>6)|(((rgb)&0xF8)>>3))
@@ -120,19 +120,19 @@ static u32   GPU_GP1;
 #define        GPU_SWAP(a,b,t) {(t)=(a);(a)=(b);(b)=(t);}
 
 // GPU internal image drawing functions
-#include "../gpu_unai/gpu_raster_image.h"
+#include "gpu_raster_image.h"
 
 // GPU internal line drawing functions
-#include "../gpu_unai/gpu_raster_line.h"
+#include "gpu_raster_line.h"
 
 // GPU internal polygon drawing functions
-#include "../gpu_unai/gpu_raster_polygon.h"
+#include "gpu_raster_polygon.h"
 
 // GPU internal sprite drawing functions
-#include "../gpu_unai/gpu_raster_sprite.h"
+#include "gpu_raster_sprite.h"
 
 // GPU command buffer execution/store
-#include "../gpu_unai/gpu_command.h"
+#include "gpu_command.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -544,10 +544,10 @@ void renderer_set_interlace(int enable, int is_odd)
 
 void renderer_set_config(const struct rearmed_cbs *cbs)
 {
-  force_interlace = cbs->gpu_unai.lineskip;
-  enableAbbeyHack = cbs->gpu_unai.abe_hack;
-  light = !cbs->gpu_unai.no_light;
-  blend = !cbs->gpu_unai.no_blend;
+  force_interlace = cbs->gpu_unai_old.lineskip;
+  enableAbbeyHack = cbs->gpu_unai_old.abe_hack;
+  light = !cbs->gpu_unai_old.no_light;
+  blend = !cbs->gpu_unai_old.no_blend;
 
   GPU_FrameBuffer = (u16 *)gpu.vram;
 }

diff --git a/plugins/gpu_unai/port.h b/plugins/gpu_unai_old/port.h
similarity index 100%
rename from plugins/gpu_unai/port.h
rename to plugins/gpu_unai_old/port.h

diff --git a/plugins/gpu_unai/profiler.h b/plugins/gpu_unai_old/profiler.h
similarity index 100%
rename from plugins/gpu_unai/profiler.h
rename to plugins/gpu_unai_old/profiler.h

diff --git a/readme.txt b/readme.txt
index 5e3f3e6..1125bf9 100644 (file)
--- a/readme.txt
+++ b/readme.txt
@@ -89,8 +89,8 @@ builtin_gpu    - this is either Exophase's ARM NEON GPU (accurate and fast,
                  gpu_peops or gpu_unai (depends on compile options).
 gpu_peops.so   - P.E.Op.S. soft GPU, reasonably accurate but slow
                  (also found with older emulators on PC)
-gpu_unai.so    - Unai's plugin from PCSX4ALL project. Faster than P.E.Op.S.
-                 but has some glitches.
+gpu_unai_old.so- Unai's plugin from PCSX4ALL project. Faster than P.E.Op.S.
+                 but has some glitches (old version).
 gpu_gles.so    - experimental port of P.E.Op.S. MesaGL plugin to OpenGL ES.
                  Occasionally faster but has lots of glitches and seems to
                  be rather unstable (may crash the driver/system).