changeset 28808:49aaf6f7052b

Simplify EOSD code by rendering it in VOCTRL_DRAW_EOSD instead of genEOSD, just like vo_vdpau.
author reimar
date Fri, 06 Mar 2009 10:53:30 +0000
parents 338065cac802
children 5de88e6e2494
files libvo/vo_gl.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_gl.c	Fri Mar 06 10:50:43 2009 +0000
+++ b/libvo/vo_gl.c	Fri Mar 06 10:53:30 2009 +0000
@@ -301,7 +301,7 @@
   ass_image_t *i;
 
   if (imgs->changed == 0) // there are elements, but they are unchanged
-      goto call_render;
+      return;
   if (img && imgs->changed == 1) // there are elements, but they just moved
       goto skip_upload;
 
@@ -386,8 +386,6 @@
   }
   glEndList();
   BindTexture(gl_target, 0);
-call_render:
-  if (vo_doublebuffering) do_render_osd(2);
 }
 
 /**
@@ -1118,6 +1116,7 @@
     if (!data)
       return VO_FALSE;
     genEOSD(data);
+    if (vo_doublebuffering) do_render_osd(2);
     return VO_TRUE;
   case VOCTRL_GET_EOSD_RES:
     {