[Mesa-dev] [PATCH 1/2] st/va: Enable vaExportSurfaceHandle()

[Christian König]

Am 08.02.2018 um 00:10 schrieb Mark Thompson:
> It is present from libva 2.1 (VAAPI 1.1.0 or higher).
>
> Signed-off-by: Mark Thompson <sw at jkqxz.net>
> Acked-by: Christian König <christian.koenig at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com> for both.

Going to push those two now.

Thanks a lot for the help,
Christian.

> ---
> Retested with up-to-date stuff, including unmodified git libva now.  They have applied the version bump and it looks like 2.1 will actually be released soon (<https://github.com/intel/libva/releases/tag/2.1.0.pre1>), so it seems like it would be sensible to apply this now.
>
> Thanks,
>
> - Mark
>
>
>   src/gallium/state_trackers/va/context.c | 8 +++++++-
>   src/gallium/state_trackers/va/surface.c | 2 +-
>   2 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/state_trackers/va/context.c b/src/gallium/state_trackers/va/context.c
> index f567f544fd..189d361ff3 100644
> --- a/src/gallium/state_trackers/va/context.c
> +++ b/src/gallium/state_trackers/va/context.c
> @@ -89,7 +89,13 @@ static struct VADriverVTable vtable =
>      &vlVaQuerySurfaceAttributes,
>      &vlVaAcquireBufferHandle,
>      &vlVaReleaseBufferHandle,
> -#if 0
> +#if VA_CHECK_VERSION(1, 1, 0)
> +   NULL, /* vaCreateMFContext */
> +   NULL, /* vaMFAddContext */
> +   NULL, /* vaMFReleaseContext */
> +   NULL, /* vaMFSubmit */
> +   NULL, /* vaCreateBuffer2 */
> +   NULL, /* vaQueryProcessingRate */
>      &vlVaExportSurfaceHandle,
>   #endif
>   };
> diff --git a/src/gallium/state_trackers/va/surface.c b/src/gallium/state_trackers/va/surface.c
> index 9823232413..8604136944 100644
> --- a/src/gallium/state_trackers/va/surface.c
> +++ b/src/gallium/state_trackers/va/surface.c
> @@ -926,7 +926,7 @@ vlVaQueryVideoProcPipelineCaps(VADriverContextP ctx, VAContextID context,
>      return VA_STATUS_SUCCESS;
>   }
>   
> -#if 0
> +#if VA_CHECK_VERSION(1, 1, 0)
>   VAStatus
>   vlVaExportSurfaceHandle(VADriverContextP ctx,
>                           VASurfaceID surface_id,