From 66079048eaebdb03caea81d610fd1457ceaaa507 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 23 May 2016 19:57:29 +0200 Subject: 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.) --- video/out/opengl/utils.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'video/out/opengl/utils.h') 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); -- cgit v1.2.3