#include "../libpcsxcore/r3000a.h"
#include "../plugins/dfsound/out.h"
#include "../plugins/dfsound/spu_config.h"
-#include "../plugins/dfinput/externals.h"
#include "cspace.h"
#include "main.h"
#include "menu.h"
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 int psx_w, psx_h;
static bool vout_can_dupe;
static bool duping_enable;
static bool found_bios;
{
vout_width = w;
vout_height = h;
+ psx_w = raw_w;
+ psx_h = raw_h;
if (previous_width != vout_width || previous_height != vout_height)
{
}
#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_update_gun(int *xn, int *yn, int *xres, int *yres, int *in)
+void pl_gun_byte2(int port, unsigned char byte)
{
}
void retro_cheat_set(unsigned index, bool enabled, const char *code)
{
- char buf[256];
- int ret;
+ int ret = -1;
+ char *buf;
- // cheat funcs are destructive, need a copy..
- strncpy(buf, code, sizeof(buf));
- buf[sizeof(buf) - 1] = 0;
+ // cheat funcs are destructive, need a copy...
+ buf = strdup(code);
+ if (buf == NULL)
+ goto finish;
//Prepare buffered cheat for PCSX's AddCheat fucntion.
int cursor = 0;
else
ret = AddCheat("", buf);
+finish:
if (ret != 0)
SysPrintf("Failed to set cheat %#u\n", index);
else if (index < NumCheats)
Cheats[index].Enabled = enabled;
+ free(buf);
}
// just in case, maybe a win-rt port in the future?
{
R3000Acpu *prev_cpu = psxCpu;
-#if defined(LIGHTREC)
- bool can_use_dynarec = found_bios;
-#else
- bool can_use_dynarec = 1;
-#endif
#ifdef _3DS
if (!__ctr_svchax)
Config.Cpu = CPU_INTERPRETER;
else
#endif
- if (strcmp(var.value, "disabled") == 0 || !can_use_dynarec)
+ if (strcmp(var.value, "disabled") == 0)
Config.Cpu = CPU_INTERPRETER;
else if (strcmp(var.value, "enabled") == 0)
Config.Cpu = CPU_DYNAREC;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
if (strcmp(var.value, "disabled") == 0)
- Config.GpuListWalking = 0;
+ Config.GpuListWalking = 0;
else if (strcmp(var.value, "enabled") == 0)
- Config.GpuListWalking = 1;
+ Config.GpuListWalking = 1;
else // auto
- Config.GpuListWalking = -1;
+ 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
//Mouse range is -32767 -> 32767
//1% is about 655
//Use the left analog stick field to store the absolute coordinates
- //Fix cursor to top-left when gun is detected as "offscreen"
+
+ 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] = -32767;
- in_analog_left[port][1] = -32767;
+ in_analog_left[port][0] = 65536;
+ in_analog_left[port][1] = 65536;
}
else
{
- 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);
-
- in_analog_left[port][0] = (gunx * GunconAdjustRatioX) + (GunconAdjustX * 655);
- in_analog_left[port][1] = (guny * GunconAdjustRatioY) + (GunconAdjustY * 655);
+ in_analog_left[port][0] = ((gunx * GunconAdjustRatioX) + (GunconAdjustX * 655)) / 64 + 512;
+ in_analog_left[port][1] = ((guny * GunconAdjustRatioY) + (GunconAdjustY * 655)) / 64 + 512;
}
//GUNCON has 3 controls, Trigger,A,B which equal Circle,Start,Cross
{
rebootemu = 0;
SysReset();
+ if (Config.HLE)
+ LoadCdrom();
}
print_internal_fps();
set_vout_fb();
}
-static bool try_use_bios(const char *path)
+static bool try_use_bios(const char *path, bool preferred_only)
{
long size;
const char *name;
size = ftell(fp);
fclose(fp);
- if (size != 512 * 1024)
- return false;
-
name = strrchr(path, SLASH);
if (name++ == NULL)
name = path;
+
+ if (preferred_only && size != 512 * 1024)
+ return false;
+ if (size != 512 * 1024 && size != 4 * 1024 * 1024)
+ return false;
+ if (strstr(name, "unirom"))
+ return false;
+ // jp bios have an addidional region check
+ if (preferred_only && (strcasestr(name, "00.") || strcasestr(name, "j.bin")))
+ return false;
+
snprintf(Config.Bios, sizeof(Config.Bios), "%s", name);
return true;
}
static bool find_any_bios(const char *dirpath, char *path, size_t path_size)
{
- static const char *substrings[] = { "scph", "ps", "openbios" };
+ static const char *substr_pref[] = { "scph", "ps" };
+ static const char *substr_alt[] = { "scph", "ps", "openbios" };
DIR *dir;
struct dirent *ent;
bool ret = false;
if (dir == NULL)
return false;
- for (i = 0; i < (sizeof(substrings) / sizeof(substrings[0])); i++)
+ // try to find a "better" bios
+ while ((ent = readdir(dir)))
{
- const char *substr = substrings[i];
- size_t len = strlen(substr);
- rewinddir(dir);
- while ((ent = readdir(dir)))
+ for (i = 0; i < sizeof(substr_pref) / sizeof(substr_pref[0]); i++)
{
- if ((strncasecmp(ent->d_name, substr, len) != 0))
- continue;
- if (strstr(ent->d_name, "unirom"))
+ const char *substr = substr_pref[i];
+ if ((strncasecmp(ent->d_name, substr, strlen(substr)) != 0))
continue;
+ snprintf(path, path_size, "%s%c%s", dirpath, SLASH, ent->d_name);
+ ret = try_use_bios(path, true);
+ if (ret)
+ goto finish;
+ }
+ }
+ // another pass to look for anything fitting, even ps2 bios
+ rewinddir(dir);
+ while ((ent = readdir(dir)))
+ {
+ for (i = 0; i < sizeof(substr_alt) / sizeof(substr_alt[0]); i++)
+ {
+ const char *substr = substr_alt[i];
+ if ((strncasecmp(ent->d_name, substr, strlen(substr)) != 0))
+ continue;
snprintf(path, path_size, "%s%c%s", dirpath, SLASH, ent->d_name);
- ret = try_use_bios(path);
+ ret = try_use_bios(path, false);
if (ret)
- {
- closedir(dir);
- return ret;
- }
+ goto finish;
}
}
+
+
+finish:
closedir(dir);
return ret;
}
for (i = 0; i < sizeof(bios) / sizeof(bios[0]); i++)
{
snprintf(path, sizeof(path), "%s%c%s.bin", dir, SLASH, bios[i]);
- found_bios = try_use_bios(path);
+ found_bios = try_use_bios(path, true);
if (found_bios)
break;
}
#endif
pl_rearmed_cbs.gpu_peops.iUseDither = 1;
pl_rearmed_cbs.gpu_peops.dwActFixes = GPU_PEOPS_OLD_FRAME_SKIP;
- spu_config.iUseFixedUpdates = 1;
SaveFuncs.open = save_open;
SaveFuncs.read = save_read;
notaz.gp2x.de / pcsx_rearmed.git / blobdiff