mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-11 06:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

add set_osd_msg to the threaded video driver

Browse Source
This commit is contained in:
aliaspider 2014-10-01 15:18:17 +01:00
parent 19372d5ce6
commit 5df633b577
1 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gfx/video_thread_wrapper.c
View File

@ -45,6 +45,7 @@ enum thread_cmd
CMD_POKE_GET_FBO_STATE, CMD_POKE_GET_FBO_STATE,
#endif #endif
CMD_POKE_SET_ASPECT_RATIO, CMD_POKE_SET_ASPECT_RATIO,
CMD_POKE_SET_OSD_MSG,
CMD_DUMMY = INT_MAX CMD_DUMMY = INT_MAX
}; };
@ -130,6 +131,13 @@ typedef struct thread_video
unsigned index; unsigned index;
bool smooth; bool smooth;
} filtering; } filtering;
struct
{
char msg[1024];
struct font_params params;
} osd_message;
} cmd_data; } cmd_data;
struct rarch_viewport vp; struct rarch_viewport vp;
@ -387,7 +395,15 @@ static void thread_loop(void *data)
thr->cmd_data.i); thr->cmd_data.i);
thread_reply(thr, CMD_POKE_SET_ASPECT_RATIO); thread_reply(thr, CMD_POKE_SET_ASPECT_RATIO);
break; break;
case CMD_POKE_SET_OSD_MSG:
if (thr->poke && thr->poke->set_osd_msg)
thr->poke->set_osd_msg(thr->driver_data,
thr->cmd_data.osd_message.msg,
&thr->cmd_data.osd_message.params);
thread_reply(thr, CMD_POKE_SET_OSD_MSG);
break;
case CMD_NONE: case CMD_NONE:
/* Never reply on no command. Possible deadlock if /* Never reply on no command. Possible deadlock if
* thread sends command right after frame update. */ * thread sends command right after frame update. */
@ -408,10 +424,12 @@ static void thread_loop(void *data)
bool focus = false; bool focus = false;
struct rarch_viewport vp = {0}; struct rarch_viewport vp = {0};
thr->frame.within_thread = true;
if (thr->driver && thr->driver->frame) if (thr->driver && thr->driver->frame)
ret = thr->driver->frame(thr->driver_data, ret = thr->driver->frame(thr->driver_data,
thr->frame.buffer, thr->frame.width, thr->frame.height, thr->frame.buffer, thr->frame.width, thr->frame.height,
thr->frame.pitch, *thr->frame.msg ? thr->frame.msg : NULL); thr->frame.pitch, *thr->frame.msg ? thr->frame.msg : NULL);
thr->frame.within_thread = false;
slock_unlock(thr->frame.lock); slock_unlock(thr->frame.lock);
@ -820,6 +838,23 @@ static void thread_set_texture_enable(void *data, bool state, bool full_screen)
} }
#endif #endif
static void thread_set_osd_msg(void *data, const char *msg, const struct font_params *params)
{
thread_video_t *thr = (thread_video_t*)data;
if (thr->frame.within_thread)
{
if (thr->poke && thr->poke->set_osd_msg)
thr->poke->set_osd_msg(thr->driver_data, msg, params);
}
else
{
strncpy(thr->cmd_data.osd_message.msg, msg, sizeof(thr->cmd_data.osd_message.msg));
thr->cmd_data.osd_message.params = *params;
thread_send_cmd(thr, CMD_POKE_SET_OSD_MSG);
thread_wait_reply(thr, CMD_POKE_SET_OSD_MSG);
}
}
static void thread_apply_state_changes(void *data) static void thread_apply_state_changes(void *data)
{ {
thread_video_t *thr = (thread_video_t*)data; thread_video_t *thr = (thread_video_t*)data;
@ -849,7 +884,7 @@ static const video_poke_interface_t thread_poke = {
thread_set_texture_enable, thread_set_texture_enable,
#endif #endif
NULL, thread_set_osd_msg,
NULL, NULL,
NULL, NULL,