mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-23 23:33:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow some libretro core options to be changed during execution

Browse source
This commit is contained in:
刘皓 2025-05-11 18:54:56 -04:00
parent 3fda80275d
commit f57568e051
No known key found for this signature in database
GPG key ID: 7901753DB465B711
6 changed files with 124 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/audio/sharedmidistate.h
View file

@ -26,6 +26,10 @@
#include "debugwriter.h"
#include "fluid-fun.h"
#ifdef MKXPZ_RETRO
# include "core.h"
#endif // MKXPZ_RETRO
#include <assert.h>
#include <vector>
#include <string>
@ -93,8 +97,8 @@ struct SharedMidiState
flSettings = fluid.new_settings();
fluid.settings_setnum(flSettings, "synth.gain", 1.0f);
fluid.settings_setnum(flSettings, "synth.sample-rate", SYNTH_SAMPLERATE);
fluid.settings_setint(flSettings, "synth.chorus.active", conf.midi.chorus);
fluid.settings_setint(flSettings, "synth.reverb.active", conf.midi.reverb);
fluid.settings_setint(flSettings, "synth.chorus.active", mkxp_retro::midi_chorus_override == 1 || (mkxp_retro::midi_chorus_override != 0 && conf.midi.chorus));
fluid.settings_setint(flSettings, "synth.reverb.active", mkxp_retro::midi_reverb_override == 1 || (mkxp_retro::midi_reverb_override != 0 && conf.midi.reverb));
extern const uint8_t mkxp_gmgsx_sf2[];
extern const size_t mkxp_gmgsx_sf2_len;

115
src/core.cpp
View file

