mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

vo_opengl: glBindBufferBase is not part of GL 2.1/GLES 2.0

Browse Source 
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.
This commit is contained in:
wm4 2015-11-06 13:59:33 +01:00
parent 945df57357
commit cfa4952f7c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
video/out/opengl/common.c
View File

@ -104,7 +104,6 @@ static const struct gl_functions gl_functions[] = {
DEF_FN(AttachShader), DEF_FN(AttachShader),
DEF_FN(BindAttribLocation), DEF_FN(BindAttribLocation),
DEF_FN(BindBuffer), DEF_FN(BindBuffer),
DEF_FN(BindBufferBase),
DEF_FN(BindTexture), DEF_FN(BindTexture),
DEF_FN(BlendFuncSeparate), DEF_FN(BlendFuncSeparate),
DEF_FN(BufferData), DEF_FN(BufferData),
@ -174,6 +173,7 @@ static const struct gl_functions gl_functions[] = {
.ver_core = 300, .ver_core = 300,
.ver_es_core = 300, .ver_es_core = 300,
.functions = (const struct gl_function[]) { .functions = (const struct gl_function[]) {
DEF_FN(BindBufferBase),
DEF_FN(GetStringi), DEF_FN(GetStringi),
// for ES 3.0 // for ES 3.0
DEF_FN(GetTexLevelParameteriv), DEF_FN(GetTexLevelParameteriv),

2
video/out/opengl/video.c
View File

@ -2422,7 +2422,7 @@ static void check_gl_features(struct gl_video *p)
if (p->opts.prescale == 2) { if (p->opts.prescale == 2) {
if (p->opts.nnedi3_opts->upload == NNEDI3_UPLOAD_UBO) { if (p->opts.nnedi3_opts->upload == NNEDI3_UPLOAD_UBO) {
// Check features for uniform buffer objects. // 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"); MP_WARN(p, "Disabling NNEDI3 (OpenGL 3.1 required).\n");
p->opts.prescale = 0; p->opts.prescale = 0;
} }