From 1d1299f8a41edbf6373222eda5708af5a5390d3c Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Fri, 15 Sep 2017 22:23:03 -0400 Subject: [PATCH] st/va: make internal func vlVaHandleSurfaceAllocate() call simpler MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Acked-by: Christian König --- src/gallium/state_trackers/va/picture.c | 2 +- src/gallium/state_trackers/va/surface.c | 7 ++----- src/gallium/state_trackers/va/va_private.h | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/state_trackers/va/picture.c index 81bd196ce00..5e794652a69 100644 --- a/src/gallium/state_trackers/va/picture.c +++ b/src/gallium/state_trackers/va/picture.c @@ -662,7 +662,7 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id) if (realloc) { struct pipe_video_buffer *old_buf = surf->buffer; - if (vlVaHandleSurfaceAllocate(ctx, surf, &surf->templat) != VA_STATUS_SUCCESS) { + if (vlVaHandleSurfaceAllocate(drv, surf, &surf->templat) != VA_STATUS_SUCCESS) { mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_ALLOCATION_FAILED; } diff --git a/src/gallium/state_trackers/va/surface.c b/src/gallium/state_trackers/va/surface.c index 67773cf76a4..643cdcd54ab 100644 --- a/src/gallium/state_trackers/va/surface.c +++ b/src/gallium/state_trackers/va/surface.c @@ -557,15 +557,12 @@ suface_from_external_memory(VADriverContextP ctx, vlVaSurface *surface, } VAStatus -vlVaHandleSurfaceAllocate(VADriverContextP ctx, vlVaSurface *surface, +vlVaHandleSurfaceAllocate(vlVaDriver *drv, vlVaSurface *surface, struct pipe_video_buffer *templat) { - vlVaDriver *drv; struct pipe_surface **surfaces; unsigned i; - drv = VL_VA_DRIVER(ctx); - surface->buffer = drv->pipe->create_video_buffer(drv->pipe, templat); if (!surface->buffer) return VA_STATUS_ERROR_ALLOCATION_FAILED; @@ -730,7 +727,7 @@ vlVaCreateSurfaces2(VADriverContextP ctx, unsigned int format, !(memory_attibute->flags & VA_SURFACE_EXTBUF_DESC_ENABLE_TILING)) templat.bind = PIPE_BIND_LINEAR | PIPE_BIND_SHARED; - vaStatus = vlVaHandleSurfaceAllocate(ctx, surf, &templat); + vaStatus = vlVaHandleSurfaceAllocate(drv, surf, &templat); if (vaStatus != VA_STATUS_SUCCESS) goto free_surf; break; diff --git a/src/gallium/state_trackers/va/va_private.h b/src/gallium/state_trackers/va/va_private.h index 5b1b832bb00..61712ce913e 100644 --- a/src/gallium/state_trackers/va/va_private.h +++ b/src/gallium/state_trackers/va/va_private.h @@ -404,7 +404,7 @@ VAStatus vlVaQueryVideoProcPipelineCaps(VADriverContextP ctx, VAContextID contex // internal functions VAStatus vlVaHandleVAProcPipelineParameterBufferType(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *buf); -VAStatus vlVaHandleSurfaceAllocate(VADriverContextP ctx, vlVaSurface *surface, struct pipe_video_buffer *templat); +VAStatus vlVaHandleSurfaceAllocate(vlVaDriver *drv, vlVaSurface *surface, struct pipe_video_buffer *templat); void vlVaGetReferenceFrame(vlVaDriver *drv, VASurfaceID surface_id, struct pipe_video_buffer **ref_frame); void vlVaHandlePictureParameterBufferMPEG12(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *buf); void vlVaHandleIQMatrixBufferMPEG12(vlVaContext *context, vlVaBuffer *buf); -- 2.30.2