sync with master

diff --git a/configure b/configure
index d2594d2..121b705 100755 (executable)
--- a/configure
+++ b/configure
@@ -39,7 +39,7 @@ check_define_val()
 
 platform_list="generic pandora maemo caanoo libretro"
 platform="generic"
-builtin_gpu_list="peops unai neon"
+builtin_gpu_list="neon peops unai"
 builtin_gpu=""
 sound_driver_list="oss alsa pulseaudio sdl libretro"
 sound_drivers=""

diff --git a/frontend/main.c b/frontend/main.c
index eacbee9..cec1fbb 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -142,20 +142,15 @@ void emu_set_default_config(void)
        pl_rearmed_cbs.gpu_neon.enhancement_no_main = 0;
        pl_rearmed_cbs.gpu_peops.iUseDither = 0;
        pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7;
-#if 0
-       pl_rearmed_cbs.gpu_senquack.ilace_force = 0;
-       pl_rearmed_cbs.gpu_senquack.pixel_skip = 0;
-       pl_rearmed_cbs.gpu_senquack.lighting = 1;
-       pl_rearmed_cbs.gpu_senquack.fast_lighting = 0;
-       pl_rearmed_cbs.gpu_senquack.blending = 1;
-       pl_rearmed_cbs.gpu_senquack.dithering = 0;
-#else
+       pl_rearmed_cbs.gpu_unai.ilace_force = 0;
+       pl_rearmed_cbs.gpu_unai.pixel_skip = 0;
        pl_rearmed_cbs.gpu_unai.lighting = 1;
+       pl_rearmed_cbs.gpu_unai.fast_lighting = 0;
        pl_rearmed_cbs.gpu_unai.blending = 1;
-#endif
-       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.dithering = 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;
@@ -815,7 +810,7 @@ void SysReset() {
        // reset can run code, timing must be set
        pl_timing_prepare(Config.PsxType);
 
-   // hmh core forgets this
+       // hmh core forgets this
        CDR_stop();
    
        EmuReset();
@@ -1104,7 +1099,7 @@ void *SysLoadSym(void *lib, const char *sym) {
 
 const char *SysLibError() {
 #if defined(NO_DYLIB)
-   return NULL;
+       return NULL;
 #elif !defined(_WIN32)
        return dlerror();
 #else

diff --git a/frontend/menu.c b/frontend/menu.c
index ca60b53..9200e10 100644 (file)
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -434,19 +434,17 @@ 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),
-#if 0
-       CE_INTVAL_P(gpu_senquack.ilace_force),
-       CE_INTVAL_P(gpu_senquack.pixel_skip),
-       CE_INTVAL_P(gpu_senquack.lighting),
-       CE_INTVAL_P(gpu_senquack.fast_lighting),
-       CE_INTVAL_P(gpu_senquack.blending),
-       CE_INTVAL_P(gpu_senquack.dithering),
-       CE_INTVAL_P(gpu_senquack.scale_hires),
-#endif
+       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_unai.ilace_force),
+       CE_INTVAL_P(gpu_unai.pixel_skip),
+       CE_INTVAL_P(gpu_unai.lighting),
+       CE_INTVAL_P(gpu_unai.fast_lighting),
+       CE_INTVAL_P(gpu_unai.blending),
+       CE_INTVAL_P(gpu_unai.dithering),
+       CE_INTVAL_P(gpu_unai.scale_hires),
        CE_INTVAL_P(gpu_neon.allow_interlace),
        CE_INTVAL_P(gpu_neon.enhancement_enable),
        CE_INTVAL_P(gpu_neon.enhancement_no_main),
@@ -1386,39 +1384,37 @@ 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;
 }
 
-static menu_entry e_menu_plugin_gpu_senquack[] =
+static menu_entry e_menu_plugin_gpu_unai[] =
 {
-#if 0
-       mee_onoff     ("Interlace",                  0, pl_rearmed_cbs.gpu_senquack.ilace_force, 1),
-       mee_onoff     ("Dithering",                  0, pl_rearmed_cbs.gpu_senquack.dithering, 1),
-       mee_onoff     ("Lighting",                   0, pl_rearmed_cbs.gpu_senquack.lighting, 1),
-       mee_onoff     ("Fast lighting",              0, pl_rearmed_cbs.gpu_senquack.fast_lighting, 1),
-       mee_onoff     ("Blending",                   0, pl_rearmed_cbs.gpu_senquack.blending, 1),
-       mee_onoff     ("Pixel skip",                 0, pl_rearmed_cbs.gpu_senquack.pixel_skip, 1),
-#endif
+       mee_onoff     ("Interlace",                  0, pl_rearmed_cbs.gpu_unai.ilace_force, 1),
+       mee_onoff     ("Dithering",                  0, pl_rearmed_cbs.gpu_unai.dithering, 1),
+       mee_onoff     ("Lighting",                   0, pl_rearmed_cbs.gpu_unai.lighting, 1),
+       mee_onoff     ("Fast lighting",              0, pl_rearmed_cbs.gpu_unai.fast_lighting, 1),
+       mee_onoff     ("Blending",                   0, pl_rearmed_cbs.gpu_unai.blending, 1),
+       mee_onoff     ("Pixel skip",                 0, pl_rearmed_cbs.gpu_unai.pixel_skip, 1),
        mee_end,
 };
 
-static int menu_loop_plugin_gpu_senquack(int id, int keys)
+static int menu_loop_plugin_gpu_unai(int id, int keys)
 {
        int sel = 0;
-       me_loop(e_menu_plugin_gpu_senquack, &sel);
+       me_loop(e_menu_plugin_gpu_unai, &sel);
        return 0;
 }
 
@@ -1523,16 +1519,16 @@ 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_senquack is more accurate but slower\n"
+                                  "gpu_unai_old is from old PCSX4ALL, fast but glitchy\n"
+                                  "gpu_unai is newer, 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";
 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_unai[]   = "Configure Unai/PCSX4ALL Team plugin (new)";
 static const char h_spu[]        = "Configure built-in P.E.Op.S. Sound Driver V1.7";
 
 static menu_entry e_menu_plugin_options[] =
@@ -1544,8 +1540,8 @@ 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_old GPU plugin", menu_loop_plugin_gpu_unai_old, h_gpu_unai_old),
        mee_handler_h ("Configure gpu_unai GPU plugin", menu_loop_plugin_gpu_unai, h_gpu_unai),
-       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),
        mee_end,

diff --git a/frontend/plugin_lib.h b/frontend/plugin_lib.h
index 67313bd..5b4af65 100644 (file)
--- a/frontend/plugin_lib.h
+++ b/frontend/plugin_lib.h
@@ -93,6 +93,11 @@ struct rearmed_cbs {
                float fFrameRateHz;
                int   dwFrameRateTicks;
        } gpu_peops;
+       struct {
+               int   abe_hack;
+               int   no_light, no_blend;
+               int   lineskip;
+       } gpu_unai_old;
        struct {
                int ilace_force;
                int pixel_skip;
@@ -100,11 +105,7 @@ struct rearmed_cbs {
                int fast_lighting;
                int blending;
                int dithering;
-               // old gpu_unai config for compatibility
-               int   abe_hack;
-               int   no_light, no_blend;
-               int   lineskip;
-               int   scale_hires;
+               int scale_hires;
        } gpu_unai;
        struct {
                int   dwActFixes;