@ -215,6 +215,7 @@ static const struct retro_core_option_v2_definition core_option_definitions[] =
" If there are a lot of sounds playing at the same time"
" and audibly cutting each other off, try increasing"
" this number."
" Changes will take effect after the core is reset."
" (if this value is also set in the game's mkxp.json,"
" the maximum of the value set here and the value in"
" mkxp.json will be used)"
@ -463,6 +464,7 @@ static std::mutex threaded_audio_mutex;
static bool threaded_audio_enabled = false;
static bool frame_time_callback_enabled = false;
static struct atomic<bool> shared_state_initialized(false);
static std::string previous_frame_skip_value;
namespace mkxp_retro {
retro_log_printf_t log_printf;
@ -476,6 +478,11 @@ namespace mkxp_retro {
bool keyboard_state[RETROK_LAST];
bool input_polled;
uint8_t sub_image_fix_override;
uint8_t enable_blitting_override;
uint8_t midi_chorus_override;
uint8_t midi_reverb_override;
uint64_t get_ticks_ms() noexcept {
return frame_time / 1000;
}
@ -663,6 +670,7 @@ static bool init_sandbox() {
{
const char *value = get_core_option("mkxp-z_frameSkip");
previous_frame_skip_value = value;
if (!std::strcmp(value, "enabled")) {
conf->frameSkip = true;
} else if (!std::strcmp(value, "disabled")) {
@ -673,11 +681,13 @@ static bool init_sandbox() {
{
const char *value = get_core_option("mkxp-z_subImageFix");
if (!std::strcmp(value, "default")) {
conf->subImageFix = hw_render.context_type == RETRO_HW_CONTEXT_OPENGLES2 || hw_render.context_type == RETRO_HW_CONTEXT_OPENGLES3 || hw_render.context_type == RETRO_HW_CONTEXT_OPENGLES_VERSION;
sub_image_fix_override = hw_render.context_type == RETRO_HW_CONTEXT_OPENGLES2 || hw_render.context_type == RETRO_HW_CONTEXT_OPENGLES3 || hw_render.context_type == RETRO_HW_CONTEXT_OPENGLES_VERSION ? 1 : 0;
} else if (!std::strcmp(value, "enabled")) {
conf->subImageFix = true;
sub_image_fix_override = 1;
} else if (!std::strcmp(value, "disabled")) {
conf->subImageFix = false;
sub_image_fix_override = 0;
} else {
sub_image_fix_override = -1;
}
}
@ -685,32 +695,38 @@ static bool init_sandbox() {
const char *value = get_core_option("mkxp-z_enableBlitting");
if (!std::strcmp(value, "default")) {
#ifdef _WIN32
conf->enableBlitting = false;
enable_blitting_override = 0;
#else
conf->enableBlitting = true;
enable_blitting_override = 1;
#endif // _WIN32
} else if (!std::strcmp(value, "enabled")) {
conf->enableBlitting = true;
enable_blitting_override = 1;
} else if (!std::strcmp(value, "disabled")) {
conf->enableBlitting = false;
enable_blitting_override = 0;
} else {
enable_blitting_override = -1;
}
}
{
const char *value = get_core_option("mkxp-z_midiChorus");
if (!std::strcmp(value, "enabled")) {
conf->midi.chorus = true;
midi_chorus_override = 1;
} else if (!std::strcmp(value, "disabled")) {
conf->midi.chorus = false;
midi_chorus_override = 0;
} else {
midi_chorus_override = -1;
}
}
{
const char *value = get_core_option("mkxp-z_midiReverb");
if (!std::strcmp(value, "enabled")) {
conf->midi.reverb = true;
midi_reverb_override = 1;
} else if (!std::strcmp(value, "disabled")) {
conf->midi.reverb = false;
midi_reverb_override = 0;
} else {
midi_reverb_override = -1;
}
}
@ -1058,6 +1074,83 @@ extern "C" RETRO_API void retro_run() {
glState.reset();
}
{
bool core_options_updated;
if (environment(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &core_options_updated) && core_options_updated) {
{
const char *value = get_core_option("mkxp-z_frameSkip");
if (previous_frame_skip_value != value) {
previous_frame_skip_value = value;
if (!std::strcmp(value, "enabled")) {
shState->graphics().setFrameskip(true);
} else if (!std::strcmp(value, "disabled")) {
shState->graphics().setFrameskip(false);
}
}
}
{
const char *value = get_core_option("mkxp-z_subImageFix");
if (!std::strcmp(value, "default")) {
sub_image_fix_override = hw_render.context_type == RETRO_HW_CONTEXT_OPENGLES2 || hw_render.context_type == RETRO_HW_CONTEXT_OPENGLES3 || hw_render.context_type == RETRO_HW_CONTEXT_OPENGLES_VERSION ? 1 : 0;
} else if (!std::strcmp(value, "enabled")) {
sub_image_fix_override = 1;
} else if (!std::strcmp(value, "disabled")) {
sub_image_fix_override = 0;
} else {
sub_image_fix_override = -1;
}
}
{
const char *value = get_core_option("mkxp-z_enableBlitting");
if (!std::strcmp(value, "default")) {
#ifdef _WIN32
enable_blitting_override = 0;
#else
enable_blitting_override = 1;
#endif // _WIN32
} else if (!std::strcmp(value, "enabled")) {
enable_blitting_override = 1;
} else if (!std::strcmp(value, "disabled")) {
enable_blitting_override = 0;
} else {
enable_blitting_override = -1;
}
}
{
const char *value = get_core_option("mkxp-z_midiChorus");
if (!std::strcmp(value, "enabled")) {
midi_chorus_override = true;
if (shState->midiState().inited) {
fluid.settings_setint(shState->midiState().flSettings, "synth.chorus.active", midi_chorus_override == 1 || (midi_chorus_override != 0 && conf->midi.chorus));
}
} else if (!std::strcmp(value, "disabled")) {
midi_chorus_override = false;
if (shState->midiState().inited) {
fluid.settings_setint(shState->midiState().flSettings, "synth.chorus.active", midi_chorus_override == 1 || (midi_chorus_override != 0 && conf->midi.chorus));
}
}
}
{
const char *value = get_core_option("mkxp-z_midiReverb");
if (!std::strcmp(value, "enabled")) {
midi_reverb_override = true;
if (shState->midiState().inited) {
fluid.settings_setint(shState->midiState().flSettings, "synth.reverb.active", midi_reverb_override == 1 || (midi_reverb_override != 0 && conf->midi.reverb));
}
} else if (!std::strcmp(value, "disabled")) {
midi_reverb_override = false;
if (shState->midiState().inited) {
fluid.settings_setint(shState->midiState().flSettings, "synth.reverb.active", midi_reverb_override == 1 || (midi_reverb_override != 0 && conf->midi.reverb));
}
}
}
}
}
if (should_render) {
if (sb().run<struct main>()) {
deinit_sandbox();

5
src/core.h
View file

@ -45,6 +45,11 @@ namespace mkxp_retro {
extern bool keyboard_state[RETROK_LAST];
extern bool input_polled;
extern uint8_t sub_image_fix_override;
extern uint8_t enable_blitting_override;
extern uint8_t midi_chorus_override;
extern uint8_t midi_reverb_override;
uint64_t get_ticks_ms() noexcept;
uint64_t get_ticks_us() noexcept;
double get_refresh_rate() noexcept;

4
src/display/bitmap.cpp
View file

@ -1263,7 +1263,11 @@ void Bitmap::stretchBlt(IntRect destRect,
if (srcSurf)
{
SDL_Rect srcRect = sourceRect;
#ifdef MKXPZ_RETRO
bool subImageFix = mkxp_retro::sub_image_fix_override == 1 || (mkxp_retro::sub_image_fix_override != 0 && shState->config().subImageFix);
#else
bool subImageFix = shState->config().subImageFix;
#endif // MKXPZ_RETRO
bool srcRectTooBig = srcRect.w > glState.caps.maxTexSize ||
srcRect.h > glState.caps.maxTexSize;
bool srcSurfTooBig = !unpack_subimage && (

2
src/display/gl/gl-meta.cpp
View file

@ -144,7 +144,7 @@ void vaoUnbind(VAO &vao)
}
#ifdef MKXPZ_RETRO
# define HAVE_NATIVE_BLIT gl.BlitFramebuffer
# define HAVE_NATIVE_BLIT (gl.BlitFramebuffer && (mkxp_retro::enable_blitting_override == 1 || (mkxp_retro::enable_blitting_override != 0 && shState->config().enableBlitting)))
#else
# define HAVE_NATIVE_BLIT (gl.BlitFramebuffer && shState->config().smoothScaling <= Bilinear && shState->config().smoothScalingDown <= Bilinear)
#endif // MKXPZ_RETRO

4
src/display/tilemap.cpp
View file

@ -605,7 +605,11 @@ struct TilemapPrivate
/* Mega surface tileset */
SDL_Surface *tsSurf = tileset->megaSurface();
#ifdef MKXPZ_RETRO
if (mkxp_retro::sub_image_fix_override == 1 || (mkxp_retro::sub_image_fix_override != 0 && shState->config().subImageFix))
#else
if (shState->config().subImageFix)
#endif // MKXPZ_RETRO
{
/* Implementation for broken GL drivers */
FBO::bind(atlas.gl.fbo);