vo_gl, vo_gl3: honor global --vsync option

Both VOs will now by default try to set vsync according to the global
vsync setting. By default, vsync is enabled, and passing --no-vsync will
disable it.

The --vsync option used to matter for vo_vesa only, but that VO has been
removed.
This commit is contained in:
wm4 2012-07-29 19:04:27 +02:00
parent 614f847516
commit 3c98615069
3 changed files with 3 additions and 3 deletions

View File

@ -51,7 +51,7 @@ int xinerama_y;
int vo_nomouse_input = 0;
int vo_grabpointer = 1;
int vo_doublebuffering = 1;
int vo_vsync = 0;
int vo_vsync = 1;
int vo_fs = 0;
int vo_fsmode = 0;
float vo_panscan = 0.0f;

View File

@ -1194,7 +1194,7 @@ static int preinit(struct vo *vo, const char *arg)
.use_rectangle = -1,
.ati_hack = -1,
.force_pbo = -1,
.swap_interval = 1,
.swap_interval = vo_vsync,
.custom_prog = NULL,
.custom_tex = NULL,
.custom_tlin = 1,

View File

@ -2164,7 +2164,7 @@ static int preinit(struct vo *vo, const char *arg)
.colorspace = MP_CSP_DETAILS_DEFAULTS,
.use_npot = 1,
.use_pbo = 0,
.swap_interval = 1,
.swap_interval = vo_vsync,
.osd_color = 0xffffff,
.fbo_format = GL_RGB16,
.use_scale_sep = 1,