From 5aa1604a6c53d150ca647f2dc3a6129bc68ac74e Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 16 Jul 2018 14:06:26 +0200 Subject: [PATCH] tree: add the driver_data parameter to the BUFFER macro as well The BUFFER macro takes an implicit driver_data argument. In order to make it obvious that we need it, let's put it as an explicit parameter. Signed-off-by: Maxime Ripard --- src/buffer.c | 12 ++++++------ src/buffer.h | 2 +- src/image.c | 2 +- src/picture.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index dac5708..e13b8a3 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -64,7 +64,7 @@ VAStatus SunxiCedrusCreateBuffer(VADriverContextP context, } id = object_heap_allocate(&driver_data->buffer_heap); - buffer_object = BUFFER(id); + buffer_object = BUFFER(driver_data, id); if (buffer_object == NULL) { status = VA_STATUS_ERROR_ALLOCATION_FAILED; goto error; @@ -105,7 +105,7 @@ VAStatus SunxiCedrusDestroyBuffer(VADriverContextP context, (struct sunxi_cedrus_driver_data *) context->pDriverData; struct object_buffer *buffer_object; - buffer_object = BUFFER(buffer_id); + buffer_object = BUFFER(driver_data, buffer_id); if (buffer_object == NULL) return VA_STATUS_ERROR_INVALID_BUFFER; @@ -124,7 +124,7 @@ VAStatus SunxiCedrusMapBuffer(VADriverContextP context, VABufferID buffer_id, (struct sunxi_cedrus_driver_data *) context->pDriverData; struct object_buffer *buffer_object; - buffer_object = BUFFER(buffer_id); + buffer_object = BUFFER(driver_data, buffer_id); if (buffer_object == NULL || buffer_object->data == NULL) return VA_STATUS_ERROR_INVALID_BUFFER; @@ -140,7 +140,7 @@ VAStatus SunxiCedrusUnmapBuffer(VADriverContextP context, VABufferID buffer_id) (struct sunxi_cedrus_driver_data *) context->pDriverData; struct object_buffer *buffer_object; - buffer_object = BUFFER(buffer_id); + buffer_object = BUFFER(driver_data, buffer_id); if (buffer_object == NULL || buffer_object->data == NULL) return VA_STATUS_ERROR_INVALID_BUFFER; @@ -156,7 +156,7 @@ VAStatus SunxiCedrusBufferSetNumElements(VADriverContextP context, (struct sunxi_cedrus_driver_data *) context->pDriverData; struct object_buffer *buffer_object; - buffer_object = BUFFER(buffer_id); + buffer_object = BUFFER(driver_data, buffer_id); if (buffer_object == NULL) return VA_STATUS_ERROR_INVALID_BUFFER; @@ -175,7 +175,7 @@ VAStatus SunxiCedrusBufferInfo(VADriverContextP context, VABufferID buffer_id, (struct sunxi_cedrus_driver_data *) context->pDriverData; struct object_buffer *buffer_object; - buffer_object = BUFFER(buffer_id); + buffer_object = BUFFER(driver_data, buffer_id); if (buffer_object == NULL) return VA_STATUS_ERROR_INVALID_BUFFER; diff --git a/src/buffer.h b/src/buffer.h index 620a0d7..108b8b2 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -31,7 +31,7 @@ #include "object_heap.h" #include "sunxi_cedrus.h" -#define BUFFER(id) ((struct object_buffer *) object_heap_lookup(&driver_data->buffer_heap, id)) +#define BUFFER(data, id) ((struct object_buffer *) object_heap_lookup(&(data)->buffer_heap, id)) #define BUFFER_ID_OFFSET 0x08000000 struct object_buffer { diff --git a/src/image.c b/src/image.c index 46433c3..e7f58de 100644 --- a/src/image.c +++ b/src/image.c @@ -141,7 +141,7 @@ VAStatus SunxiCedrusDeriveImage(VADriverContextP context, if (status != VA_STATUS_SUCCESS) return status; - buffer_object = BUFFER(image->buf); + buffer_object = BUFFER(driver_data, image->buf); if (buffer_object == NULL) return VA_STATUS_ERROR_INVALID_BUFFER; diff --git a/src/picture.c b/src/picture.c index 3ea9e35..f58e887 100644 --- a/src/picture.c +++ b/src/picture.c @@ -197,7 +197,7 @@ VAStatus SunxiCedrusRenderPicture(VADriverContextP context, return VA_STATUS_ERROR_INVALID_SURFACE; for (i = 0; i < buffers_count; i++) { - buffer_object = BUFFER(buffers_ids[i]); + buffer_object = BUFFER(driver_data, buffers_ids[i]); if (buffer_object == NULL) return VA_STATUS_ERROR_INVALID_BUFFER;