diff options
| author | wm4 <wm4@nowhere> | 2017-08-05 13:48:46 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-08-05 13:48:46 +0200 |
| commit | f72a33d2cb223df921967cfe7ae203f882ba6921 (patch) | |
| tree | 3571ef752f95e42488bc80de5343d2287a94cbdb /video/out/opengl/ra_gl.c | |
| parent | dd096863fa00f1c0c9268932a46ddc321122f552 (diff) | |
| download | mpv-f72a33d2cb223df921967cfe7ae203f882ba6921.tar.bz2 mpv-f72a33d2cb223df921967cfe7ae203f882ba6921.tar.xz | |
vo_opengl: organize ra PBO flag slightly differently
Instead of having a mutable ra_tex field (and the only one), move the
flag to struct ra, since we have only 2 tex_upload user calls anyway,
and both want the same PBO behavior. (At first I considered making it
a RA_TEX_UPLOAD_ flag, but why bother. PBOs are a terribly GL-specific
thing, so we can't expect a reasonable abstraction of it anyway.)
Diffstat (limited to 'video/out/opengl/ra_gl.c')
| -rw-r--r-- | video/out/opengl/ra_gl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/opengl/ra_gl.c b/video/out/opengl/ra_gl.c index 411adddec6..e1ecd337e4 100644 --- a/video/out/opengl/ra_gl.c +++ b/video/out/opengl/ra_gl.c @@ -338,7 +338,7 @@ static void gl_tex_upload(struct ra *ra, struct ra_tex *tex, case 2: if (!rc) rc = &full; - gl_pbo_upload_tex(&tex_gl->pbo, gl, tex->use_pbo && !buf, + gl_pbo_upload_tex(&tex_gl->pbo, gl, ra->use_pbo && !buf, tex_gl->target, tex_gl->format, tex_gl->type, tex->params.w, tex->params.h, src, stride, rc->x0, rc->y0, rc->x1 - rc->x0, rc->y1 - rc->y0); |