Commit 5f641225 authored by Daniel Vetter's avatar Daniel Vetter

libXvMC: drop get_surface_status driver callback

It's unused. Also drop all related generic code that tries to do
clever stuff with this callback. These are all remnants from a
pre-gem world.
Signed-off-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6c44ce9e
......@@ -1282,23 +1282,6 @@ static int i915_xvmc_mc_render_surface(Display * display, XvMCContext * context,
return 0;
}
static int i915_xvmc_mc_get_surface_status(Display * display,
XvMCSurface * surface, int *stat)
{
i915XvMCContext *pI915XvMC;
struct intel_xvmc_surface *intel_surf;
if (!display || !surface || !stat)
return BadValue;
*stat = 0;
if (!(intel_surf = surface->privData))
return XvMCBadSurface;
return 0;
}
struct _intel_xvmc_driver i915_xvmc_mc_driver = {
.type = XVMC_I915_MPEG2_MC,
.num_ctx = 0,
......@@ -1308,5 +1291,4 @@ struct _intel_xvmc_driver i915_xvmc_mc_driver = {
.create_surface = i915_xvmc_mc_create_surface,
.destroy_surface = i915_xvmc_mc_destroy_surface,
.render_surface = i915_xvmc_mc_render_surface,
.get_surface_status = i915_xvmc_mc_get_surface_status,
};
......@@ -877,13 +877,6 @@ static Status render_surface(Display * display,
return Success;
}
static Status get_surface_status(Display * display,
XvMCSurface * surface, int *stats)
{
*stats = 0;
return 0;
}
static Status create_context(Display * display, XvMCContext * context,
int priv_count, CARD32 * priv_data)
{
......@@ -908,5 +901,4 @@ struct _intel_xvmc_driver i965_xvmc_mc_driver = {
.create_surface = create_surface,
.destroy_surface = destroy_surface,
.render_surface = render_surface,
.get_surface_status = get_surface_status,
};
......@@ -742,10 +742,6 @@ _X_EXPORT Status XvMCSyncSurface(Display * display, XvMCSurface * surface)
if (!display || !surface)
return XvMCBadSurface;
do {
ret = XvMCGetSurfaceStatus(display, surface, &stat);
} while (!ret && (stat & XVMC_RENDERING));
return ret;
}
......@@ -763,6 +759,7 @@ _X_EXPORT Status XvMCFlushSurface(Display * display, XvMCSurface * surface)
{
if (!display || !surface)
return XvMCBadSurface;
return Success;
}
......@@ -781,16 +778,10 @@ _X_EXPORT Status XvMCFlushSurface(Display * display, XvMCSurface * surface)
_X_EXPORT Status XvMCGetSurfaceStatus(Display * display, XvMCSurface * surface,
int *stat)
{
Status ret;
if (!display || !surface || !stat)
return XvMCBadSurface;
ret = (xvmc_driver->get_surface_status) (display, surface, stat);
if (ret) {
XVMC_ERR("get surface status fail\n");
return ret;
}
*stat = 0;
return Success;
}
......@@ -812,21 +803,7 @@ _X_EXPORT Status XvMCHideSurface(Display * display, XvMCSurface * surface)
if (!display || !surface)
return XvMCBadSurface;
XvMCSyncSurface(display, surface);
/*
Get the status of the surface, if it is not currently displayed
we don't need to worry about it.
*/
if ((ret = XvMCGetSurfaceStatus(display, surface, &stat)) != Success)
return ret;
if (!(stat & XVMC_DISPLAYING))
return Success;
/* FIXME: */
XVMC_ERR("XvMCHideSurface not implemented!\n");
return BadValue;
return Success;
}
/*
......
......@@ -186,9 +186,6 @@ typedef struct _intel_xvmc_driver {
XvMCMacroBlockArray * macroblock_array,
XvMCBlockArray * blocks);
Status(*get_surface_status) (Display * display, XvMCSurface * surface,
int *stat);
Status(*begin_surface) (Display * display, XvMCContext * context,
XvMCSurface * target_surface,
XvMCSurface * past_surface,
......
......@@ -660,13 +660,6 @@ static Status load_qmatrix(Display * display, XvMCContext * context,
return Success;
}
static Status get_surface_status(Display * display, XvMCSurface * surface,
int *status)
{
*status = 0;
return Success;
}
static Status vld_state(const XvMCMpegControl * control)
{
struct brw_vld_state tmp, *vld = &tmp;
......@@ -1253,7 +1246,6 @@ struct _intel_xvmc_driver xvmc_vld_driver = {
.create_surface = create_surface,
.destroy_surface = destroy_surface,
.load_qmatrix = load_qmatrix,
.get_surface_status = get_surface_status,
.begin_surface = begin_surface,
.render_surface = render_surface,
.put_slice = put_slice,
......
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