diff options
| author | wm4 <wm4@nowhere> | 2016-05-23 19:57:29 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-05-23 21:27:18 +0200 |
| commit | 66079048eaebdb03caea81d610fd1457ceaaa507 (patch) | |
| tree | df657c0c3446df45040ba276d68b47674834dad6 /video/out/opengl/utils.h | |
| parent | 049e3ccb6551ad37beb091c72a9ef70920cdea80 (diff) | |
| download | mpv-66079048eaebdb03caea81d610fd1457ceaaa507.tar.bz2 mpv-66079048eaebdb03caea81d610fd1457ceaaa507.tar.xz | |
vo_opengl: unify PBO and normal OSD texture upload path
The main change is actually that e first copy to a "staging" memory
frame, and then upload this at once. The old non-PBO code called
glTexsubImage2D for each OSD sub-bitmap.
The new non-PBO code path is a bit faster now if there are many small
sub-bitmaps (on Linux/nVidia). It's also a bit simpler, so this is a
win.
(Although I don't particularly appreciate the mixed normal/PBO texture
code.)
Diffstat (limited to 'video/out/opengl/utils.h')
| -rw-r--r-- | video/out/opengl/utils.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/video/out/opengl/utils.h b/video/out/opengl/utils.h index 569ec0f23c..ef1cc8bbc0 100644 --- a/video/out/opengl/utils.h +++ b/video/out/opengl/utils.h @@ -29,8 +29,6 @@ void glCheckError(GL *gl, struct mp_log *log, const char *info); void glUploadTex(GL *gl, GLenum target, GLenum format, GLenum type, const void *dataptr, int stride, int x, int y, int w, int h, int slice); -void glClearTex(GL *gl, GLenum target, GLenum format, GLenum type, - int x, int y, int w, int h, uint8_t val, void **scratch); mp_image_t *glGetWindowScreenshot(GL *gl); |