Commit 0772a4cf authored by Laurent Aimar's avatar Laurent Aimar

Extended vout_display_opengl_Prepare() with a subpicture_t parameter.

It is not yet used.
parent 10e55d6d
......@@ -190,8 +190,7 @@ static void PictureRender (vout_display_t *vd, picture_t *pic, subpicture_t *sub
{
vout_display_sys_t *sys = vd->sys;
vout_display_opengl_Prepare (sys->vgl, pic);
(void)subpicture;
vout_display_opengl_Prepare (sys->vgl, pic, subpicture);
}
static void PictureDisplay (vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
......
......@@ -221,8 +221,7 @@ static void PictureRender(vout_display_t *vd, picture_t *pic, subpicture_t *subp
{
vout_display_sys_t *sys = vd->sys;
vout_display_opengl_Prepare( sys->vgl, pic );
(void)subpicture;
vout_display_opengl_Prepare( sys->vgl, pic, subpicture );
}
static void PictureDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
......
......@@ -267,8 +267,7 @@ static void PictureRender(vout_display_t *vd, picture_t *pic, subpicture_t *subp
vout_display_sys_t *sys = vd->sys;
vout_display_opengl_Prepare( sys->vgl, pic );
(void)subpicture;
vout_display_opengl_Prepare( sys->vgl, pic, subpicture );
}
static void PictureDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
......
......@@ -180,8 +180,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
{
vout_display_sys_t *sys = vd->sys;
vout_display_opengl_Prepare(sys->vgl, picture);
VLC_UNUSED(subpicture);
vout_display_opengl_Prepare(sys->vgl, picture, subpicture);
}
static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture)
......
......@@ -485,7 +485,7 @@ error:
}
int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
picture_t *picture)
picture_t *picture, subpicture_t *subpicture)
{
/* On Win32/GLX, we do this the usual way:
+ Fill the buffer with new content,
......@@ -524,6 +524,7 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
#endif
vlc_gl_Unlock(vgl->gl);
VLC_UNUSED(subpicture);
return VLC_SUCCESS;
}
......
......@@ -61,6 +61,6 @@ void vout_display_opengl_Delete(vout_display_opengl_t *vgl);
picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned);
int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
picture_t *picture);
picture_t *picture, subpicture_t *subpicture);
int vout_display_opengl_Display(vout_display_opengl_t *vgl,
const video_format_t *source);
......@@ -468,8 +468,7 @@ static void PictureRender (vout_display_t *vd, picture_t *pic, subpicture_t *sub
{
vout_display_sys_t *sys = vd->sys;
vout_display_opengl_Prepare (sys->vgl, pic);
(void)subpicture;
vout_display_opengl_Prepare (sys->vgl, pic, subpicture);
}
static void PictureDisplay (vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment