From e76aa7e8dbb3da3a6f7ea8a20adb7ae70ef9a8e3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 23 May 2016 21:23:41 +0200 Subject: vo_opengl: rename glUploadTex, drop unused parameter Rename it to get out of OpenGL's namespace. The gl_ prefix is used by other mpv functions, but no OpenGL ones. The "slice" parameter was never actually used, and all callers passed 0 for it. --- video/out/opengl/video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'video/out/opengl/video.c') diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c index edf7c7d1f6..97c92b0ae8 100644 --- a/video/out/opengl/video.c +++ b/video/out/opengl/video.c @@ -2956,8 +2956,8 @@ static bool gl_video_upload_image(struct gl_video *p, struct mp_image *mpi) gl->BindBuffer(GL_PIXEL_UNPACK_BUFFER, plane->gl_buffer); gl->ActiveTexture(GL_TEXTURE0 + n); gl->BindTexture(plane->gl_target, plane->gl_texture); - glUploadTex(gl, plane->gl_target, plane->gl_format, plane->gl_type, - mpi->planes[n], mpi->stride[n], 0, 0, plane->w, plane->h, 0); + gl_upload_tex(gl, plane->gl_target, plane->gl_format, plane->gl_type, + mpi->planes[n], mpi->stride[n], 0, 0, plane->w, plane->h); } gl->ActiveTexture(GL_TEXTURE0); if (pbo) -- cgit v1.2.3