diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2013-07-08 18:07:54 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2013-07-08 18:07:54 +0200 |
| commit | 062b22b7cb0cc054c29e3616b0176a4530ed7bb0 (patch) | |
| tree | 341df319a80d7d249b9c65825874a2943c317223 /video/out/gl_video.c | |
| parent | 09d2dd7c3ab1cc650ede12f00affbba4b73b970b (diff) | |
| parent | ea7b920184a865a3343001318fc4a32dcfc7b4f5 (diff) | |
| download | mpv-062b22b7cb0cc054c29e3616b0176a4530ed7bb0.tar.bz2 mpv-062b22b7cb0cc054c29e3616b0176a4530ed7bb0.tar.xz | |
Merge remote-tracking branch 'origin/low_quality_intel_crap'
Conflicts:
video/out/gl_video_shaders.glsl
Diffstat (limited to 'video/out/gl_video.c')
| -rw-r--r-- | video/out/gl_video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c index bdca0a1ff4..4022d5fa8e 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -507,7 +507,7 @@ static void update_uniforms(struct gl_video *p, GLuint program) for (int n = 0; n < p->plane_count; n++) { char textures_n[32]; char textures_size_n[32]; - snprintf(textures_n, sizeof(textures_n), "textures[%d]", n); + snprintf(textures_n, sizeof(textures_n), "texture%d", n); snprintf(textures_size_n, sizeof(textures_size_n), "textures_size[%d]", n); gl->Uniform1i(gl->GetUniformLocation(program, textures_n), n); |