diff --git a/src/gallium/frontends/va/buffer.c b/src/gallium/frontends/va/buffer.c index 48c99b1fd92..788834200ac 100644 --- a/src/gallium/frontends/va/buffer.c +++ b/src/gallium/frontends/va/buffer.c @@ -321,13 +321,9 @@ vlVaDestroyBuffer(VADriverContextP ctx, VABufferID buf_id) return VA_STATUS_ERROR_INVALID_BUFFER; } - if (buf->derived_surface.resource) { + if (buf->derived_surface.resource) pipe_resource_reference(&buf->derived_surface.resource, NULL); - if (buf->derived_image_buffer) - buf->derived_image_buffer->destroy(buf->derived_image_buffer); - } - if (buf->type == VAEncCodedBufferType) { VACodedBufferSegment* node = buf->data; while (node) { diff --git a/src/gallium/frontends/va/image.c b/src/gallium/frontends/va/image.c index b74ce8fe319..39768a030b7 100644 --- a/src/gallium/frontends/va/image.c +++ b/src/gallium/frontends/va/image.c @@ -254,7 +254,6 @@ vlVaDeriveImage(VADriverContextP ctx, VASurfaceID surface, VAImage *image) VAStatus status; struct pipe_screen *screen; struct pipe_resource *buf_resources[VL_NUM_COMPONENTS]; - struct pipe_video_buffer *new_buffer = NULL; int w; int h; int i; @@ -411,7 +410,6 @@ vlVaDeriveImage(VADriverContextP ctx, VASurfaceID surface, VAImage *image) img_buf->num_elements = 1; pipe_resource_reference(&img_buf->derived_surface.resource, buf_resources[0]); - img_buf->derived_image_buffer = new_buffer; if (surf->ctx) img_buf->derived_surface.entrypoint = surf->ctx->templat.entrypoint; diff --git a/src/gallium/frontends/va/va_private.h b/src/gallium/frontends/va/va_private.h index 3a3aebed073..6eb09b1248e 100644 --- a/src/gallium/frontends/va/va_private.h +++ b/src/gallium/frontends/va/va_private.h @@ -376,7 +376,6 @@ typedef struct { VABufferInfo export_state; unsigned int coded_size; struct pipe_enc_feedback_metadata extended_metadata; - struct pipe_video_buffer *derived_image_buffer; void *feedback; struct vlVaContext *ctx; struct vlVaSurface *coded_surf;