summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.xyz>2017-07-26 02:42:23 +0200
committerNiklas Haas <git@haasn.xyz>2017-07-26 02:42:23 +0200
commit5904eddb38f20bf794aadff659050c0b32479054 (patch)
tree370700a03831099fd960de60010d3667e12ae14a
parentb31020b193db24e175bce077755c2f3e814e57ff (diff)
downloadmpv-5904eddb38f20bf794aadff659050c0b32479054.tar.bz2
mpv-5904eddb38f20bf794aadff659050c0b32479054.tar.xz
vo_opengl: describe the texture uploading mode
Be a bit more transparent here, which is especially helpful when people are sending me screenshots of stats pages.
-rw-r--r--video/out/opengl/video.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c
index 9867751684..8724d5ff9e 100644
--- a/video/out/opengl/video.c
+++ b/video/out/opengl/video.c
@@ -3334,7 +3334,6 @@ static bool pass_upload_image(struct gl_video *p, struct mp_image *mpi, uint64_t
// Software decoding
assert(mpi->num_planes == p->plane_count);
- pass_describe(p, "upload frame (swdec)");
gl_timer_start(p->upload_timer);
for (int n = 0; n < p->plane_count; n++) {
struct texplane *plane = &vimg->planes[n];
@@ -3373,6 +3372,8 @@ static bool pass_upload_image(struct gl_video *p, struct mp_image *mpi, uint64_t
gl->BindTexture(plane->gl_target, 0);
}
gl_timer_stop(gl);
+ const char *mode = p->using_dr_path ? "DR" : p->opts.pbo ? "PBO" : "naive";
+ pass_describe(p, "upload frame (%s)", mode);
pass_record(p, gl_timer_measure(p->upload_timer));
return true;