RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-17 04:40:09 +00:00
Code Issues Releases Wiki Activity

vo_opengl: move UT_buffer to switch handling

Browse Source 
No reason to make it a special case.
This commit is contained in:
wm4 2016-05-17 10:48:05 +02:00
parent f00040b9fc
commit a2d58d9986
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
video/out/opengl/utils.c
View File

@ -749,11 +749,6 @@ static const char *vao_glsl_type(const struct gl_vao_entry *e)
// Assumes program is current (gl->UseProgram(program)). // Assumes program is current (gl->UseProgram(program)).
static void update_uniform(GL *gl, struct sc_entry *e, struct sc_uniform *u, int n) static void update_uniform(GL *gl, struct sc_entry *e, struct sc_uniform *u, int n)
{ {
if (u->type == UT_buffer) {
GLuint idx = gl->GetUniformBlockIndex(e->gl_shader, u->name);
gl->UniformBlockBinding(e->gl_shader, idx, u->v.buffer.binding);
return;
}
struct sc_cached_uniform *un = &e->uniforms[n]; struct sc_cached_uniform *un = &e->uniforms[n];
GLint loc = un->loc; GLint loc = un->loc;
if (loc < 0) if (loc < 0)
@ -789,6 +784,11 @@ static void update_uniform(GL *gl, struct sc_entry *e, struct sc_uniform *u, int
} }
} }
break; break;
case UT_buffer: {
GLuint idx = gl->GetUniformBlockIndex(e->gl_shader, u->name);
gl->UniformBlockBinding(e->gl_shader, idx, u->v.buffer.binding);
break;
}
default: default:
abort(); abort();
} }