[MPlayer-cvslog] r28843 - trunk/libvo/vo_gl.c

[reimar]

Author: reimar
Date: Fri Mar  6 11:53:30 2009
New Revision: 28843

Log:
Simplify EOSD code by rendering it in VOCTRL_DRAW_EOSD instead of genEOSD,
just like vo_vdpau.

Modified:
   trunk/libvo/vo_gl.c

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	Fri Mar  6 11:50:43 2009	(r28842)
+++ trunk/libvo/vo_gl.c	Fri Mar  6 11:53:30 2009	(r28843)
@@ -301,7 +301,7 @@ static void genEOSD(mp_eosd_images_t *im
   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 @@ skip_upload:
   }
   glEndList();
   BindTexture(gl_target, 0);
-call_render:
-  if (vo_doublebuffering) do_render_osd(2);
 }
 
 /**
@@ -1118,6 +1116,7 @@ static int control(uint32_t request, voi
     if (!data)
       return VO_FALSE;
     genEOSD(data);
+    if (vo_doublebuffering) do_render_osd(2);
     return VO_TRUE;
   case VOCTRL_GET_EOSD_RES:
     {