[Scummvm-git-logs] scummvm master -> 6fa7403b8b1b6e18e3a3d02120b38aad6a73ad26
spleen1981
noreply at scummvm.org
Mon Feb 12 22:14:24 UTC 2024
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1acd07483a LIBRETRO: remove unused vars
d3ecd6c184 LIBRETRO: fix condition for playlist separator
3904a7dd15 LIBRETRO: add process_key_event_wrapper
6fa7403b8b LIBRETRO: BUILD: add -rdynamic for debug builds
Commit: 1acd07483a25bd9fb3d69331aebc18df6bbb3c15
https://github.com/scummvm/scummvm/commit/1acd07483a25bd9fb3d69331aebc18df6bbb3c15
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2024-02-12T23:12:22+01:00
Commit Message:
LIBRETRO: remove unused vars
Changed paths:
backends/platform/libretro/src/libretro-core.cpp
backends/platform/libretro/src/libretro-mapper.cpp
backends/platform/libretro/src/libretro-os-inputs.cpp
diff --git a/backends/platform/libretro/src/libretro-core.cpp b/backends/platform/libretro/src/libretro-core.cpp
index 5645bfd178d..a1f68df97af 100644
--- a/backends/platform/libretro/src/libretro-core.cpp
+++ b/backends/platform/libretro/src/libretro-core.cpp
@@ -221,7 +221,6 @@ void retro_osd_notification(const char *msg) {
static void update_variables(void) {
struct retro_variable var;
updating_variables = true;
- const char *osd_msg = "";
var.key = "scummvm_gamepad_cursor_only";
var.value = NULL;
@@ -1019,7 +1018,6 @@ void retro_run(void) {
environ_cb(RETRO_ENVIRONMENT_GET_AUDIO_VIDEO_ENABLE, &audio_video_enable);
bool skip_frame = false;
- size_t samples_count = 0;
if (g_system) {
diff --git a/backends/platform/libretro/src/libretro-mapper.cpp b/backends/platform/libretro/src/libretro-mapper.cpp
index b0602b2406a..b694523c7ac 100644
--- a/backends/platform/libretro/src/libretro-mapper.cpp
+++ b/backends/platform/libretro/src/libretro-mapper.cpp
@@ -33,7 +33,6 @@ void mapper_poll_device(void) {
//Get current status
mapper_digital_buttons_status = 0;
- bool bitmasks = false;
// Store real digital buttons status
if (retro_get_input_bitmask_supported())
mapper_digital_buttons_status = retro_input_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_MASK);
diff --git a/backends/platform/libretro/src/libretro-os-inputs.cpp b/backends/platform/libretro/src/libretro-os-inputs.cpp
index 669261d4b54..329bf6b516f 100644
--- a/backends/platform/libretro/src/libretro-os-inputs.cpp
+++ b/backends/platform/libretro/src/libretro-os-inputs.cpp
@@ -113,9 +113,7 @@ void OSystem_libretro::getMouseXYFromButton(bool is_x, int16 sign) {
void OSystem_libretro::processInputs(void) {
int16 x, y;
- float analog_amplitude_x, analog_amplitude_y;
float deltaAcc;
- bool down;
int key_modifiers [3][2] = {{RETROKE_SHIFT_MOD, RETROKMOD_SHIFT}, {RETROKE_CTRL_MOD, RETROKMOD_CTRL}, {RETROKE_ALT_MOD, RETROKMOD_ALT}};
int key_flags = 0;
int retropad_value = 0;
Commit: d3ecd6c18409b8eb84e6ec62df4c32c54719c1ca
https://github.com/scummvm/scummvm/commit/d3ecd6c18409b8eb84e6ec62df4c32c54719c1ca
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2024-02-12T23:12:56+01:00
Commit Message:
LIBRETRO: fix condition for playlist separator
Changed paths:
backends/platform/libretro/src/libretro-options-widget.cpp
diff --git a/backends/platform/libretro/src/libretro-options-widget.cpp b/backends/platform/libretro/src/libretro-options-widget.cpp
index a7ccf6f8da4..0e76c7005b4 100644
--- a/backends/platform/libretro/src/libretro-options-widget.cpp
+++ b/backends/platform/libretro/src/libretro-options-widget.cpp
@@ -194,7 +194,7 @@ bool LibretroOptionsWidget::generatePlaylist(Common::String playlistPath) {
filestream_printf(playlistFile, playlistElement.c_str(), separator, hookFilePath.c_str(), title.c_str());
- if (isFirstEntry && !ConfMan.getInt("libretro_playlist_version", _domain) == kPlaylistFormat6lines) {
+ if (isFirstEntry && ConfMan.getInt("libretro_playlist_version", _domain) != kPlaylistFormat6lines) {
*separator = ',';
isFirstEntry = false;
}
Commit: 3904a7dd15c353730e6b139a404c4e92a41f411d
https://github.com/scummvm/scummvm/commit/3904a7dd15c353730e6b139a404c4e92a41f411d
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2024-02-12T23:13:23+01:00
Commit Message:
LIBRETRO: add process_key_event_wrapper
Changed paths:
backends/platform/libretro/include/libretro-os.h
backends/platform/libretro/src/libretro-core.cpp
backends/platform/libretro/src/libretro-os-events.cpp
diff --git a/backends/platform/libretro/include/libretro-os.h b/backends/platform/libretro/include/libretro-os.h
index 32c05607c95..d9891b9244b 100644
--- a/backends/platform/libretro/include/libretro-os.h
+++ b/backends/platform/libretro/include/libretro-os.h
@@ -82,7 +82,7 @@ private:
Common::String s_systemDir;
Common::String s_saveDir;
Common::String s_playlistDir;
- static Common::List<Common::Event> _events;
+ Common::List<Common::Event> _events;
public:
Audio::MixerImpl *_mixer;
@@ -177,7 +177,7 @@ private:
/* Inputs */
public:
void processInputs(void);
- static void processKeyEvent(bool down, unsigned keycode, uint32 character, uint16 key_modifiers);
+ void processKeyEvent(bool down, unsigned keycode, uint32 character, uint16 key_modifiers);
void setShakePos(int shakeXOffset, int shakeYOffset) override {}
private:
void updateMouseXY(float deltaAcc, float * cumulativeXYAcc, int doing_x);
diff --git a/backends/platform/libretro/src/libretro-core.cpp b/backends/platform/libretro/src/libretro-core.cpp
index a1f68df97af..884acd59099 100644
--- a/backends/platform/libretro/src/libretro-core.cpp
+++ b/backends/platform/libretro/src/libretro-core.cpp
@@ -110,6 +110,11 @@ static bool updating_variables = false;
static int opt_frameskip_threshold_display = 0;
static int opt_frameskip_no_display = 0;
+
+void process_key_event_wrapper(bool down, unsigned keycode, uint32_t character, uint16_t key_modifiers) {
+ LIBRETRO_G_SYSTEM->processKeyEvent(down, keycode, character, key_modifiers);
+}
+
static void log_scummvm_exit_code(void) {
if (retro_get_scummvm_res() == Common::kNoError)
retro_log_cb(RETRO_LOG_INFO, "ScummVM exited successfully.\n");
@@ -830,7 +835,7 @@ void retro_init(void) {
retro_log_cb(RETRO_LOG_INFO, "Frontend supports RGB565 -will use that instead of XRGB1555.\n");
#endif
- retro_keyboard_callback cb = {LIBRETRO_G_SYSTEM->processKeyEvent};
+ retro_keyboard_callback cb = {process_key_event_wrapper};
environ_cb(RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK, &cb);
if (environ_cb(RETRO_ENVIRONMENT_GET_INPUT_BITMASKS, NULL))
diff --git a/backends/platform/libretro/src/libretro-os-events.cpp b/backends/platform/libretro/src/libretro-os-events.cpp
index 1a573a703f6..cde74dfc401 100644
--- a/backends/platform/libretro/src/libretro-os-events.cpp
+++ b/backends/platform/libretro/src/libretro-os-events.cpp
@@ -26,8 +26,6 @@
#include "backends/platform/libretro/include/libretro-os.h"
#include "backends/platform/libretro/include/libretro-timer.h"
-Common::List<Common::Event> OSystem_libretro::_events;
-
bool OSystem_libretro::pollEvent(Common::Event &event) {
_threadSwitchCaller = THREAD_SWITCH_POLL;
((LibretroTimerManager *)_timerManager)->checkThread();
Commit: 6fa7403b8b1b6e18e3a3d02120b38aad6a73ad26
https://github.com/scummvm/scummvm/commit/6fa7403b8b1b6e18e3a3d02120b38aad6a73ad26
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2024-02-12T23:13:53+01:00
Commit Message:
LIBRETRO: BUILD: add -rdynamic for debug builds
Changed paths:
backends/platform/libretro/Makefile.common
diff --git a/backends/platform/libretro/Makefile.common b/backends/platform/libretro/Makefile.common
index 308bde8f444..f6ca4615829 100644
--- a/backends/platform/libretro/Makefile.common
+++ b/backends/platform/libretro/Makefile.common
@@ -106,7 +106,7 @@ else
endif
ifeq ($(DEBUG), 1)
- DEFINES += -O0 -g -DLIBRETRO_DEBUG -DDEBUG_BUILD
+ DEFINES += -O0 -g -rdynamic -DLIBRETRO_DEBUG -DDEBUG_BUILD
else
DEFINES += -DDISABLE_TEXT_CONSOLE -DRELEASE_BUILD
endif
More information about the Scummvm-git-logs
mailing list