Merge pull request #8312 from bparker06/overlay

gl: draw OSD on top of overlay
This commit is contained in:
Twinaphex 2019-02-18 10:38:55 +01:00 committed by GitHub
commit 905f67810c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2719,6 +2719,11 @@ static bool gl2_frame(void *data, const void *frame,
#endif
#endif
#ifdef HAVE_OVERLAY
if (gl->overlay_enable)
gl2_render_overlay(gl, video_info);
#endif
if (!string_is_empty(msg))
{
if (video_info->msg_bgcolor_enable)
@ -2726,11 +2731,6 @@ static bool gl2_frame(void *data, const void *frame,
font_driver_render_msg(video_info, NULL, msg, NULL);
}
#ifdef HAVE_OVERLAY
if (gl->overlay_enable)
gl2_render_overlay(gl, video_info);
#endif
video_info->cb_update_window_title(
video_info->context_data, video_info);