release r12

[pcsx_rearmed.git] / frontend / menu.c

diff --git a/frontend/menu.c b/frontend/menu.c
index 3142506..ce5c3eb 100644 (file)
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -241,6 +241,9 @@ static void menu_set_defconfig(void)
        { #val, sizeof(pl_rearmed_cbs.val), &pl_rearmed_cbs.val }
 
 // 'versioned' var, used when defaults change
        { #val, sizeof(pl_rearmed_cbs.val), &pl_rearmed_cbs.val }
 
 // 'versioned' var, used when defaults change

+#define CE_CONFIG_STR_V(val, ver) \
+       { #val #ver, 0, Config.val }
+

 #define CE_INTVAL_V(val, ver) \
        { #val #ver, sizeof(val), &val }
 
 #define CE_INTVAL_V(val, ver) \
        { #val #ver, sizeof(val), &val }
 


@@ -253,7 +256,7 @@ static const struct {
        void *val;
 } config_data[] = {
        CE_CONFIG_STR(Bios),
        void *val;
 } config_data[] = {
        CE_CONFIG_STR(Bios),

-       CE_CONFIG_STR(Gpu),
+       CE_CONFIG_STR_V(Gpu, 2),

        CE_CONFIG_STR(Spu),
 //     CE_CONFIG_STR(Cdr),
        CE_CONFIG_VAL(Xa),
        CE_CONFIG_STR(Spu),
 //     CE_CONFIG_STR(Cdr),
        CE_CONFIG_VAL(Xa),


@@ -283,6 +286,7 @@ static const struct {
        CE_INTVAL_V(frameskip, 3),
        CE_INTVAL_P(gpu_peops.iUseDither),
        CE_INTVAL_P(gpu_peops.dwActFixes),
        CE_INTVAL_V(frameskip, 3),
        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.abe_hack),
        CE_INTVAL_P(gpu_unai.no_light),
        CE_INTVAL_P(gpu_unai.no_blend),


@@ -1191,6 +1195,7 @@ static int menu_loop_gfx_options(int id, int keys)
 
 static menu_entry e_menu_plugin_gpu_unai[] =
 {
 
 static menu_entry e_menu_plugin_gpu_unai[] =
 {

+       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     ("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),


@@ -1642,10 +1647,13 @@ static const char credits_text[] =
        "(C) 1999-2003 PCSX Team\n"
        "(C) 2005-2009 PCSX-df Team\n"
        "(C) 2009-2011 PCSX-Reloaded Team\n\n"
        "(C) 1999-2003 PCSX Team\n"
        "(C) 2005-2009 PCSX-df Team\n"
        "(C) 2009-2011 PCSX-Reloaded Team\n\n"

-       "GPU and SPU code by Pete Bernert\n"
-       "  and the P.E.Op.S. team\n"

        "ARM recompiler (C) 2009-2011 Ari64\n"
        "ARM recompiler (C) 2009-2011 Ari64\n"

-       "PCSX4ALL plugins by PCSX4ALL team\n"
+#ifdef __ARM_NEON__
+       "ARM NEON GPU (c) 2011 Exophase\n"
+#endif
+       "PEOpS GPU and SPU by Pete Bernert\n"
+       "  and the P.E.Op.S. team\n"
+       "PCSX4ALL plugin by PCSX4ALL team\n"

        "  Chui, Franxis, Unai\n\n"
        "integration, optimization and\n"
        "  frontend (C) 2010-2011 notaz\n";
        "  Chui, Franxis, Unai\n\n"
        "integration, optimization and\n"
        "  frontend (C) 2010-2011 notaz\n";