Commit 69218cc1 authored by Daniel Vetter's avatar Daniel Vetter

XvMC: unify subpicture functions

The XvMC driver api in the server is insane. Even for optional stuff
like subpicture support it doesn't check for NULL-pointers. So we
have to retain some dummy functions.

Wonder how many copies of these things exist on fdo ...
Signed-off-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5d104e9c
......@@ -231,15 +231,6 @@ static int i915_xvmc_create_surface(ScrnInfoPtr scrn, XvMCSurfacePtr pSurf,
return Success;
}
static int i915_xvmc_create_subpict(ScrnInfoPtr scrn, XvMCSubpicturePtr pSubp,
int *num_priv, long **priv)
{
*priv = NULL;
*num_priv = 0;
return Success;
}
static void i915_xvmc_destroy_context(ScrnInfoPtr scrn,
XvMCContextPtr pContext)
{
......@@ -251,10 +242,14 @@ static void i915_xvmc_destroy_surface(ScrnInfoPtr scrn, XvMCSurfacePtr pSurf)
return;
}
static void i915_xvmc_destroy_subpict(ScrnInfoPtr scrn,
XvMCSubpicturePtr pSubp)
static int create_subpicture(ScrnInfoPtr scrn, XvMCSubpicturePtr subpicture,
int *num_priv, CARD32 ** priv)
{
return Success;
}
static void destroy_subpicture(ScrnInfoPtr scrn, XvMCSubpicturePtr subpicture)
{
return;
}
/* Fill in the device dependent adaptor record.
......@@ -278,10 +273,8 @@ static XF86MCAdaptorRec pAdapt = {
(xf86XvMCCreateSurfaceProcPtr) i915_xvmc_create_surface,
.DestroySurface =
(xf86XvMCDestroySurfaceProcPtr) i915_xvmc_destroy_surface,
.CreateSubpicture =
(xf86XvMCCreateSubpictureProcPtr) i915_xvmc_create_subpict,
.DestroySubpicture =
(xf86XvMCDestroySubpictureProcPtr) i915_xvmc_destroy_subpict,
.CreateSubpicture = create_subpicture,
.DestroySubpicture = destroy_subpicture,
};
/* new xvmc driver interface */
......@@ -389,16 +382,6 @@ static void destory_surface(ScrnInfoPtr scrn, XvMCSurfacePtr surface)
Xfree(priv_surface);
}
static int create_subpicture(ScrnInfoPtr scrn, XvMCSubpicturePtr subpicture,
int *num_priv, CARD32 ** priv)
{
return Success;
}
static void destroy_subpicture(ScrnInfoPtr scrn, XvMCSubpicturePtr subpicture)
{
}
static XF86MCSurfaceInfoRec yv12_mpeg2_vld_surface = {
FOURCC_YV12,
XVMC_CHROMA_FORMAT_420,
......
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