diff options
| author | wm4 <wm4@nowhere> | 2015-01-21 20:32:42 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-01-21 20:32:42 +0100 |
| commit | e34957940b5012dba23616469fb5aec56fcde5ee (patch) | |
| tree | 460acc027f1cdae8814992ec6f4a6f3a63de37c7 /video/out/gl_osd.h | |
| parent | c15697477fca133b69cad58ad2d43b94b994f6fd (diff) | |
| download | mpv-e34957940b5012dba23616469fb5aec56fcde5ee.tar.bz2 mpv-e34957940b5012dba23616469fb5aec56fcde5ee.tar.xz | |
vo_opengl: cleanups after vo_opengl_old removal
Don't load all the legacy functions (including ancient extensions).
Slightly simplify function loader and context creation, now that legacy
GL doesn't need to be handled. Remove the code for drawing OSD in legacy
mode.
Remove all the header hacks, which were meant for ancient OpenGL headers
which didn't even support things like OpenGL 1.3. Instead, adjust the
GLX check to make sure we get both OpenGL 3x and 2.1 symbols. For win32
and OSX, we assume that the user has the latest headers anyway. For
wayland, we hope that things somehow go right.
Diffstat (limited to 'video/out/gl_osd.h')
| -rw-r--r-- | video/out/gl_osd.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/video/out/gl_osd.h b/video/out/gl_osd.h index f05385b547..fce87bafe4 100644 --- a/video/out/gl_osd.h +++ b/video/out/gl_osd.h @@ -30,8 +30,7 @@ struct mpgl_osd { void *scratch; }; -struct mpgl_osd *mpgl_osd_init(GL *gl, struct mp_log *log, struct osd_state *osd, - bool legacy); +struct mpgl_osd *mpgl_osd_init(GL *gl, struct mp_log *log, struct osd_state *osd); void mpgl_osd_destroy(struct mpgl_osd *ctx); struct mpgl_osd_part *mpgl_osd_generate(struct mpgl_osd *ctx, @@ -40,7 +39,4 @@ struct mpgl_osd_part *mpgl_osd_generate(struct mpgl_osd *ctx, void mpgl_osd_set_gl_state(struct mpgl_osd *ctx, struct mpgl_osd_part *p); void mpgl_osd_unset_gl_state(struct mpgl_osd *ctx, struct mpgl_osd_part *p); -void mpgl_osd_draw_legacy(struct mpgl_osd *ctx, double pts, - struct mp_osd_res res); - #endif |