fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

frontends/va: Use resource_get_param instead of resource_get_info

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37628>
This commit is contained in:
David Rosca 2024-11-25 14:01:43 +01:00 • committed by Marge Bot
parent 25de079408
commit b25c40b857
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/gallium/frontends/va/surface.c
View file

@ -1691,7 +1691,7 @@ vlVaExportSurfaceHandle(VADriverContextP ctx,
desc->height = surf->templat.height;
desc->num_objects = 0;
bool supports_contiguous_planes = screen->resource_get_info && surf->buffer->contiguous_planes;
bool supports_contiguous_planes = screen->resource_get_param && surf->buffer->contiguous_planes;
for (p = 0; p < ARRAY_SIZE(desc->objects); p++) {
struct winsys_handle whandle;
@ -1710,7 +1710,7 @@ vlVaExportSurfaceHandle(VADriverContextP ctx,
}
/* If the driver stores all planes contiguously in memory, only one
* handle needs to be exported. resource_get_info is used to obtain
* handle needs to be exported. resource_get_param is used to obtain
* pitch and offset for each layer. */
if (!desc->num_objects || !supports_contiguous_planes) {
memset(&whandle, 0, sizeof(whandle));
@ -1736,7 +1736,19 @@ vlVaExportSurfaceHandle(VADriverContextP ctx,
desc->layers[0].object_index[p] = desc->num_objects - 1;
if (supports_contiguous_planes) {
screen->resource_get_info(screen, resource, &desc->layers[0].pitch[p], &desc->layers[0].offset[p]);
uint64_t value;
if (!screen->resource_get_param(screen, drv->pipe, resource, 0, 0, 0,
PIPE_RESOURCE_PARAM_STRIDE, 0, &value)) {
ret = VA_STATUS_ERROR_INVALID_SURFACE;
goto fail;
}
desc->layers[0].pitch[p] = value;
if (!screen->resource_get_param(screen, drv->pipe, resource, 0, 0, 0,
PIPE_RESOURCE_PARAM_OFFSET, 0, &value)) {
ret = VA_STATUS_ERROR_INVALID_SURFACE;
goto fail;
}
desc->layers[0].offset[p] = value;
} else {
desc->layers[0].pitch[p] = whandle.stride;
desc->layers[0].offset[p] = whandle.offset;
@ -1747,7 +1759,19 @@ vlVaExportSurfaceHandle(VADriverContextP ctx,
desc->layers[p].object_index[0] = desc->num_objects - 1;
if (supports_contiguous_planes) {
screen->resource_get_info(screen, resource, &desc->layers[p].pitch[0], &desc->layers[p].offset[0]);
uint64_t value;
if (!screen->resource_get_param(screen, drv->pipe, resource, 0, 0, 0,
PIPE_RESOURCE_PARAM_STRIDE, 0, &value)) {
ret = VA_STATUS_ERROR_INVALID_SURFACE;
goto fail;
}
desc->layers[p].pitch[0] = value;
if (!screen->resource_get_param(screen, drv->pipe, resource, 0, 0, 0,
PIPE_RESOURCE_PARAM_OFFSET, 0, &value)) {
ret = VA_STATUS_ERROR_INVALID_SURFACE;
goto fail;
}
desc->layers[p].offset[0] = value;
} else {
desc->layers[p].pitch[0] = whandle.stride;
desc->layers[p].offset[0] = whandle.offset;