fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 04:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

frontends/va: use resources instead of views

Browse source 
Avoids the generation of sampler views as they are unnecessary

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23159>
This commit is contained in:
Ganesh Belgur Ramachandra 2023-06-19 15:04:15 -05:00 • committed by Marge Bot
parent 025dcbea66
commit 975a8ecc88
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/gallium/frontends/va/image.c
View file

@ -496,7 +496,7 @@ vlVaGetImage(VADriverContextP ctx, VASurfaceID surface, int x, int y,
vlVaSurface *surf;
vlVaBuffer *img_buf;
VAImage *vaimage;
struct pipe_sampler_view **views;
struct pipe_resource *view_resources[VL_NUM_COMPONENTS];
enum pipe_format format;
bool convert = false;
uint8_t *data[3];
@ -569,11 +569,7 @@ vlVaGetImage(VADriverContextP ctx, VASurfaceID surface, int x, int y,
}
}
views = surf->buffer->get_sampler_view_planes(surf->buffer);
if (!views) {
mtx_unlock(&drv->mutex);
return VA_STATUS_ERROR_OPERATION_FAILED;
}
surf->buffer->get_resources(surf->buffer, view_resources);
for (i = 0; i < MIN2(vaimage->num_planes, 3); i++) {
data[i] = ((uint8_t*)img_buf->data) + vaimage->offsets[i];
@ -595,18 +591,18 @@ vlVaGetImage(VADriverContextP ctx, VASurfaceID surface, int x, int y,
unsigned box_h = align(height, 2);
unsigned box_x = x & ~1;
unsigned box_y = y & ~1;
if (!views[i]) continue;
if (!view_resources[i]) continue;
vl_video_buffer_adjust_size(&box_w, &box_h, i,
pipe_format_to_chroma_format(surf->templat.buffer_format),
surf->templat.interlaced);
vl_video_buffer_adjust_size(&box_x, &box_y, i,
pipe_format_to_chroma_format(surf->templat.buffer_format),
surf->templat.interlaced);
for (j = 0; j < views[i]->texture->array_size; ++j) {
for (j = 0; j < view_resources[i]->array_size; ++j) {
struct pipe_box box = {box_x, box_y, j, box_w, box_h, 1};
struct pipe_transfer *transfer;
uint8_t *map;
map = drv->pipe->texture_map(drv->pipe, views[i]->texture, 0,
map = drv->pipe->texture_map(drv->pipe, view_resources[i], 0,
PIPE_MAP_READ, &box, &transfer);
if (!map) {
mtx_unlock(&drv->mutex);
@ -615,12 +611,12 @@ vlVaGetImage(VADriverContextP ctx, VASurfaceID surface, int x, int y,
if (i == 1 && convert) {
u_copy_nv12_to_yv12((void *const *)data, pitches, i, j,
transfer->stride, views[i]->texture->array_size,
transfer->stride, view_resources[i]->array_size,
map, box.width, box.height);
} else {
util_copy_rect((uint8_t*)(data[i] + pitches[i] * j),
views[i]->texture->format,
pitches[i] * views[i]->texture->array_size, 0, 0,
view_resources[i]->format,
pitches[i] * view_resources[i]->array_size, 0, 0,
box.width, box.height, map, transfer->stride, 0, 0);
}
pipe_texture_unmap(drv->pipe, transfer);
@ -640,7 +636,7 @@ vlVaPutImage(VADriverContextP ctx, VASurfaceID surface, VAImageID image,
vlVaSurface *surf;
vlVaBuffer *img_buf;
VAImage *vaimage;
struct pipe_sampler_view **views;
struct pipe_resource *view_resources[VL_NUM_COMPONENTS];
enum pipe_format format;
uint8_t *data[3];
unsigned pitches[3], i, j;
@ -703,11 +699,7 @@ vlVaPutImage(VADriverContextP ctx, VASurfaceID surface, VAImageID image,
surf->buffer = tmp_buf;
}
views = surf->buffer->get_sampler_view_planes(surf->buffer);
if (!views) {
mtx_unlock(&drv->mutex);
return VA_STATUS_ERROR_OPERATION_FAILED;
}
surf->buffer->get_resources(surf->buffer, view_resources);
for (i = 0; i < MIN2(vaimage->num_planes, 3); i++) {
data[i] = ((uint8_t*)img_buf->data) + vaimage->offsets[i];
@ -728,8 +720,8 @@ vlVaPutImage(VADriverContextP ctx, VASurfaceID surface, VAImageID image,
unsigned width, height;
struct pipe_resource *tex;
if (!views[i]) continue;
tex = views[i]->texture;
if (!view_resources[i]) continue;
tex = view_resources[i];
vlVaVideoSurfaceSize(surf, i, &width, &height);
for (j = 0; j < tex->array_size; ++j) {
@ -760,7 +752,7 @@ vlVaPutImage(VADriverContextP ctx, VASurfaceID surface, VAImageID image,
drv->pipe->texture_subdata(drv->pipe, tex, 0,
PIPE_MAP_WRITE, &dst_box,
data[i] + pitches[i] * j,
pitches[i] * views[i]->texture->array_size, 0);
pitches[i] * view_resources[i]->array_size, 0);
}
}
}