From d890e0731c0a0c002c32e8be89130e178059d3ba Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 20 Jan 2017 13:38:28 +0100 Subject: options: refactor how --opengl-dcomposition is declared vo_opengl used to have it as sub-option, which made it very hard to pass down option values to backends in a generic way (even if these options were completely backend-specific). For --opengl-dcomposition we used a VOFLAG to deal with this. Fortunately, sub-options are gone, and we can just add it as global option. Move the option to context_angle.c and add it as global option. I thought about adding a mechanism to let backends declare options, which would get magically picked up my m_config instead of having to add them to the global option list manually (similar to VO vo_driver.options), but decided against this complexity just for 1 or 2 backends. Likewise, it could have been added as a single option to avoid the boilerplate of an option struct, but then again there are probably going to be more angle suboptions, and it's cleaner. --- video/out/opengl/context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'video/out/opengl/context.h') diff --git a/video/out/opengl/context.h b/video/out/opengl/context.h index d0588ddbd9..119bba0ba6 100644 --- a/video/out/opengl/context.h +++ b/video/out/opengl/context.h @@ -32,7 +32,6 @@ enum { VOFLAG_GL_DEBUG = 1 << 2, // Hint to request debug OpenGL context VOFLAG_ALPHA = 1 << 3, // Hint to request alpha framebuffer VOFLAG_SW = 1 << 4, // Hint to accept a software GL renderer - VOFLAG_ANGLE_DCOMP = 1 << 5, // Whether DirectComposition is allowed VOFLAG_PROBING = 1 << 6, // The backend is being auto-probed. }; @@ -78,6 +77,7 @@ typedef struct MPGLContext { GL *gl; struct vo *vo; const struct mpgl_driver *driver; + struct mpv_global *global; // For hwdec_vaegl.c. const char *native_display_type; -- cgit v1.2.3