diff options
| author | wm4 <wm4@nowhere> | 2017-08-07 19:14:18 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-08-07 19:17:28 +0200 |
| commit | 47ea771b7a29b04e35276d38733f72970b4dd448 (patch) | |
| tree | 2a9f9c52acba9f662d62a290f739c502c6ca0ff8 /video/out/opengl/video.h | |
| parent | 1adf324d8b1261abfc02d905f98055991b29ac11 (diff) | |
| download | mpv-47ea771b7a29b04e35276d38733f72970b4dd448.tar.bz2 mpv-47ea771b7a29b04e35276d38733f72970b4dd448.tar.xz | |
vo_opengl: further GL API use separation
Move multiple GL-specific things from the renderer to other places like
vo_opengl.c, vo_opengl_cb.c, and ra_gl.c.
The vp_w/vp_h parameters to gl_video_resize() make no sense anymore, and
are implicitly part of struct fbodst.
Checking the main framebuffer depth is moved to vo_opengl.c. For
vo_opengl_cb.c it always assumes 8. The API user now has to override
this manually. The previous heuristic didn't make much sense anyway.
The only remaining dependency on GL is the hwdec stuff, which is harder
to change.
Diffstat (limited to 'video/out/opengl/video.h')
| -rw-r--r-- | video/out/opengl/video.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/video/out/opengl/video.h b/video/out/opengl/video.h index 8b6ca6e98f..db5837b12b 100644 --- a/video/out/opengl/video.h +++ b/video/out/opengl/video.h @@ -24,7 +24,6 @@ #include "sub/osd.h" #include "common.h" #include "utils.h" -#include "gl_utils.h" #include "lcms.h" #include "shader_cache.h" #include "video/out/filter_kernels.h" @@ -150,24 +149,25 @@ extern const struct m_sub_options gl_video_conf; struct gl_video; struct vo_frame; -struct gl_video *gl_video_init(GL *gl, struct mp_log *log, struct mpv_global *g); +struct gl_video *gl_video_init(struct ra *ra, struct mp_log *log, + struct mpv_global *g); void gl_video_uninit(struct gl_video *p); void gl_video_set_osd_source(struct gl_video *p, struct osd_state *osd); void gl_video_update_options(struct gl_video *p); bool gl_video_check_format(struct gl_video *p, int mp_format); void gl_video_config(struct gl_video *p, struct mp_image_params *params); void gl_video_set_output_depth(struct gl_video *p, int r, int g, int b); -void gl_video_render_frame(struct gl_video *p, struct vo_frame *frame, int fbo); -void gl_video_resize(struct gl_video *p, int vp_w, int vp_h, +void gl_video_render_frame(struct gl_video *p, struct vo_frame *frame, + struct fbodst target); +void gl_video_resize(struct gl_video *p, struct mp_rect *src, struct mp_rect *dst, struct mp_osd_res *osd); +void gl_video_set_fb_depth(struct gl_video *p, int fb_depth); void gl_video_perfdata(struct gl_video *p, struct voctrl_performance_data *out); struct mp_csp_equalizer; 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); - float gl_video_scale_ambient_lux(float lmin, float lmax, float rmin, float rmax, float lux); void gl_video_set_ambient_lux(struct gl_video *p, int lux); |