diff options
| author | wm4 <wm4@nowhere> | 2015-11-06 13:59:33 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-11-06 13:59:33 +0100 |
| commit | cfa4952f7cf424157eed60e30291336922776d53 (patch) | |
| tree | d5669fb18e596867c2e74aa43fe9f55e293b9dff | |
| parent | 945df5735783fedd85318f2c0bb45bd3ace8f9c3 (diff) | |
| download | mpv-cfa4952f7cf424157eed60e30291336922776d53.tar.bz2 mpv-cfa4952f7cf424157eed60e30291336922776d53.tar.xz | |
vo_opengl: glBindBufferBase is not part of GL 2.1/GLES 2.0
Commit 27dc834f added it as such.
Also remove the check for glUniformBlockBinding() - it's part of an
extension, and the check glGetUniformBlockIndex() already checks whether
the extension is fully available.
| -rw-r--r-- | video/out/opengl/common.c | 2 | ||||
| -rw-r--r-- | video/out/opengl/video.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c index 194c5d59a1..3022922d82 100644 --- a/video/out/opengl/common.c +++ b/video/out/opengl/common.c @@ -104,7 +104,6 @@ static const struct gl_functions gl_functions[] = { DEF_FN(AttachShader), DEF_FN(BindAttribLocation), DEF_FN(BindBuffer), - DEF_FN(BindBufferBase), DEF_FN(BindTexture), DEF_FN(BlendFuncSeparate), DEF_FN(BufferData), @@ -174,6 +173,7 @@ static const struct gl_functions gl_functions[] = { .ver_core = 300, .ver_es_core = 300, .functions = (const struct gl_function[]) { + DEF_FN(BindBufferBase), DEF_FN(GetStringi), // for ES 3.0 DEF_FN(GetTexLevelParameteriv), diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c index cd638ccd5e..d69d58f5e3 100644 --- a/video/out/opengl/video.c +++ b/video/out/opengl/video.c @@ -2422,7 +2422,7 @@ static void check_gl_features(struct gl_video *p) if (p->opts.prescale == 2) { if (p->opts.nnedi3_opts->upload == NNEDI3_UPLOAD_UBO) { // Check features for uniform buffer objects. - if (!p->gl->GetUniformBlockIndex || !p->gl->UniformBlockBinding) { + if (!p->gl->BindBufferBase || !p->gl->GetUniformBlockIndex) { MP_WARN(p, "Disabling NNEDI3 (OpenGL 3.1 required).\n"); p->opts.prescale = 0; } |