Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-04-02 10:51:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash on Pixelbook

Browse source 
AMotionEvent_getAxisValue is a weak symbol and we need
to check for its presence before calling it.
This commit is contained in:
Vladimir Serbinenko 2020-01-28 15:03:16 +01:00
parent f72e127f5f
commit e290e9193d
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
input/drivers/android_input.c
View file

@ -673,7 +673,7 @@ static INLINE void android_mouse_calculate_deltas(android_input_t *android,
{ {
/* Adjust mouse speed based on ratio /* Adjust mouse speed based on ratio
* between core resolution and system resolution */ * between core resolution and system resolution */
float x, y; float x = 0, y = 0;
float x_scale = 1; float x_scale = 1;
float y_scale = 1; float y_scale = 1;
struct retro_system_av_info *av_info = video_viewport_get_system_av_info(); struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
@ -687,15 +687,18 @@ static INLINE void android_mouse_calculate_deltas(android_input_t *android,
} }
/* This axis is only available on Android Nougat and on Android devices with NVIDIA extensions */ /* This axis is only available on Android Nougat and on Android devices with NVIDIA extensions */
x = AMotionEvent_getAxisValue(event,AMOTION_EVENT_AXIS_RELATIVE_X, motion_ptr); if (AMotionEvent_getAxisValue)
y = AMotionEvent_getAxisValue(event,AMOTION_EVENT_AXIS_RELATIVE_Y, motion_ptr); {
x = AMotionEvent_getAxisValue(event,AMOTION_EVENT_AXIS_RELATIVE_X, motion_ptr);
y = AMotionEvent_getAxisValue(event,AMOTION_EVENT_AXIS_RELATIVE_Y, motion_ptr);
}
/* If AXIS_RELATIVE had 0 values it might be because we're not running Android Nougat or on a device /* If AXIS_RELATIVE had 0 values it might be because we're not running Android Nougat or on a device
* with NVIDIA extension, so re-calculate deltas based on AXIS_X and AXIS_Y. This has limitations * with NVIDIA extension, so re-calculate deltas based on AXIS_X and AXIS_Y. This has limitations
* compared to AXIS_RELATIVE because once the Android mouse cursor hits the edge of the screen it is * compared to AXIS_RELATIVE because once the Android mouse cursor hits the edge of the screen it is
* not possible to move the in-game mouse any further in that direction. * not possible to move the in-game mouse any further in that direction.
*/ */
if (!x && !y) if (!x && !y && AMotionEvent_getX && AMotionEvent_getX)
{ {
x = (AMotionEvent_getX(event, motion_ptr) - android->mouse_x_prev); x = (AMotionEvent_getX(event, motion_ptr) - android->mouse_x_prev);
y = (AMotionEvent_getY(event, motion_ptr) - android->mouse_y_prev); y = (AMotionEvent_getY(event, motion_ptr) - android->mouse_y_prev);