From 3a5d769d4ae1e23e3de151132d62c5987aa92ccd Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 2 Sep 2015 12:38:35 +0200 Subject: vo_opengl: remove redundant statement in PBO code This shouldn't be needed anymore. Textures are now always allocated with the exact size. Any padding (including non-NPOT support) is gone. The texture sizes will always match the memory plane sizes. Drop the unused and forgotten "npot" field from the option struct too. --- video/out/gl_video.c | 4 ---- video/out/gl_video.h | 1 - 2 files changed, 5 deletions(-) (limited to 'video') diff --git a/video/out/gl_video.c b/video/out/gl_video.c index b5edc28141..b864ad496c 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -2265,10 +2265,6 @@ static bool get_image(struct gl_video *p, struct mp_image *mpi) struct video_image *vimg = &p->image; - // See comments in init_video() about odd video sizes. - // The normal upload path does this too, but less explicit. - mp_image_set_size(mpi, vimg->planes[0].w, vimg->planes[0].h); - for (int n = 0; n < p->plane_count; n++) { struct texplane *plane = &vimg->planes[n]; mpi->stride[n] = mp_image_plane_w(mpi, n) * p->image_desc.bytes[n]; diff --git a/video/out/gl_video.h b/video/out/gl_video.h index 385477e051..ef6ed76554 100644 --- a/video/out/gl_video.h +++ b/video/out/gl_video.h @@ -54,7 +54,6 @@ struct gl_video_opts { float sigmoid_center; float sigmoid_slope; int scaler_resizes_only; - int npot; int pbo; int dither_depth; int dither_algo; -- cgit v1.2.3