diff options
author | Austin Yuan <shengquan.yuan@intel.com> | 2009-08-28 17:25:21 +0800 |
---|---|---|
committer | Austin Yuan <shengquan.yuan@intel.com> | 2009-08-28 17:25:21 +0800 |
commit | 2822d025263d516bd619c8bbe1d17ff4c1bd1af2 (patch) | |
tree | 38813736dc6a94c5f0284807dbe754a74b21f9c9 | |
parent | e2a24f0189561cc4feaf00d0b48f22947704ae56 (diff) | |
download | libva-2822d025263d516bd619c8bbe1d17ff4c1bd1af2.tar.gz |
Remove context from vaSyncSurface
Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>
-rw-r--r-- | dummy_drv_video/dummy_drv_video.c | 8 | ||||
-rw-r--r-- | i965_drv_video/i965_drv_video.c | 6 | ||||
-rw-r--r-- | src/va.c | 3 | ||||
-rw-r--r-- | src/va.h | 1 | ||||
-rw-r--r-- | src/va_backend.h | 1 | ||||
-rw-r--r-- | test/test_12.c | 2 |
6 files changed, 2 insertions, 19 deletions
diff --git a/dummy_drv_video/dummy_drv_video.c b/dummy_drv_video/dummy_drv_video.c index fe4055d..1a9d7c1 100644 --- a/dummy_drv_video/dummy_drv_video.c +++ b/dummy_drv_video/dummy_drv_video.c @@ -1005,24 +1005,16 @@ VAStatus dummy_EndPicture( VAStatus dummy_SyncSurface( VADriverContextP ctx, - VAContextID context, VASurfaceID render_target ) { INIT_DRIVER_DATA VAStatus vaStatus = VA_STATUS_SUCCESS; - object_context_p obj_context; object_surface_p obj_surface; - obj_context = CONTEXT(context); - ASSERT(obj_context); - obj_surface = SURFACE(render_target); ASSERT(obj_surface); - /* Assume that this shouldn't be called before vaEndPicture() */ - ASSERT( obj_context->current_render_target != obj_surface->base.id ); - return vaStatus; } diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c index 5a50bf1..caf7f62 100644 --- a/i965_drv_video/i965_drv_video.c +++ b/i965_drv_video/i965_drv_video.c @@ -995,19 +995,13 @@ i965_EndPicture(VADriverContextP ctx, VAContextID context) VAStatus i965_SyncSurface(VADriverContextP ctx, - VAContextID context, VASurfaceID render_target) { struct i965_driver_data *i965 = i965_driver_data(ctx); - struct object_context *obj_context = CONTEXT(context); struct object_surface *obj_surface = SURFACE(render_target); - assert(obj_context); assert(obj_surface); - /* Assume that this shouldn't be called before vaEndPicture() */ - assert(obj_context->decode_state.current_render_target != render_target); - return VA_STATUS_SUCCESS; } @@ -709,7 +709,6 @@ VAStatus vaEndPicture ( VAStatus vaSyncSurface ( VADisplay dpy, - VAContextID context, VASurfaceID render_target ) { @@ -718,7 +717,7 @@ VAStatus vaSyncSurface ( ctx = CTX(dpy); TRACE(vaSyncSurface); - return ctx->vtable.vaSyncSurface( ctx, context, render_target ); + return ctx->vtable.vaSyncSurface( ctx, render_target ); } VAStatus vaQuerySurfaceStatus ( @@ -1244,7 +1244,6 @@ Synchronization */ VAStatus vaSyncSurface ( VADisplay dpy, - VAContextID context, VASurfaceID render_target ); diff --git a/src/va_backend.h b/src/va_backend.h index fcf34e2..6f858f5 100644 --- a/src/va_backend.h +++ b/src/va_backend.h @@ -175,7 +175,6 @@ struct VADriverVTable VAStatus (*vaSyncSurface) ( VADriverContextP ctx, - VAContextID context, VASurfaceID render_target ); diff --git a/test/test_12.c b/test/test_12.c index 3c82476..c9e4db9 100644 --- a/test/test_12.c +++ b/test/test_12.c @@ -222,7 +222,7 @@ void test() va_status = vaEndPicture(va_dpy,vaContext); ASSERT( VA_STATUS_SUCCESS == va_status ); - va_status = vaSyncSurface(va_dpy, vaContext, vaSurface); + va_status = vaSyncSurface(va_dpy, vaSurface); ASSERT( VA_STATUS_SUCCESS == va_status ); win = XCreateSimpleWindow(dpy, RootWindow(dpy, 0), 0, 0, |