From d3dfffdf020e0c4de1159b45a69e938cb300a2e1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 22 Jul 2017 21:53:50 +0200 Subject: vo_opengl: osd: use new VAO mechanism In addition to using the new VAO mechanism introduced in the previous commit, this tries to keep the OSD code self-contained. This doesn't work all too well (because of the pass and CMS stuff), but it's still better than before. --- video/out/opengl/osd.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'video/out/opengl/osd.h') diff --git a/video/out/opengl/osd.h b/video/out/opengl/osd.h index 197bb72501..7ea851f8bf 100644 --- a/video/out/opengl/osd.h +++ b/video/out/opengl/osd.h @@ -15,9 +15,10 @@ void mpgl_osd_set_options(struct mpgl_osd *ctx, bool pbo); void mpgl_osd_generate(struct mpgl_osd *ctx, struct mp_osd_res res, double pts, int stereo_mode, int draw_flags); void mpgl_osd_resize(struct mpgl_osd *ctx, struct mp_osd_res res, int stereo_mode); -enum sub_bitmap_format mpgl_osd_get_part_format(struct mpgl_osd *ctx, int index); -GLuint mpgl_osd_get_part_texture(struct mpgl_osd *ctx, int index); -struct gl_vao *mpgl_osd_get_vao(struct mpgl_osd *ctx); +bool mpgl_osd_draw_prepare(struct mpgl_osd *ctx, int index, + struct gl_shader_cache *sc); +void mpgl_osd_draw_finish(struct mpgl_osd *ctx, int vp_w, int vp_h, int index, + struct gl_shader_cache *sc); void mpgl_osd_draw_part(struct mpgl_osd *ctx, int vp_w, int vp_h, int index); int64_t mpgl_get_change_counter(struct mpgl_osd *ctx); -- cgit v1.2.3