Remove context from vaSyncSurface

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

diff --git a/dummy_drv_video/dummy_drv_video.c b/dummy_drv_video/dummy_drv_video.c
index fe4055d..1a9d7c1 100644 (file)
--- 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 (file)
--- 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;
 }
 

diff --git a/src/va.c b/src/va.c
index dbd750c..dbfcd31 100644 (file)
--- a/src/va.c
+++ b/src/va.c
@@ -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 (

diff --git a/src/va.h b/src/va.h
index 32eab56..874049f 100644 (file)
--- a/src/va.h
+++ b/src/va.h
@@ -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 (file)
--- 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 (file)
--- 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,