diff options
| author | wm4 <wm4@nowhere> | 2016-05-23 21:25:43 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-05-23 21:27:18 +0200 |
| commit | c4707cdee66ebb3023ed97e033df7c68d147c17d (patch) | |
| tree | f555f44f6c2b699641d0af8f7ec6684e2b3efc2b /video/out/opengl/utils.c | |
| parent | e76aa7e8dbb3da3a6f7ea8a20adb7ae70ef9a8e3 (diff) | |
| download | mpv-c4707cdee66ebb3023ed97e033df7c68d147c17d.tar.bz2 mpv-c4707cdee66ebb3023ed97e033df7c68d147c17d.tar.xz | |
vo_opengl: fix other minor namespace issues
See previous commit.
Diffstat (limited to 'video/out/opengl/utils.c')
| -rw-r--r-- | video/out/opengl/utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/video/out/opengl/utils.c b/video/out/opengl/utils.c index afc768b0d2..3d41f0693c 100644 --- a/video/out/opengl/utils.c +++ b/video/out/opengl/utils.c @@ -40,7 +40,7 @@ static const char *gl_error_to_string(GLenum error) } } -void glCheckError(GL *gl, struct mp_log *log, const char *info) +void gl_check_error(GL *gl, struct mp_log *log, const char *info) { for (;;) { GLenum error = gl->GetError(); @@ -100,7 +100,7 @@ void gl_upload_tex(GL *gl, GLenum target, GLenum format, GLenum type, gl->PixelStorei(GL_UNPACK_ALIGNMENT, 4); } -mp_image_t *glGetWindowScreenshot(GL *gl) +mp_image_t *gl_read_window_contents(GL *gl) { if (gl->es) return NULL; // ES can't read from front buffer @@ -307,7 +307,7 @@ bool fbotex_change(struct fbotex *fbo, GL *gl, struct mp_log *log, int w, int h, fbotex_set_filter(fbo, filter ? filter : GL_LINEAR); - glCheckError(gl, log, "after creating framebuffer texture"); + gl_check_error(gl, log, "after creating framebuffer texture"); gl->BindFramebuffer(GL_FRAMEBUFFER, fbo->fbo); gl->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, @@ -322,7 +322,7 @@ bool fbotex_change(struct fbotex *fbo, GL *gl, struct mp_log *log, int w, int h, gl->BindFramebuffer(GL_FRAMEBUFFER, 0); - glCheckError(gl, log, "after creating framebuffer"); + gl_check_error(gl, log, "after creating framebuffer"); return res; } |