RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-27 09:32:40 +00:00
Code Issues Releases Wiki Activity

vo_opengl: move OSD rendering to separate function

Browse Source 
Also reindent the few lines that call into the actual renderer to remove
the "draw_osd" goto.
This commit is contained in:
wm4 2015-03-23 16:28:33 +01:00
parent 3f3d71b0a8
commit 67bdad9a43
1 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
video/out/gl_video.c
View File

@ -1836,46 +1836,8 @@ static void gl_video_interpolate_frame(struct gl_video *p, int fbo,
}
}
// (fbo==0 makes BindFramebuffer select the screen backbuffer)
void gl_video_render_frame(struct gl_video *p, int fbo, struct frame_timing *t)
static void draw_osd(struct gl_video *p)
{
GL *gl = p->gl;
struct video_image *vimg = &p->image;
struct mp_csp_params params;
mp_csp_copy_equalizer_values(&params, &p->video_eq);
p->user_gamma = 1.0 / (p->opts.gamma * params.gamma);
gl->BindFramebuffer(GL_FRAMEBUFFER, fbo);
if (!vimg->mpi || p->dst_rect.x0 > 0 || p->dst_rect.y0 > 0 ||
p->dst_rect.x1 < p->vp_w || p->dst_rect.y1 < abs(p->vp_h))
{
struct m_color c = p->opts.background;
gl->ClearColor(c.r / 255.0, c.g / 255.0, c.b / 255.0, c.a / 255.0);
gl->Clear(GL_COLOR_BUFFER_BIT);
}
if (!vimg->mpi)
goto draw_osd;
gl_sc_set_vao(p->sc, &p->vao);
if (p->opts.interpolation) {
gl_video_interpolate_frame(p, fbo, t);
} else {
// Skip interpolation if there's nothing to be done
pass_render_frame(p);
pass_draw_to_screen(p, fbo);
}
debug_check_gl(p, "after video rendering");
draw_osd:
gl->BindFramebuffer(GL_FRAMEBUFFER, fbo);
mpgl_osd_generate(p->osd, p->osd_rect, p->osd_pts, p->image_params.stereo_out);
for (int n = 0; n < MAX_OSD_PARTS; n++) {
@ -1915,6 +1877,46 @@ draw_osd:
}
debug_check_gl(p, "after OSD rendering");
}
// (fbo==0 makes BindFramebuffer select the screen backbuffer)
void gl_video_render_frame(struct gl_video *p, int fbo, struct frame_timing *t)
{
GL *gl = p->gl;
struct video_image *vimg = &p->image;
struct mp_csp_params params;
mp_csp_copy_equalizer_values(&params, &p->video_eq);
p->user_gamma = 1.0 / (p->opts.gamma * params.gamma);
gl->BindFramebuffer(GL_FRAMEBUFFER, fbo);
if (!vimg->mpi || p->dst_rect.x0 > 0 || p->dst_rect.y0 > 0 ||
p->dst_rect.x1 < p->vp_w || p->dst_rect.y1 < abs(p->vp_h))
{
struct m_color c = p->opts.background;
gl->ClearColor(c.r / 255.0, c.g / 255.0, c.b / 255.0, c.a / 255.0);
gl->Clear(GL_COLOR_BUFFER_BIT);
}
if (vimg->mpi) {
gl_sc_set_vao(p->sc, &p->vao);
if (p->opts.interpolation) {
gl_video_interpolate_frame(p, fbo, t);
} else {
// Skip interpolation if there's nothing to be done
pass_render_frame(p);
pass_draw_to_screen(p, fbo);
}
debug_check_gl(p, "after video rendering");
}
gl->BindFramebuffer(GL_FRAMEBUFFER, fbo);
draw_osd(p);
gl->UseProgram(0);
gl->BindFramebuffer(GL_FRAMEBUFFER, 0);