static void *vout_buf;
static void *vout_buf_ptr;
static int vout_width, vout_height;
-static int vout_doffs_old, vout_fb_dirty;
+static int vout_fb_dirty;
static bool vout_can_dupe;
static bool duping_enable;
static bool found_bios;
static bool display_internal_fps = false;
static unsigned frame_count = 0;
static bool libretro_supports_bitmasks = false;
+static bool libretro_supports_option_categories = false;
+static bool show_input_settings = true;
#ifdef GPU_PEOPS
-static int show_advanced_gpu_peops_settings = -1;
+static bool show_advanced_gpu_peops_settings = true;
#endif
#ifdef GPU_UNAI
-static int show_advanced_gpu_unai_settings = -1;
+static bool show_advanced_gpu_unai_settings = true;
#endif
-static int show_other_input_settings = -1;
static float mouse_sensitivity = 1.0f;
typedef enum
}
#endif
-static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
+static void vout_flip(const void *vram, int stride, int bgr24,
+ int x, int y, int w, int h, int dims_changed)
{
unsigned short *dest = vout_buf_ptr;
const unsigned short *src = vram;
int dstride = vout_width, h1 = h;
- int doffs;
- if (vram == NULL)
+ if (vram == NULL || dims_changed)
{
+ memset(vout_buf_ptr, 0, dstride * vout_height * 2);
// blanking
- memset(vout_buf_ptr, 0, dstride * h * 2);
- goto out;
+ if (vram == NULL)
+ goto out;
}
- doffs = (vout_height - h) * dstride;
- doffs += (dstride - w) / 2 & ~1;
- if (doffs != vout_doffs_old)
- {
- // clear borders
- memset(vout_buf_ptr, 0, dstride * h * 2);
- vout_doffs_old = doffs;
- }
- dest += doffs;
+ dest += x + y * dstride;
if (bgr24)
{
void pl_frame_limit(void)
{
/* called once per frame, make psxCpu->Execute() above return */
- stop = 1;
+ stop++;
}
void pl_timing_prepare(int is_pal)
};
/* libretro */
+
+static bool update_option_visibility(void)
+{
+ struct retro_variable var = {0};
+ struct retro_core_option_display option_display = {0};
+ bool updated = false;
+ unsigned i;
+
+ /* If frontend supports core option categories
+ * then show/hide core option entries are ignored
+ * and no options should be hidden */
+ if (libretro_supports_option_categories)
+ return false;
+
+ var.key = "pcsx_rearmed_show_input_settings";
+ var.value = NULL;
+
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+ {
+ bool show_input_settings_prev =
+ show_input_settings;
+
+ show_input_settings = true;
+ if (strcmp(var.value, "disabled") == 0)
+ show_input_settings = false;
+
+ if (show_input_settings !=
+ show_input_settings_prev)
+ {
+ char input_option[][50] = {
+ "pcsx_rearmed_analog_axis_modifier",
+ "pcsx_rearmed_vibration",
+ "pcsx_rearmed_multitap",
+ "pcsx_rearmed_negcon_deadzone",
+ "pcsx_rearmed_negcon_response",
+ "pcsx_rearmed_input_sensitivity",
+ "pcsx_rearmed_gunconadjustx",
+ "pcsx_rearmed_gunconadjusty",
+ "pcsx_rearmed_gunconadjustratiox",
+ "pcsx_rearmed_gunconadjustratioy"
+ };
+
+ option_display.visible = show_input_settings;
+
+ for (i = 0;
+ i < (sizeof(input_option) /
+ sizeof(input_option[0]));
+ i++)
+ {
+ option_display.key = input_option[i];
+ environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY,
+ &option_display);
+ }
+
+ updated = true;
+ }
+ }
+#ifdef GPU_PEOPS
+ var.key = "pcsx_rearmed_show_gpu_peops_settings";
+ var.value = NULL;
+
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+ {
+ bool show_advanced_gpu_peops_settings_prev =
+ show_advanced_gpu_peops_settings;
+
+ show_advanced_gpu_peops_settings = true;
+ if (strcmp(var.value, "disabled") == 0)
+ show_advanced_gpu_peops_settings = false;
+
+ if (show_advanced_gpu_peops_settings !=
+ show_advanced_gpu_peops_settings_prev)
+ {
+ unsigned i;
+ struct retro_core_option_display option_display;
+ char gpu_peops_option[][45] = {
+ "pcsx_rearmed_gpu_peops_odd_even_bit",
+ "pcsx_rearmed_gpu_peops_expand_screen_width",
+ "pcsx_rearmed_gpu_peops_ignore_brightness",
+ "pcsx_rearmed_gpu_peops_disable_coord_check",
+ "pcsx_rearmed_gpu_peops_lazy_screen_update",
+ "pcsx_rearmed_gpu_peops_repeated_triangles",
+ "pcsx_rearmed_gpu_peops_quads_with_triangles",
+ "pcsx_rearmed_gpu_peops_fake_busy_state"
+ };
+
+ option_display.visible = show_advanced_gpu_peops_settings;
+
+ for (i = 0;
+ i < (sizeof(gpu_peops_option) /
+ sizeof(gpu_peops_option[0]));
+ i++)
+ {
+ option_display.key = gpu_peops_option[i];
+ environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY,
+ &option_display);
+ }
+
+ updated = true;
+ }
+ }
+#endif
+#ifdef GPU_UNAI
+ var.key = "pcsx_rearmed_show_gpu_unai_settings";
+ var.value = NULL;
+
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+ {
+ bool show_advanced_gpu_unai_settings_prev =
+ show_advanced_gpu_unai_settings;
+
+ show_advanced_gpu_unai_settings = true;
+ if (strcmp(var.value, "disabled") == 0)
+ show_advanced_gpu_unai_settings = false;
+
+ if (show_advanced_gpu_unai_settings !=
+ show_advanced_gpu_unai_settings_prev)
+ {
+ unsigned i;
+ struct retro_core_option_display option_display;
+ char gpu_unai_option[][40] = {
+ "pcsx_rearmed_gpu_unai_blending",
+ "pcsx_rearmed_gpu_unai_lighting",
+ "pcsx_rearmed_gpu_unai_fast_lighting",
+ "pcsx_rearmed_gpu_unai_scale_hires",
+ };
+
+ option_display.visible = show_advanced_gpu_unai_settings;
+
+ for (i = 0;
+ i < (sizeof(gpu_unai_option) /
+ sizeof(gpu_unai_option[0]));
+ i++)
+ {
+ option_display.key = gpu_unai_option[i];
+ environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY,
+ &option_display);
+ }
+
+ updated = true;
+ }
+ }
+#endif
+ return updated;
+}
+
void retro_set_environment(retro_environment_t cb)
{
+ bool option_categories = false;
#ifdef USE_LIBRETRO_VFS
struct retro_vfs_interface_info vfs_iface_info;
#endif
log_cb = logging.log;
environ_cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports);
- libretro_set_core_options(environ_cb);
+
+ /* Set core options
+ * An annoyance: retro_set_environment() can be called
+ * multiple times, and depending upon the current frontend
+ * state various environment callbacks may be disabled.
+ * This means the reported 'categories_supported' status
+ * may change on subsequent iterations. We therefore have
+ * to record whether 'categories_supported' is true on any
+ * iteration, and latch the result */
+ libretro_set_core_options(environ_cb, &option_categories);
+ libretro_supports_option_categories |= option_categories;
+
+ /* If frontend supports core option categories,
+ * any show/hide core option entries are unused
+ * and should be hidden */
+ if (libretro_supports_option_categories)
+ {
+ struct retro_core_option_display option_display;
+ option_display.visible = false;
+
+ option_display.key = "pcsx_rearmed_show_input_settings";
+ environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY,
+ &option_display);
+
+#ifdef GPU_PEOPS
+ option_display.key = "pcsx_rearmed_show_gpu_peops_settings";
+ environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY,
+ &option_display);
+#endif
+#ifdef GPU_UNAI
+ option_display.key = "pcsx_rearmed_show_gpu_unai_settings";
+ environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY,
+ &option_display);
+#endif
+ }
+ /* If frontend does not support core option
+ * categories, core options may be shown/hidden
+ * at runtime. In this case, register 'update
+ * display' callback, so frontend can update
+ * core options menu without calling retro_run() */
+ else
+ {
+ struct retro_core_options_update_display_callback update_display_cb;
+ update_display_cb.callback = update_option_visibility;
+
+ environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_UPDATE_DISPLAY_CALLBACK,
+ &update_display_cb);
+ }
#ifdef USE_LIBRETRO_VFS
vfs_iface_info.required_interface_version = 1;
memset(info, 0, sizeof(*info));
info->library_name = "PCSX-ReARMed";
info->library_version = "r23l" GIT_VERSION;
- info->valid_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u|chd";
+ info->valid_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u|chd|iso|exe";
info->need_fullpath = true;
}
size_t i;
unsigned int cd_index = 0;
bool is_m3u = (strcasestr(info->path, ".m3u") != NULL);
+ bool is_exe = (strcasestr(info->path, ".exe") != NULL);
+ int ret;
struct retro_input_descriptor desc[] = {
#define JOYP(port) \
{ port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X, "Left Analog X" }, \
{ port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y, "Left Analog Y" }, \
{ port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X, "Right Analog X" }, \
- { port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y, "Right Analog Y" },
-
+ { port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y, "Right Analog Y" }, \
+ { port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_TRIGGER, "Gun Trigger" }, \
+ { port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_RELOAD, "Gun Reload" }, \
+ { port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_AUX_A, "Gun Aux A" }, \
+ { port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_AUX_B, "Gun Aux B" },
+
JOYP(0)
JOYP(1)
JOYP(2)
plugin_call_rearmed_cbs();
/* dfinput_activate(); */
- if (CheckCdrom() == -1)
+ if (!is_exe && CheckCdrom() == -1)
{
log_cb(RETRO_LOG_INFO, "unsupported/invalid CD image: %s\n", info->path);
return false;
SysReset();
- if (LoadCdrom() == -1)
+ if (is_exe)
+ ret = Load(info->path);
+ else
+ ret = LoadCdrom();
+ if (ret != 0)
{
- log_cb(RETRO_LOG_INFO, "could not load CD\n");
+ log_cb(RETRO_LOG_INFO, "could not load %s (%d)\n", is_exe ? "exe" : "CD", ret);
return false;
}
emu_on_new_cd(0);
{
struct retro_variable var;
#ifdef GPU_PEOPS
- int gpu_peops_fix = 0;
+ // Always enable GPU_PEOPS_OLD_FRAME_SKIP flag
+ // (this is set in standalone, with no option
+ // to change it)
+ int gpu_peops_fix = GPU_PEOPS_OLD_FRAME_SKIP;
#endif
frameskip_type_t prev_frameskip_type;
pl_rearmed_cbs.gpu_peops.iUseDither = 0;
pl_rearmed_cbs.gpu_peopsgl.bDrawDither = 0;
pl_rearmed_cbs.gpu_unai.dithering = 0;
-#ifdef __ARM_NEON__
+#ifdef GPU_NEON
pl_rearmed_cbs.gpu_neon.allow_dithering = 0;
#endif
}
pl_rearmed_cbs.gpu_peops.iUseDither = 1;
pl_rearmed_cbs.gpu_peopsgl.bDrawDither = 1;
pl_rearmed_cbs.gpu_unai.dithering = 1;
-#ifdef __ARM_NEON__
+#ifdef GPU_NEON
pl_rearmed_cbs.gpu_neon.allow_dithering = 1;
#endif
}
#ifdef GPU_NEON
var.value = NULL;
- var.key = "pcsx_rearmed_neon_interlace_enable";
+ var.key = "pcsx_rearmed_neon_interlace_enable_v2";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
pl_rearmed_cbs.gpu_neon.allow_interlace = 0;
else if (strcmp(var.value, "enabled") == 0)
pl_rearmed_cbs.gpu_neon.allow_interlace = 1;
+ else // auto
+ pl_rearmed_cbs.gpu_neon.allow_interlace = 2;
}
var.value = NULL;
display_internal_fps = true;
}
+ //
+ // CPU emulation related config
#ifndef DRC_DISABLE
var.value = NULL;
var.key = "pcsx_rearmed_drc";
psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec;
if (psxCpu != prev_cpu)
{
+ prev_cpu->Notify(R3000ACPU_NOTIFY_BEFORE_SAVE, NULL);
prev_cpu->Shutdown();
psxCpu->Init();
- psxCpu->Reset(); // not really a reset..
+ psxCpu->Reset();
+ psxCpu->Notify(R3000ACPU_NOTIFY_AFTER_LOAD, NULL);
}
}
#endif /* !DRC_DISABLE */
- psxCpu->ApplyConfig();
var.value = NULL;
- var.key = "pcsx_rearmed_spu_reverb";
+ var.key = "pcsx_rearmed_psxclock";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+ {
+ int psxclock = atoi(var.value);
+ Config.cycle_multiplier = 10000 / psxclock;
+ }
+#if !defined(DRC_DISABLE) && !defined(LIGHTREC)
+ var.value = NULL;
+ var.key = "pcsx_rearmed_nosmccheck";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
- if (strcmp(var.value, "disabled") == 0)
- spu_config.iUseReverb = false;
- else if (strcmp(var.value, "enabled") == 0)
- spu_config.iUseReverb = true;
+ if (strcmp(var.value, "enabled") == 0)
+ new_dynarec_hacks |= NDHACK_NO_SMC_CHECK;
+ else
+ new_dynarec_hacks &= ~NDHACK_NO_SMC_CHECK;
}
var.value = NULL;
- var.key = "pcsx_rearmed_spu_interpolation";
+ var.key = "pcsx_rearmed_gteregsunneeded";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+ {
+ if (strcmp(var.value, "enabled") == 0)
+ new_dynarec_hacks |= NDHACK_GTE_UNNEEDED;
+ else
+ new_dynarec_hacks &= ~NDHACK_GTE_UNNEEDED;
+ }
+ var.value = NULL;
+ var.key = "pcsx_rearmed_nogteflags";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
- if (strcmp(var.value, "simple") == 0)
- spu_config.iUseInterpolation = 1;
- else if (strcmp(var.value, "gaussian") == 0)
- spu_config.iUseInterpolation = 2;
- else if (strcmp(var.value, "cubic") == 0)
- spu_config.iUseInterpolation = 3;
- else if (strcmp(var.value, "off") == 0)
- spu_config.iUseInterpolation = 0;
+ if (strcmp(var.value, "enabled") == 0)
+ new_dynarec_hacks |= NDHACK_GTE_NO_FLAGS;
+ else
+ new_dynarec_hacks &= ~NDHACK_GTE_NO_FLAGS;
}
var.value = NULL;
- var.key = "pcsx_rearmed_pe2_fix";
+ var.key = "pcsx_rearmed_nocompathacks";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+ {
+ if (strcmp(var.value, "enabled") == 0)
+ new_dynarec_hacks |= NDHACK_NO_COMPAT_HACKS;
+ else
+ new_dynarec_hacks &= ~NDHACK_NO_COMPAT_HACKS;
+ }
+#endif /* !DRC_DISABLE && !LIGHTREC */
+ var.value = NULL;
+ var.key = "pcsx_rearmed_nostalls";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
- if (strcmp(var.value, "disabled") == 0)
- Config.RCntFix = 0;
- else if (strcmp(var.value, "enabled") == 0)
- Config.RCntFix = 1;
+ if (strcmp(var.value, "enabled") == 0)
+ Config.DisableStalls = 1;
+ else
+ Config.DisableStalls = 0;
}
-
+
var.value = NULL;
var.key = "pcsx_rearmed_icache_emulation";
-
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
if (strcmp(var.value, "disabled") == 0)
}
var.value = NULL;
- var.key = "pcsx_rearmed_inuyasha_fix";
+ var.key = "pcsx_rearmed_exception_emulation";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+ {
+ if (strcmp(var.value, "enabled") == 0)
+ Config.PreciseExceptions = 1;
+ else
+ Config.PreciseExceptions = 0;
+ }
+
+ psxCpu->ApplyConfig();
+
+ // end of CPU emu config
+ //
+
+ var.value = NULL;
+ var.key = "pcsx_rearmed_spu_reverb";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
if (strcmp(var.value, "disabled") == 0)
- Config.VSyncWA = 0;
+ spu_config.iUseReverb = false;
else if (strcmp(var.value, "enabled") == 0)
- Config.VSyncWA = 1;
+ spu_config.iUseReverb = true;
}
-#ifndef _WIN32
var.value = NULL;
- var.key = "pcsx_rearmed_async_cd";
+ var.key = "pcsx_rearmed_spu_interpolation";
+
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
- if (strcmp(var.value, "async") == 0)
- {
- Config.AsyncCD = 1;
- Config.CHD_Precache = 0;
- }
- else if (strcmp(var.value, "sync") == 0)
- {
- Config.AsyncCD = 0;
- Config.CHD_Precache = 0;
- }
- else if (strcmp(var.value, "precache") == 0)
- {
- Config.AsyncCD = 0;
- Config.CHD_Precache = 1;
- }
+ if (strcmp(var.value, "simple") == 0)
+ spu_config.iUseInterpolation = 1;
+ else if (strcmp(var.value, "gaussian") == 0)
+ spu_config.iUseInterpolation = 2;
+ else if (strcmp(var.value, "cubic") == 0)
+ spu_config.iUseInterpolation = 3;
+ else if (strcmp(var.value, "off") == 0)
+ spu_config.iUseInterpolation = 0;
+ }
+
+ var.value = NULL;
+ var.key = "pcsx_rearmed_spu_thread";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+ {
+ if (strcmp(var.value, "enabled") == 0)
+ spu_config.iUseThread = 1;
+ else
+ spu_config.iUseThread = 0;
+ }
+
+ if (P_HAVE_PTHREAD) {
+ var.value = NULL;
+ var.key = "pcsx_rearmed_async_cd";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+ {
+ if (strcmp(var.value, "async") == 0)
+ {
+ Config.AsyncCD = 1;
+ Config.CHD_Precache = 0;
+ }
+ else if (strcmp(var.value, "sync") == 0)
+ {
+ Config.AsyncCD = 0;
+ Config.CHD_Precache = 0;
+ }
+ else if (strcmp(var.value, "precache") == 0)
+ {
+ Config.AsyncCD = 0;
+ Config.CHD_Precache = 1;
+ }
+ }
}
-#endif
var.value = NULL;
var.key = "pcsx_rearmed_noxadecoding";
}
var.value = NULL;
- var.key = "pcsx_rearmed_spuirq";
+ var.key = "pcsx_rearmed_gpu_slow_llists";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
if (strcmp(var.value, "disabled") == 0)
- Config.SpuIrq = 0;
- else
- Config.SpuIrq = 1;
+ Config.GpuListWalking = 0;
+ else if (strcmp(var.value, "enabled") == 0)
+ Config.GpuListWalking = 1;
+ else // auto
+ Config.GpuListWalking = -1;
+ }
+
+ var.value = NULL;
+ var.key = "pcsx_rearmed_screen_centering";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+ {
+ if (strcmp(var.value, "game") == 0)
+ pl_rearmed_cbs.screen_centering_type = 1;
+ else if (strcmp(var.value, "manual") == 0)
+ pl_rearmed_cbs.screen_centering_type = 2;
+ else // auto
+ pl_rearmed_cbs.screen_centering_type = 0;
+ }
+
+ var.value = NULL;
+ var.key = "pcsx_rearmed_screen_centering_x";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+ {
+ pl_rearmed_cbs.screen_centering_x = atoi(var.value);
+ }
+
+ var.value = NULL;
+ var.key = "pcsx_rearmed_screen_centering_y";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+ {
+ pl_rearmed_cbs.screen_centering_y = atoi(var.value);
}
#ifdef THREAD_RENDERING
gpu_peops_fix |= GPU_PEOPS_LAZY_SCREEN_UPDATE;
}
- var.value = NULL;
- var.key = "pcsx_rearmed_gpu_peops_old_frame_skip";
-
- if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
- {
- if (strcmp(var.value, "enabled") == 0)
- gpu_peops_fix |= GPU_PEOPS_OLD_FRAME_SKIP;
- }
-
var.value = NULL;
var.key = "pcsx_rearmed_gpu_peops_repeated_triangles";
if (pl_rearmed_cbs.gpu_peops.dwActFixes != gpu_peops_fix)
pl_rearmed_cbs.gpu_peops.dwActFixes = gpu_peops_fix;
-
- /* Show/hide core options */
-
- var.key = "pcsx_rearmed_show_gpu_peops_settings";
- var.value = NULL;
-
- if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
- {
- int show_advanced_gpu_peops_settings_prev = show_advanced_gpu_peops_settings;
-
- show_advanced_gpu_peops_settings = 1;
- if (strcmp(var.value, "disabled") == 0)
- show_advanced_gpu_peops_settings = 0;
-
- if (show_advanced_gpu_peops_settings != show_advanced_gpu_peops_settings_prev)
- {
- unsigned i;
- struct retro_core_option_display option_display;
- char gpu_peops_option[9][45] = {
- "pcsx_rearmed_gpu_peops_odd_even_bit",
- "pcsx_rearmed_gpu_peops_expand_screen_width",
- "pcsx_rearmed_gpu_peops_ignore_brightness",
- "pcsx_rearmed_gpu_peops_disable_coord_check",
- "pcsx_rearmed_gpu_peops_lazy_screen_update",
- "pcsx_rearmed_gpu_peops_old_frame_skip",
- "pcsx_rearmed_gpu_peops_repeated_triangles",
- "pcsx_rearmed_gpu_peops_quads_with_triangles",
- "pcsx_rearmed_gpu_peops_fake_busy_state"
- };
-
- option_display.visible = show_advanced_gpu_peops_settings;
-
- for (i = 0; i < 9; i++)
- {
- option_display.key = gpu_peops_option[i];
- environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display);
- }
- }
- }
#endif
#ifdef GPU_UNAI
- var.key = "pcsx_rearmed_gpu_unai_ilace_force";
- var.value = NULL;
-
- if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
- {
- if (strcmp(var.value, "disabled") == 0)
- pl_rearmed_cbs.gpu_unai.ilace_force = 0;
- else if (strcmp(var.value, "enabled") == 0)
- pl_rearmed_cbs.gpu_unai.ilace_force = 1;
- }
-
- var.key = "pcsx_rearmed_gpu_unai_pixel_skip";
- var.value = NULL;
-
- if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
- {
- if (strcmp(var.value, "disabled") == 0)
- pl_rearmed_cbs.gpu_unai.pixel_skip = 0;
- else if (strcmp(var.value, "enabled") == 0)
- pl_rearmed_cbs.gpu_unai.pixel_skip = 1;
- }
+ /* Note: This used to be an option, but it only works
+ * (correctly) when running high resolution games
+ * (480i, 512i) and has been obsoleted by
+ * pcsx_rearmed_gpu_unai_scale_hires */
+ pl_rearmed_cbs.gpu_unai.ilace_force = 0;
+ /* Note: This used to be an option, but it has no
+ * discernable effect and has been obsoleted by
+ * pcsx_rearmed_gpu_unai_scale_hires */
+ pl_rearmed_cbs.gpu_unai.pixel_skip = 0;
var.key = "pcsx_rearmed_gpu_unai_lighting";
var.value = NULL;
else if (strcmp(var.value, "enabled") == 0)
pl_rearmed_cbs.gpu_unai.scale_hires = 1;
}
-
- var.key = "pcsx_rearmed_show_gpu_unai_settings";
- var.value = NULL;
-
- if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
- {
- int show_advanced_gpu_unai_settings_prev = show_advanced_gpu_unai_settings;
-
- show_advanced_gpu_unai_settings = 1;
- if (strcmp(var.value, "disabled") == 0)
- show_advanced_gpu_unai_settings = 0;
-
- if (show_advanced_gpu_unai_settings != show_advanced_gpu_unai_settings_prev)
- {
- unsigned i;
- struct retro_core_option_display option_display;
- char gpu_unai_option[6][40] = {
- "pcsx_rearmed_gpu_unai_blending",
- "pcsx_rearmed_gpu_unai_lighting",
- "pcsx_rearmed_gpu_unai_fast_lighting",
- "pcsx_rearmed_gpu_unai_ilace_force",
- "pcsx_rearmed_gpu_unai_pixel_skip",
- "pcsx_rearmed_gpu_unai_scale_hires",
- };
-
- option_display.visible = show_advanced_gpu_unai_settings;
-
- for (i = 0; i < 6; i++)
- {
- option_display.key = gpu_unai_option[i];
- environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display);
- }
- }
- }
#endif // GPU_UNAI
//This adjustment process gives the user the ability to manually align the mouse up better
GunconAdjustRatioY = atof(var.value);
}
-#if !defined(DRC_DISABLE) && !defined(LIGHTREC)
- var.value = NULL;
- var.key = "pcsx_rearmed_nosmccheck";
- if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
- {
- if (strcmp(var.value, "enabled") == 0)
- new_dynarec_hacks |= NDHACK_NO_SMC_CHECK;
- else
- new_dynarec_hacks &= ~NDHACK_NO_SMC_CHECK;
- }
-
- var.value = NULL;
- var.key = "pcsx_rearmed_gteregsunneeded";
- if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
- {
- if (strcmp(var.value, "enabled") == 0)
- new_dynarec_hacks |= NDHACK_GTE_UNNEEDED;
- else
- new_dynarec_hacks &= ~NDHACK_GTE_UNNEEDED;
- }
-
- var.value = NULL;
- var.key = "pcsx_rearmed_nogteflags";
- if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
- {
- if (strcmp(var.value, "enabled") == 0)
- new_dynarec_hacks |= NDHACK_GTE_NO_FLAGS;
- else
- new_dynarec_hacks &= ~NDHACK_GTE_NO_FLAGS;
- }
-
- /* this probably is safe to change in real-time */
- var.value = NULL;
- var.key = "pcsx_rearmed_psxclock";
- if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
- {
- int psxclock = atoi(var.value);
- cycle_multiplier = 10000 / psxclock;
- }
-
- var.value = NULL;
- var.key = "pcsx_rearmed_nocompathacks";
- if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
- {
- if (strcmp(var.value, "enabled") == 0)
- new_dynarec_hacks |= NDHACK_NO_COMPAT_HACKS;
- else
- new_dynarec_hacks &= ~NDHACK_NO_COMPAT_HACKS;
- }
-#endif /* !DRC_DISABLE && !LIGHTREC */
-
- var.value = NULL;
- var.key = "pcsx_rearmed_nostalls";
- if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
- {
- if (strcmp(var.value, "enabled") == 0)
- Config.DisableStalls = 1;
- else
- Config.DisableStalls = 0;
- }
-
var.value = NULL;
var.key = "pcsx_rearmed_input_sensitivity";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
mouse_sensitivity = atof(var.value);
}
- var.key = "pcsx_rearmed_show_other_input_settings";
- var.value = NULL;
-
- if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
- {
- int previous_settings = show_other_input_settings;
-
- show_other_input_settings = 1;
- if (strcmp(var.value, "disabled") == 0)
- show_other_input_settings = 0;
-
- if (show_other_input_settings != previous_settings)
- {
- unsigned i;
- struct retro_core_option_display option_display;
- char gpu_peops_option[][50] = {
- "pcsx_rearmed_negcon_deadzone",
- "pcsx_rearmed_negcon_response",
- "pcsx_rearmed_analog_axis_modifier",
- "pcsx_rearmed_gunconadjustx",
- "pcsx_rearmed_gunconadjusty",
- "pcsx_rearmed_gunconadjustratiox",
- "pcsx_rearmed_gunconadjustratioy"
- };
- #define INPUT_LIST (sizeof(gpu_peops_option) / sizeof(gpu_peops_option[0]))
-
- option_display.visible = show_other_input_settings;
-
- for (i = 0; i < INPUT_LIST; i++)
- {
- option_display.key = gpu_peops_option[i];
- environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display);
- }
- }
- }
-
if (in_flight)
{
// inform core things about possible config changes
}
}
}
+
+ update_option_visibility();
}
// Taken from beetle-psx-libretro
static void update_input_guncon(int port, int ret)
{
- //ToDo move across to:
- //RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X
- //RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y
- //RETRO_DEVICE_ID_LIGHTGUN_TRIGGER
- //RETRO_DEVICE_ID_LIGHTGUN_RELOAD
- //RETRO_DEVICE_ID_LIGHTGUN_AUX_A
- //RETRO_DEVICE_ID_LIGHTGUN_AUX_B
- //Though not sure these are hooked up properly on the Pi
+ //ToDo:
+ //Core option for cursors for both players
+ //Separate pointer and lightgun control types
+ //Mouse range is -32767 -> 32767
+ //1% is about 655
+ //Use the left analog stick field to store the absolute coordinates
+
+ int gunx = input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X);
+ int guny = input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y);
+
+ //Have the Libretro API let /libpcsxcore/plugins.c know when the lightgun is pointed offscreen
+ //Offscreen value is chosen to be well out of range of any possible scaling done via core options
+ if (input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_IS_OFFSCREEN) || input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_RELOAD))
+ {
+ in_analog_left[port][0] = (65536 - 512) * 64;
+ in_analog_left[port][1] = (65536 - 512) * 64;
+ }
+ else
+ {
+ in_analog_left[port][0] = (gunx * GunconAdjustRatioX) + (GunconAdjustX * 655);
+ in_analog_left[port][1] = (guny * GunconAdjustRatioY) + (GunconAdjustY * 655);
+ }
+
//GUNCON has 3 controls, Trigger,A,B which equal Circle,Start,Cross
// Trigger
- //The 1 is hardcoded instead of port to prevent the overlay mouse button libretro crash bug
- if (input_state_cb(port, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_LEFT))
- {
+ if (input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_TRIGGER) || input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_RELOAD))
in_keystate[port] |= (1 << DKEY_CIRCLE);
- }
// A
- if (input_state_cb(port, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_RIGHT))
- {
+ if (input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_AUX_A))
in_keystate[port] |= (1 << DKEY_START);
- }
// B
- if (input_state_cb(port, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_MIDDLE))
- {
+ if (input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_AUX_B))
in_keystate[port] |= (1 << DKEY_CROSS);
- }
-
- int gunx = input_state_cb(port, RETRO_DEVICE_POINTER, 0, RETRO_DEVICE_ID_POINTER_X);
- int guny = input_state_cb(port, RETRO_DEVICE_POINTER, 0, RETRO_DEVICE_ID_POINTER_Y);
-
- //Mouse range is -32767 -> 32767
- //1% is about 655
- //Use the left analog stick field to store the absolute coordinates
- in_analog_left[port][0] = (gunx * GunconAdjustRatioX) + (GunconAdjustX * 655);
- in_analog_left[port][1] = (guny * GunconAdjustRatioY) + (GunconAdjustY * 655);
+
}
static void update_input_negcon(int port, int ret)
{
rebootemu = 0;
SysReset();
- if (!Config.HLE && !Config.SlowBoot)
- {
- // skip BIOS logos
- psxRegs.pc = psxRegs.GPR.n.ra;
- }
- return;
+ if (Config.HLE)
+ LoadCdrom();
}
print_internal_fps();
static bool find_any_bios(const char *dirpath, char *path, size_t path_size)
{
+ static const char *substrings[] = { "scph", "ps", "openbios" };
DIR *dir;
struct dirent *ent;
bool ret = false;
+ size_t i;
dir = opendir(dirpath);
if (dir == NULL)
return false;
- while ((ent = readdir(dir)))
+ for (i = 0; i < (sizeof(substrings) / sizeof(substrings[0])); i++)
{
- if ((strncasecmp(ent->d_name, "scph", 4) != 0) && (strncasecmp(ent->d_name, "psx", 3) != 0))
- continue;
-
- snprintf(path, path_size, "%s%c%s", dirpath, SLASH, ent->d_name);
- ret = try_use_bios(path);
- if (ret)
- break;
+ const char *substr = substrings[i];
+ size_t len = strlen(substr);
+ rewinddir(dir);
+ while ((ent = readdir(dir)))
+ {
+ if ((strncasecmp(ent->d_name, substr, len) != 0))
+ continue;
+ if (strstr(ent->d_name, "unirom"))
+ continue;
+
+ snprintf(path, path_size, "%s%c%s", dirpath, SLASH, ent->d_name);
+ ret = try_use_bios(path);
+ if (ret)
+ {
+ closedir(dir);
+ return ret;
+ }
+ }
}
closedir(dir);
return ret;
#ifdef _3DS
vout_buf = linearMemAlign(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2, 0x80);
-#elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L) && !defined(VITA) && !defined(__SWITCH__)
+#elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L) && P_HAVE_POSIX_MEMALIGN
if (posix_memalign(&vout_buf, 16, VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2) != 0)
vout_buf = (void *) 0;
#else
/* Set how much slower PSX CPU runs * 100 (so that 200 is 2 times)
* we have to do this because cache misses and some IO penalties
* are not emulated. Warning: changing this may break compatibility. */
- cycle_multiplier = 175;
+ Config.cycle_multiplier = CYCLE_MULT_DEFAULT;
#if defined(HAVE_PRE_ARMV7) && !defined(_3DS)
- cycle_multiplier = 200;
+ Config.cycle_multiplier = 200;
#endif
pl_rearmed_cbs.gpu_peops.iUseDither = 1;
pl_rearmed_cbs.gpu_peops.dwActFixes = GPU_PEOPS_OLD_FRAME_SKIP;
deinit_vita_mmap();
#endif
libretro_supports_bitmasks = false;
+ libretro_supports_option_categories = false;
+
+ show_input_settings = true;
+#ifdef GPU_PEOPS
+ show_advanced_gpu_peops_settings = true;
+#endif
+#ifdef GPU_UNAI
+ show_advanced_gpu_unai_settings = true;
+#endif
/* Have to reset disks struct, otherwise
* fnames/flabels will leak memory */
if (log_cb)
log_cb(RETRO_LOG_DEBUG, "%s", msg);
}
+
+// vim:sw=3:ts=3:expandtab
notaz.gp2x.de / pcsx_rearmed.git / blobdiff