summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-11-07 21:29:38 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-11-07 21:29:38 +0000
commit4acdc86503ee35fe61f6a8403450e80e9b4da197 (patch)
tree3e41952e4167e6f210a6cda8018d4c7405ff232a /libvo
parentefb84bce97953bed5732669435bcd279cd34c22e (diff)
downloadmpv-4acdc86503ee35fe61f6a8403450e80e9b4da197.tar.bz2
mpv-4acdc86503ee35fe61f6a8403450e80e9b4da197.tar.xz
do not call glFinish when we do not have a context
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16945 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/gl_common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c
index 1f0a354a93..d6a3a153ad 100644
--- a/libvo/gl_common.c
+++ b/libvo/gl_common.c
@@ -959,6 +959,7 @@ int setGlWindow(int *vinfo, HGLRC *context, HWND win)
// should only be needed when keeping context, but not doing glFinish
// can cause flickering even when we do not keep it.
+ if (*context)
glFinish();
new_vinfo = GetPixelFormat(windc);
if (*context && *vinfo && new_vinfo && *vinfo == new_vinfo) {
@@ -1071,6 +1072,7 @@ int setGlWindow(XVisualInfo **vinfo, GLXContext *context, Window win)
// should only be needed when keeping context, but not doing glFinish
// can cause flickering even when we do not keep it.
+ if (*context)
glFinish();
new_vinfo = getWindowVisualInfo(win);
if (*context && *vinfo && new_vinfo &&