Am 29.09.2017 um 16:11 schrieb Marek Olšák:
From: Marek Olšák <marek.ol...@amd.com>
Reviewed-by: Christian König <christian.koe...@amd.com>
--- src/gallium/drivers/radeonsi/si_uvd.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_uvd.c b/src/gallium/drivers/radeonsi/si_uvd.c index 4e82506..1a38b26 100644 --- a/src/gallium/drivers/radeonsi/si_uvd.c +++ b/src/gallium/drivers/radeonsi/si_uvd.c @@ -58,39 +58,44 @@ struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe, resource_formats = vl_video_buffer_formats(pipe->screen, tmpl->buffer_format); if (!resource_formats) return NULL;array_size = tmpl->interlaced ? 2 : 1;template = *tmpl; template.width = align(tmpl->width, VL_MACROBLOCK_WIDTH); template.height = align(tmpl->height / array_size, VL_MACROBLOCK_HEIGHT);vl_video_buffer_template(&templ, &template, resource_formats[0], 1, array_size, PIPE_USAGE_DEFAULT, 0);+ /* TODO: get tiling working */ - templ.bind = PIPE_BIND_LINEAR; + /* Set PIPE_BIND_SHARED to avoid reallocation in r600_texture_get_handle, + * which can't handle joined surfaces. */ + unsigned bind = PIPE_BIND_LINEAR | PIPE_BIND_SHARED; + + templ.bind = bind; resources[0] = (struct r600_texture *) pipe->screen->resource_create(pipe->screen, &templ); if (!resources[0]) goto error;if (resource_formats[1] != PIPE_FORMAT_NONE) {vl_video_buffer_template(&templ, &template, resource_formats[1], 1, array_size, PIPE_USAGE_DEFAULT, 1); - templ.bind = PIPE_BIND_LINEAR; + templ.bind = bind; resources[1] = (struct r600_texture *) pipe->screen->resource_create(pipe->screen, &templ); if (!resources[1]) goto error; }if (resource_formats[2] != PIPE_FORMAT_NONE) {vl_video_buffer_template(&templ, &template, resource_formats[2], 1, array_size, PIPE_USAGE_DEFAULT, 2); - templ.bind = PIPE_BIND_LINEAR; + templ.bind = bind; resources[2] = (struct r600_texture *) pipe->screen->resource_create(pipe->screen, &templ); if (!resources[2]) goto error; }for (i = 0; i < VL_NUM_COMPONENTS; ++i) {if (!resources[i]) continue;
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
