diff options
-rw-r--r-- | video/out/gl_common.h | 7 | ||||
-rw-r--r-- | video/out/gl_video.c | 12 | ||||
-rw-r--r-- | video/out/gl_video.h | 1 | ||||
-rw-r--r-- | video/out/vo_opengl.c | 11 |
4 files changed, 0 insertions, 31 deletions
diff --git a/video/out/gl_common.h b/video/out/gl_common.h index feeb3e59f4..7a941d78eb 100644 --- a/video/out/gl_common.h +++ b/video/out/gl_common.h @@ -107,13 +107,6 @@ typedef struct MPGLContext { // version is not available, and newer versions are incompatible.) bool (*config_window)(struct MPGLContext *ctx, int flags); - // An optional function to register a resize callback in the backend that - // can be called on separate thread to handle resize events immediately - // (without waiting for vo_check_events, which will come later for the - // proper resize) - void (*register_resize_callback)(struct vo *vo, - void (*cb)(struct vo *vo, int w, int h)); - // Optional callback on the beginning of a frame. The frame will be finished // with swapGlBuffers(). This returns false if use of the OpenGL context // should be avoided. diff --git a/video/out/gl_video.c b/video/out/gl_video.c index 4ffb432372..6c5fab58a1 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -2690,18 +2690,6 @@ static int validate_window_opt(struct mp_log *log, const m_option_t *opt, return r; } - -// Resize and redraw the contents of the window without further configuration. -// Intended to be used in situations where the frontend can't really be -// involved with reconfiguring the VO properly. -// gl_video_resize() should be called when user interaction is done. -void gl_video_resize_redraw(struct gl_video *p, int w, int h) -{ - p->vp_w = w; - p->vp_h = h; - gl_video_render_frame(p, 0, NULL); -} - float gl_video_scale_ambient_lux(float lmin, float lmax, float rmin, float rmax, float lux) { diff --git a/video/out/gl_video.h b/video/out/gl_video.h index 77608760a3..d0896e671d 100644 --- a/video/out/gl_video.h +++ b/video/out/gl_video.h @@ -93,7 +93,6 @@ struct mp_csp_equalizer *gl_video_eq_ptr(struct gl_video *p); void gl_video_eq_update(struct gl_video *p); void gl_video_set_debug(struct gl_video *p, bool enable); -void gl_video_resize_redraw(struct gl_video *p, int w, int h); float gl_video_scale_ambient_lux(float lmin, float lmax, float rmin, float rmax, float lux); diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index 464a6055fe..5cd6dfa972 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -211,13 +211,6 @@ static int query_format(struct vo *vo, int format) return 1; } -static void video_resize_redraw_callback(struct vo *vo, int w, int h) -{ - struct gl_priv *p = vo->priv; - gl_video_resize_redraw(p->renderer, w, -h); - -} - static int reconfig(struct vo *vo, struct mp_image_params *params, int flags) { struct gl_priv *p = vo->priv; @@ -229,10 +222,6 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags) return -1; } - if (p->glctx->register_resize_callback) { - p->glctx->register_resize_callback(vo, video_resize_redraw_callback); - } - resize(p); gl_video_config(p->renderer, params); |