fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 18:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

lima: fix buffer import with offset

Browse source 
With EGL_EXT_image_dma_buf_import, user can import dma_buf
with offset.

This is also used by AOSP GLConsumer::updateTexImage
with HAL_PIXEL_FORMAT_YV12 buffer which store YUV planes in
the same buffer with offset. Render sample from it using
GL_OES_EGL_image_external. This should fix some video
display problem when using MediaCodec soft decoding which
generates HAL_PIXEL_FORMAT_YV12 buffer and render it on
screen.

Test program:
https://github.com/yuq/gfx/tree/master/yuv2rgb/dma-buf

Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4362>
This commit is contained in:
Qiang Yu 2020-03-28 14:09:22 +08:00 • committed by Marge Bot
parent 02ad147c5c
commit e46b2ef724
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/gallium/drivers/lima/lima_resource.c
View file

@ -291,10 +291,20 @@ lima_resource_from_handle(struct pipe_screen *pscreen,
const struct pipe_resource *templat,
struct winsys_handle *handle, unsigned usage)
{
struct lima_resource *res;
struct lima_screen *screen = lima_screen(pscreen);
if (templat->bind & (PIPE_BIND_SAMPLER_VIEW |
PIPE_BIND_RENDER_TARGET |
PIPE_BIND_DEPTH_STENCIL)) {
/* sampler hardware need offset alignment 64, while render hardware
* need offset alignment 8, but due to render target may be reloaded
* which uses the sampler, set alignment requrement to 64 for all
*/
if (handle->offset & 0x3f) {
debug_error("import buffer offset not properly aligned\n");
return NULL;
}
}
res = CALLOC_STRUCT(lima_resource);
struct lima_resource *res = CALLOC_STRUCT(lima_resource);
if (!res)
return NULL;
@ -302,9 +312,10 @@ lima_resource_from_handle(struct pipe_screen *pscreen,
*pres = *templat;
pres->screen = pscreen;
pipe_reference_init(&pres->reference, 1);
res->levels[0].offset = 0;
res->levels[0].offset = handle->offset;
res->levels[0].stride = handle->stride;
struct lima_screen *screen = lima_screen(pscreen);
res->bo = lima_bo_import(screen, handle);
if (!res->bo) {
FREE(res);