egl/wayland: Fix zwp_linux_dmabuf usage
authorChristopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Tue, 24 Mar 2020 03:19:51 +0000 (14:19 +1100)
committerDaniel Stone <daniels@collabora.com>
Wed, 29 Apr 2020 10:29:40 +0000 (11:29 +0100)
commit98675d34c115e3a8db9b6b74e8eca01af5fff101
treef80994de2ac8038e90bb90a1d7056f945e496b20
parent8f0d3874411ec3c0dcb1171cad5930db70fb48b4
egl/wayland: Fix zwp_linux_dmabuf usage

There's no guarantee that the formats advertised by wl_drm and the formats
advertised by zwp_linux_dmabuf_v1 are the same.

get_back_bo() handles this by falling back from createImageWithModifiers() to
createImage() when there's a wl_drm format but no corresponding linux_dmabuf
format, but create_wl_buffer() unconditionally tries to create a linux_dmabuf
buffer unless DRIimage has DRM_FORMAT_MOD_INVALID.

Fix this by always checking if the DRIimage modifier has been advertised
by zwp_linux_dmabuf_v1, and falling back to wl_drm if not.

If DRM_FORMAT_MOD_INVALID has been advertised then we trust the client
has allocated something appropriate and treat any modifier as matching.

Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2220
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Simon Ser <contact@emersion.fr>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4294>
src/egl/drivers/dri2/platform_wayland.c