const char *basedir)
{
const char *ext, *p;
- char buf[256], buf2[256];
+ char buf[256], buf2[257];
int i, d, ret, good_cue;
struct STAT statf;
FILE *f;
switch (in_type_sel1) {
case 1: in_type[0] = PSE_PAD_TYPE_ANALOGPAD; break;
- case 2: in_type[0] = PSE_PAD_TYPE_NEGCON; break;
- case 3: in_type[0] = PSE_PAD_TYPE_NONE; break;
+ case 2: in_type[0] = PSE_PAD_TYPE_GUNCON; break;
+ case 3: in_type[0] = PSE_PAD_TYPE_GUN; break;
+ case 4: in_type[0] = PSE_PAD_TYPE_NONE; break;
default: in_type[0] = PSE_PAD_TYPE_STANDARD;
}
switch (in_type_sel2) {
case 1: in_type[1] = PSE_PAD_TYPE_ANALOGPAD; break;
- case 2: in_type[1] = PSE_PAD_TYPE_NEGCON; break;
- case 3: in_type[1] = PSE_PAD_TYPE_NONE; break;
+ case 2: in_type[1] = PSE_PAD_TYPE_GUNCON; break;
+ case 3: in_type[1] = PSE_PAD_TYPE_GUN; break;
+ case 4: in_type[1] = PSE_PAD_TYPE_NONE; break;
default: in_type[1] = PSE_PAD_TYPE_STANDARD;
}
if (in_evdev_allow_abs_only != allow_abs_only_old) {
CE_CONFIG_VAL(DisableStalls),
CE_CONFIG_VAL(Cpu),
CE_CONFIG_VAL(GpuListWalking),
+ CE_CONFIG_VAL(FractionalFramerate),
CE_CONFIG_VAL(PreciseExceptions),
CE_INTVAL(region),
CE_INTVAL_V(g_scaler, 3),
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_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),
+ 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),
+ CE_INTVAL_P(gpu_neon.enhancement_tex_adj),
CE_INTVAL_P(gpu_peopsgl.bDrawDither),
CE_INTVAL_P(gpu_peopsgl.iFilterType),
CE_INTVAL_P(gpu_peopsgl.iFrameTexType),
static void keys_write_all(FILE *f);
static char *mystrip(char *str);
+static void write_u32_value(FILE *f, u32 v)
+{
+ if (v > 7)
+ fprintf(f, "0x");
+ fprintf(f, "%x\n", v);
+}
+
static int menu_write_config(int is_game)
{
char cfgfile[MAXPATHLEN];
fprintf(f, "%s\n", (char *)config_data[i].val);
break;
case 1:
- fprintf(f, "%x\n", *(u8 *)config_data[i].val);
+ write_u32_value(f, *(u8 *)config_data[i].val);
break;
case 2:
- fprintf(f, "%x\n", *(u16 *)config_data[i].val);
+ write_u32_value(f, *(u16 *)config_data[i].val);
break;
case 4:
- fprintf(f, "%x\n", *(u32 *)config_data[i].val);
+ write_u32_value(f, *(u32 *)config_data[i].val);
break;
default:
printf("menu_write_config: unhandled len %d for %s\n",
{ "Volume Up ", 1 << SACTION_VOLUME_UP },
{ "Volume Down ", 1 << SACTION_VOLUME_DOWN },
#endif
+ { "Analog toggle ", 1 << SACTION_ANALOG_TOGGLE },
{ NULL, 0 }
};
"Standard (SCPH-1080)",
"Analog (SCPH-1150)",
"GunCon",
+ "Konami Gun",
"None",
NULL
};
static const char h_soft_filter[] = "Works only if game uses low resolution modes";
static const char h_gamma[] = "Gamma/brightness adjustment (default 100)";
#ifdef __ARM_NEON__
+static const char *men_scanlines[] = { "OFF", "1", "2", "3", NULL };
static const char h_scanline_l[] = "Scanline brightness, 0-100%";
#endif
static int menu_loop_cscaler(int id, int keys)
{
+ void *saved_layer = NULL;
+ size_t saved_layer_size = 0;
+ int was_layer_clipped = 0;
unsigned int inp;
+ if (!pl_vout_buf)
+ return -1;
+
g_scaler = SCALE_CUSTOM;
+ saved_layer_size = last_vout_w * last_vout_h * last_vout_bpp / 8;
+ saved_layer = malloc(saved_layer_size);
+ if (saved_layer)
+ memcpy(saved_layer, pl_vout_buf, saved_layer_size);
plat_gvideo_open(Config.PsxType);
+ menu_draw_begin(0, 1);
+ memset(g_menuscreen_ptr, 4, g_menuscreen_w * g_menuscreen_h * 2);
+ menu_draw_end();
+
for (;;)
{
- menu_draw_begin(0, 1);
- memset(g_menuscreen_ptr, 4, g_menuscreen_w * g_menuscreen_h * 2);
- text_out16(2, 2, "%d,%d", g_layer_x, g_layer_y);
- text_out16(2, 480 - 18, "%dx%d | d-pad: resize, R+d-pad: move", g_layer_w, g_layer_h);
- menu_draw_end();
+ if (saved_layer && last_vout_bpp == 16) {
+ int top_x = max(0, -g_layer_x * last_vout_w / 800) + 1;
+ int top_y = max(0, -g_layer_y * last_vout_h / 480) + 1;
+ char text[128];
+ memcpy(pl_vout_buf, saved_layer, saved_layer_size);
+ snprintf(text, sizeof(text), "%d,%d %dx%d",
+ g_layer_x, g_layer_y, g_layer_w, g_layer_h);
+ basic_text_out16_nf(pl_vout_buf, last_vout_w,
+ top_x, top_y, text);
+ basic_text_out16_nf(pl_vout_buf, last_vout_w, 2,
+ last_vout_h - 20, "d-pad: resize, R+d-pad: move");
+ pl_vout_buf = plat_gvideo_flip();
+ }
inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT
|PBTN_R|PBTN_MOK|PBTN_MBACK, NULL, 40);
break;
if (inp & (PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT)) {
- if (g_layer_x < 0) g_layer_x = 0;
- if (g_layer_x > 640) g_layer_x = 640;
- if (g_layer_y < 0) g_layer_y = 0;
- if (g_layer_y > 420) g_layer_y = 420;
- if (g_layer_w < 160) g_layer_w = 160;
- if (g_layer_h < 60) g_layer_h = 60;
- if (g_layer_x + g_layer_w > 800)
- g_layer_w = 800 - g_layer_x;
- if (g_layer_y + g_layer_h > 480)
- g_layer_h = 480 - g_layer_y;
+ int layer_clipped = 0;
+ g_layer_x = max(-320, min(g_layer_x, 640));
+ g_layer_y = max(-240, min(g_layer_y, 400));
+ g_layer_w = max(160, g_layer_w);
+ g_layer_h = max( 60, g_layer_h);
+ if (g_layer_x < 0 || g_layer_x + g_layer_w > 800)
+ layer_clipped = 1;
+ if (g_layer_w > 800+400)
+ g_layer_w = 800+400;
+ if (g_layer_y < 0 || g_layer_y + g_layer_h > 480)
+ layer_clipped = 1;
+ if (g_layer_h > 480+360)
+ g_layer_h = 480+360;
// resize the layer
plat_gvideo_open(Config.PsxType);
+ if (layer_clipped || was_layer_clipped)
+ pl_vout_buf = plat_gvideo_set_mode(&last_vout_w,
+ &last_vout_h, &last_vout_bpp);
+ was_layer_clipped = layer_clipped;
}
}
plat_gvideo_close();
+ free(saved_layer);
return 0;
}
mee_enum ("Hardware Filter", MA_OPT_HWFILTER, plat_target.hwfilter, men_dummy),
mee_enum_h ("Software Filter", MA_OPT_SWFILTER, soft_filter, men_soft_filter, h_soft_filter),
#ifdef __ARM_NEON__
- mee_onoff ("Scanlines", MA_OPT_SCANLINES, scanlines, 1),
+ mee_enum ("Scanlines", MA_OPT_SCANLINES, scanlines, men_scanlines),
mee_range_h ("Scanline brightness", MA_OPT_SCANLINE_LEVEL, scanline_level, 0, 100, h_scanline_l),
#endif
mee_range_h ("Gamma adjustment", MA_OPT_GAMMA, g_gamma, 1, 200, h_gamma),
mee_enum ("Enable interlace mode", 0, pl_rearmed_cbs.gpu_neon.allow_interlace, men_gpu_interlace),
mee_onoff_h ("Enhanced resolution", 0, pl_rearmed_cbs.gpu_neon.enhancement_enable, 1, h_gpu_neon_enhanced),
mee_onoff_h ("Enhanced res. speed hack", 0, pl_rearmed_cbs.gpu_neon.enhancement_no_main, 1, h_gpu_neon_enhanced_hack),
+ mee_onoff ("Enh. res. texture adjust", 0, pl_rearmed_cbs.gpu_neon.enhancement_tex_adj, 1),
mee_end,
};
#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[] =
{
- 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),
+ 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;
}
"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[] =
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,
return 0;
}
-static const char *men_gpul[] = { "Auto", "Off", "On", NULL };
+static const char *men_autooo[] = { "Auto", "Off", "On", NULL };
static const char h_cfg_cpul[] = "Shows CPU usage in %";
static const char h_cfg_spu[] = "Shows active SPU channels\n"
"and exceptions (slow, interpreter only, keep off)";
static const char h_cfg_gpul[] = "Try enabling this if the game misses some graphics\n"
"causes a performance hit";
+static const char h_cfg_ffps[] = "Instead of 50/60fps for PAL/NTSC use ~49.75/59.81\n"
+ "Closer to real hw but doesn't match modern displays.";
static const char h_cfg_psxclk[] = "Over/under-clock the PSX, default is " DEFAULT_PSX_CLOCK_S "\n"
"(adjust this if the game is too slow/too fast/hangs)";
-enum { AMO_XA, AMO_CDDA, AMO_IC, AMO_BP, AMO_CPU, AMO_GPUL };
+enum { AMO_XA, AMO_CDDA, AMO_IC, AMO_BP, AMO_CPU, AMO_GPUL, AMO_FFPS };
static menu_entry e_menu_adv_options[] =
{
mee_onoff_h ("Disable CD Audio", 0, menu_iopts[AMO_CDDA], 1, h_cfg_cdda),
mee_onoff_h ("ICache emulation", 0, menu_iopts[AMO_IC], 1, h_cfg_icache),
mee_onoff_h ("BP exception emulation", 0, menu_iopts[AMO_BP], 1, h_cfg_exc),
- mee_enum_h ("GPU l-list slow walking",0, menu_iopts[AMO_GPUL], men_gpul, h_cfg_gpul),
+ mee_enum_h ("GPU l-list slow walking",0, menu_iopts[AMO_GPUL], men_autooo, h_cfg_gpul),
+ mee_enum_h ("Fractional framerate", 0, menu_iopts[AMO_FFPS], men_autooo, h_cfg_ffps),
#if !defined(DRC_DISABLE) || defined(LIGHTREC)
mee_onoff_h ("Disable dynarec (slow!)",0, menu_iopts[AMO_CPU], 1, h_cfg_nodrc),
#endif
for (i = 0; i < ARRAY_SIZE(opts); i++)
*opts[i].mopt = *opts[i].opt;
menu_iopts[AMO_GPUL] = Config.GpuListWalking + 1;
+ menu_iopts[AMO_FFPS] = Config.FractionalFramerate + 1;
me_loop(e_menu_adv_options, &sel);
for (i = 0; i < ARRAY_SIZE(opts); i++)
*opts[i].opt = *opts[i].mopt;
Config.GpuListWalking = menu_iopts[AMO_GPUL] - 1;
+ Config.FractionalFramerate = menu_iopts[AMO_FFPS] - 1;
return 0;
}
static const char h_restore_def[] = "Switches back to default / recommended\n"
"configuration";
static const char h_frameskip[] = "Warning: frameskip sometimes causes glitches\n";
+static const char h_sputhr[] = "Warning: has some known bugs\n";
static menu_entry e_menu_options[] =
{
mee_enum ("Region", 0, region, men_region),
mee_range ("CPU clock", MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000),
#ifdef C64X_DSP
- mee_onoff ("Use C64x DSP for sound", MA_OPT_SPU_THREAD, spu_config.iUseThread, 1),
+ mee_onoff_h ("Use C64x DSP for sound", MA_OPT_SPU_THREAD, spu_config.iUseThread, 1, h_sputhr),
#else
- mee_onoff ("Threaded SPU", MA_OPT_SPU_THREAD, spu_config.iUseThread, 1),
+ mee_onoff_h ("Threaded SPU", MA_OPT_SPU_THREAD, spu_config.iUseThread, 1, h_sputhr),
#endif
mee_handler_id("[Display]", MA_OPT_DISP_OPTS, menu_loop_gfx_options),
mee_handler ("[BIOS/Plugins]", menu_loop_plugin_options),
notaz.gp2x.de / pcsx_rearmed.git / blobdiff