mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11324 from jdgleaver/overlay-fixes

Browse Source 
Miscellaneous overlay fixes
This commit is contained in:
Autechre 2020-09-11 18:52:19 +02:00 committed by GitHub
commit e6b3e21f5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/drivers/vulkan.c
View File

@ -2788,6 +2788,9 @@ static void vulkan_overlay_free(vk_t *vk)
vk->context->device, vk->context->device,
&vk->overlay.images[i]); &vk->overlay.images[i]);
if (vk->overlay.images)
free(vk->overlay.images);
memset(&vk->overlay, 0, sizeof(vk->overlay)); memset(&vk->overlay, 0, sizeof(vk->overlay));
} }

20
gfx/video_thread_wrapper.c
View File

@ -439,8 +439,6 @@ static bool video_thread_handle_packet(
case CMD_OVERLAY_LOAD: case CMD_OVERLAY_LOAD:
{ {
float *tmp_alpha_mod = NULL;
if (thr->overlay && thr->overlay->load) if (thr->overlay && thr->overlay->load)
ret = thr->overlay->load(thr->driver_data, ret = thr->overlay->load(thr->driver_data,
pkt.data.image.data, pkt.data.image.data,
@ -448,11 +446,21 @@ static bool video_thread_handle_packet(
pkt.data.b = ret; pkt.data.b = ret;
thr->alpha_mods = pkt.data.image.num; thr->alpha_mods = pkt.data.image.num;
tmp_alpha_mod = (float*)realloc(thr->alpha_mod,
thr->alpha_mods * sizeof(float));
if (tmp_alpha_mod) if (thr->alpha_mods > 0)
thr->alpha_mod = tmp_alpha_mod; {
float *tmp_alpha_mod = (float*)realloc(thr->alpha_mod,
thr->alpha_mods * sizeof(float));
if (tmp_alpha_mod)
thr->alpha_mod = tmp_alpha_mod;
}
else
{
if (thr->alpha_mod)
free(thr->alpha_mod);
thr->alpha_mod = NULL;
}
/* Avoid temporary garbage data. */ /* Avoid temporary garbage data. */
for (i = 0; i < thr->alpha_mods; i++) for (i = 0; i < thr->alpha_mods; i++)

4
retroarch.c
View File

@ -24368,7 +24368,9 @@ static int16_t input_state_device(
res = 1; res = 1;
/* Don't allow turbo for D-pad. */ /* Don't allow turbo for D-pad. */
if ((id < RETRO_DEVICE_ID_JOYPAD_UP || id > RETRO_DEVICE_ID_JOYPAD_RIGHT)) if ((id < RETRO_DEVICE_ID_JOYPAD_UP) ||
((id > RETRO_DEVICE_ID_JOYPAD_RIGHT) &&
(id <= RETRO_DEVICE_ID_JOYPAD_R3)))
{ {
/* /*
* Apply turbo button if activated. * Apply turbo button if activated.