mvietri/union-minui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added fake08 overrides + fixes for sparse cores

Browse source
This commit is contained in:
Shaun Inman 2023-02-13 08:32:27 -05:00
parent e6f6652e59
commit 3f5f5bfaaf
2 changed files with 102 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

159
src/minarch/main.c
View file

@ -24,6 +24,7 @@
#include "overrides.h" #include "overrides.h"
#include "overrides/fceumm.h" #include "overrides/fceumm.h"
#include "overrides/fake-08.h"
#include "overrides/gambatte.h" #include "overrides/gambatte.h"
#include "overrides/gpsp.h" #include "overrides/gpsp.h"
#include "overrides/mednafen_vb.h" #include "overrides/mednafen_vb.h"
@ -33,6 +34,7 @@
#include "overrides/snes9x2005_plus.h" #include "overrides/snes9x2005_plus.h"
static CoreOverrides* overrides[] = { static CoreOverrides* overrides[] = {
&fake08_overrides,
&fceumm_overrides, &fceumm_overrides,
&gambatte_overrides, &gambatte_overrides,
&gpsp_overrides, &gpsp_overrides,
@ -536,8 +538,8 @@ enum {
}; };
static struct Config { static struct Config {
OptionList core;
OptionList frontend; OptionList frontend;
OptionList core;
ButtonMapping* controls; ButtonMapping* controls;
ButtonMapping* shortcuts; ButtonMapping* shortcuts;
int loaded; int loaded;
@ -1165,6 +1167,57 @@ static int16_t input_state_callback(unsigned port, unsigned device, unsigned ind
} }
/////////////////////////////// ///////////////////////////////
void Input_init(const struct retro_input_descriptor *vars) {
static int input_initialized = 0;
if (input_initialized) return;
config.controls = core.overrides && core.overrides->button_mapping ? core.overrides->button_mapping : default_button_mapping;
puts("---------------------------------");
int present[RETRO_BUTTON_COUNT];
int core_mapped = 0;
if (vars) {
core_mapped = 1;
// identify buttons available in this core
for (int i=0; vars[i].description; i++) {
const struct retro_input_descriptor* var = &vars[i];
if (var->port!=0 || var->device!=RETRO_DEVICE_JOYPAD || var->index!=0) continue;
// TODO: don't ignore unavailable buttons, just override them to BTN_ID_NONE!
if (var->id>=RETRO_BUTTON_COUNT) {
printf("UNAVAILABLE: %s\n", var->description); fflush(stdout);
continue;
}
else {
printf("PRESENT : %s\n", var->description); fflush(stdout);
}
present[var->id] = 1;
core_button_names[var->id] = var->description;
}
}
for (int i=0;default_button_mapping[i].name; i++) {
ButtonMapping* mapping = &default_button_mapping[i];
LOG_info("DEFAULT %s (%s): <%s>\n", core_button_names[mapping->retro], mapping->name, (mapping->local==BTN_ID_NONE ? "NONE" : device_button_names[mapping->local]));
}
for (int i=0; config.controls[i].name; i++) {
ButtonMapping* mapping = &config.controls[i];
mapping->default_ = mapping->local;
// null mappings that aren't available in this core
if (core_mapped && !present[mapping->retro]) {
mapping->name = NULL;
continue;
}
LOG_info("%s: <%s>\n", mapping->name, (mapping->local==BTN_ID_NONE ? "NONE" : device_button_names[mapping->local]));
}
puts("---------------------------------");
input_initialized = 1;
}
static bool set_rumble_state(unsigned port, enum retro_rumble_effect effect, uint16_t strength) { static bool set_rumble_state(unsigned port, enum retro_rumble_effect effect, uint16_t strength) {
// TODO: handle other args? not sure I can // TODO: handle other args? not sure I can
POW_setRumble(strength); POW_setRumble(strength);
@ -1172,6 +1225,8 @@ static bool set_rumble_state(unsigned port, enum retro_rumble_effect effect, uin
static bool environment_callback(unsigned cmd, void *data) { // copied from picoarch initially static bool environment_callback(unsigned cmd, void *data) { // copied from picoarch initially
// printf("environment_callback: %i\n", cmd); fflush(stdout); // printf("environment_callback: %i\n", cmd); fflush(stdout);
// LOG_info("environment_callback: %i\n", cmd);
switch(cmd) { switch(cmd) {
case RETRO_ENVIRONMENT_GET_OVERSCAN: { /* 2 */ case RETRO_ENVIRONMENT_GET_OVERSCAN: { /* 2 */
bool *out = (bool *)data; bool *out = (bool *)data;
@ -1213,68 +1268,8 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
} }
case RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS: { /* 11 */ case RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS: { /* 11 */
// LOG_info("RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS\n"); // LOG_info("RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS\n");
// TODO: this is useless Input_init((const struct retro_input_descriptor *)data);
// (some? all?) cores don't sort these in any logical way return false;
// which explains why picoarch didn't implement this...
// TODO: this needs further refactoring (and to be moved elsewhere)
// we need:
// core_button_names (indexed by RETRO_DEVICE_ID_JOYPAD_*) from input_descriptors
// override_button_names (indexed by RETRO_DEVICE_ID_JOYPAD_*) from core.overrides
// device_button_names (indexed by BTN_ID_*)
// default_button_mapping (indexed by RETRO_DEVICE_ID_JOYPAD_*?)
// override_button_mapping (indexed by RETRO_DEVICE_ID_JOYPAD_*?)
// ButtonMapping needs to be redefined to include retro_name local_name retro_id local_id local_default
// TODO: move all this to an Input_init()?
config.controls = core.overrides && core.overrides->button_mapping ? core.overrides->button_mapping : default_button_mapping;
const struct retro_input_descriptor *vars = (const struct retro_input_descriptor *)data;
if (vars) {
// TODO: is this guaranteed to be called?
puts("---------------------------------");
// identify buttons available in this core
int present[RETRO_BUTTON_COUNT];
memset(&present, 0, RETRO_BUTTON_COUNT * sizeof(int));
for (int i=0; vars[i].description; i++) {
const struct retro_input_descriptor* var = &vars[i];
if (var->port!=0 || var->device!=RETRO_DEVICE_JOYPAD || var->index!=0) continue;
// TODO: don't ignore unavailable buttons, just override them to BTN_ID_NONE!
if (var->id>=RETRO_BUTTON_COUNT) {
printf("UNAVAILABLE: %s\n", var->description); fflush(stdout);
continue;
}
else {
printf("PRESENT : %s\n", var->description); fflush(stdout);
}
present[var->id] = 1;
core_button_names[var->id] = var->description;
}
for (int i=0;default_button_mapping[i].name; i++) {
ButtonMapping* mapping = &default_button_mapping[i];
LOG_info("DEFAULT %s (%s): <%s>\n", core_button_names[mapping->retro], mapping->name, (mapping->local==BTN_ID_NONE ? "NONE" : device_button_names[mapping->local]));
}
for (int i=0; config.controls[i].name; i++) {
ButtonMapping* mapping = &config.controls[i];
mapping->default_ = mapping->local;
// null mappings that aren't available in this core
if (!present[mapping->retro]) {
mapping->name = NULL;
continue;
}
LOG_info("%s: <%s>\n", mapping->name, (mapping->local==BTN_ID_NONE ? "NONE" : device_button_names[mapping->local]));
}
puts("---------------------------------");
return false;
}
} break; } break;
case RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE: { /* 13 */ case RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE: { /* 13 */
const struct retro_disk_control_callback *var = const struct retro_disk_control_callback *var =
@ -1308,6 +1303,11 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
} }
break; break;
} }
case RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME: { /* 18 */
bool flag = *(bool*)data;
// LOG_info("%i: RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME: %i\n", cmd, flag);
break;
}
case RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE: { /* 17 */ case RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE: { /* 17 */
bool *out = (bool *)data; bool *out = (bool *)data;
if (out) { if (out) {
@ -1316,6 +1316,10 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
} }
break; break;
} }
case RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK: { /* 21 */
// LOG_info("%i: RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK\n", cmd);
break;
}
case RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE: { /* 23 */ case RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE: { /* 23 */
struct retro_rumble_interface *iface = (struct retro_rumble_interface*)data; struct retro_rumble_interface *iface = (struct retro_rumble_interface*)data;
@ -2237,27 +2241,26 @@ static void selectScaler_AR(int width, int height, int pitch) {
if (screen_scaling==1) { if (screen_scaling==1) {
sprintf(scaler_name, "AR_%iX", scale); sprintf(scaler_name, "AR_%iX", scale);
if (core.aspect_ratio==FOUR_THREE) { if (core.aspect_ratio==FOUR_THREE) {
// puts("already 4:3"); // LOG_info("already 4:3\n");
} }
else if (core.aspect_ratio<FOUR_THREE) { else if (core.aspect_ratio<FOUR_THREE) {
// puts("pillarbox"); // LOG_info("pillarbox\n");
int tmp = CEIL_DIV(src_h, 3); target_w = CEIL_DIV(src_h, 3) * 4 * scale;
target_w = tmp * 4 * scale; target_h = src_h * scale;
target_h = tmp * 3 * scale;
if (target_h%2) target_h += 1;
} }
else { else {
// puts("letterbox"); // LOG_info("letterbox\n");
int tmp = CEIL_DIV(src_w, 4); target_w = src_w * scale;
target_w = tmp * 4 * scale; target_h = CEIL_DIV(src_w, 4) * 3 * scale;
target_h = tmp * 3 * scale;
if (target_h%2) target_h += 1;
} }
} }
else { else {
sprintf(scaler_name, "FS_%iX", scale); sprintf(scaler_name, "FS_%iX", scale);
} }
if (target_w%2) target_w += 1;
if (target_h%2) target_h += 1;
int dx = (target_w - dst_w) / 2; int dx = (target_w - dst_w) / 2;
int dy = (target_h - dst_h) / 2; int dy = (target_h - dst_h) / 2;
@ -2420,6 +2423,7 @@ void Core_getName(char* in_name, char* out_name) {
tmp[0] = '\0'; tmp[0] = '\0';
} }
void Core_open(const char* core_path, const char* tag_name) { void Core_open(const char* core_path, const char* tag_name) {
// LOG_info("Core_open\n");
core.handle = dlopen(core_path, RTLD_LAZY); core.handle = dlopen(core_path, RTLD_LAZY);
if (!core.handle) LOG_error("%s\n", dlerror()); if (!core.handle) LOG_error("%s\n", dlerror());
@ -2464,11 +2468,13 @@ void Core_open(const char* core_path, const char* tag_name) {
core.need_fullpath = info.need_fullpath; core.need_fullpath = info.need_fullpath;
LOG_info("core: %s version: %s tag: %s\n\t(valid_extensions: %s need_fullpath: %i)\n", core.name, core.version, core.tag, info.valid_extensions, info.need_fullpath); LOG_info("core: %s version: %s tag: %s (valid_extensions: %s need_fullpath: %i)\n", core.name, core.version, core.tag, info.valid_extensions, info.need_fullpath);
for (int i=0; overrides[i]; i++) { for (int i=0; overrides[i]; i++) {
// LOG_info("override: %s core: %s\n", overrides[i]->core_name, core.name);
if (!strcmp(overrides[i]->core_name, core.name)) { if (!strcmp(overrides[i]->core_name, core.name)) {
core.overrides = overrides[i]; core.overrides = overrides[i];
break;
} }
} }
@ -2487,10 +2493,12 @@ void Core_open(const char* core_path, const char* tag_name) {
set_input_state_callback(input_state_callback); set_input_state_callback(input_state_callback);
} }
void Core_init(void) { void Core_init(void) {
// LOG_info("Core_init\n");
core.init(); core.init();
core.initialized = 1; core.initialized = 1;
} }
void Core_load(void) { void Core_load(void) {
// LOG_info("Core_load\n");
struct retro_game_info game_info; struct retro_game_info game_info;
game_info.path = game.path; game_info.path = game.path;
game_info.data = game.data; game_info.data = game.data;
@ -3849,6 +3857,7 @@ int main(int argc , char* argv[]) {
Game_open(rom_path); Game_open(rom_path);
Core_load(); Core_load();
Input_init(NULL);
// restore configs // restore configs
Config_read(); Config_read();

18
src/minarch/overrides/fake-08.h Normal file
View file

@ -0,0 +1,18 @@
#include "overrides.h"
static CoreOverrides fake08_overrides = {
.core_name = "fake08",
.option_overrides = (OptionOverride[]){
{NULL,NULL},
},
.button_mapping = (ButtonMapping[]){
{"Up", RETRO_DEVICE_ID_JOYPAD_UP, BTN_ID_UP},
{"Down", RETRO_DEVICE_ID_JOYPAD_DOWN, BTN_ID_DOWN},
{"Left", RETRO_DEVICE_ID_JOYPAD_LEFT, BTN_ID_LEFT},
{"Right", RETRO_DEVICE_ID_JOYPAD_RIGHT, BTN_ID_RIGHT},
{"A Button", RETRO_DEVICE_ID_JOYPAD_A, BTN_ID_A},
{"B Button", RETRO_DEVICE_ID_JOYPAD_B, BTN_ID_B},
{"Start", RETRO_DEVICE_ID_JOYPAD_START, BTN_ID_START},
{NULL},
},
};