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_video.c | |
| 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_video.c')
| -rw-r--r-- | video/out/gl_video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c index 50be85d3fe..9aacf57ae9 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -1417,7 +1417,7 @@ static void recreate_osd(struct gl_video *p) { if (p->osd) mpgl_osd_destroy(p->osd); - p->osd = mpgl_osd_init(p->gl, p->log, p->osd_state, false); + p->osd = mpgl_osd_init(p->gl, p->log, p->osd_state); p->osd->use_pbo = p->opts.pbo; } @@ -2551,7 +2551,7 @@ void gl_video_set_output_depth(struct gl_video *p, int r, int g, int b) struct gl_video *gl_video_init(GL *gl, struct mp_log *log, struct osd_state *osd) { - if (!(gl->mpgl_caps & MPGL_CAP_GL21)) { + if (gl->version < 210 && gl->es < 200) { mp_err(log, "At least OpenGL 2.1 or OpenGL ES 2.0 required.\n"); return NULL; } |