Bug 1557265 - [Wayland] Require libdrm to build Wayland backend, r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D33918

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Martin Stransky 2019-06-19 21:55:33 +00:00
Родитель 1b3de0879f
Коммит fd9e6a9a28
3 изменённых файлов: 3 добавлений и 7 удалений

Просмотреть файл

@ -250,7 +250,7 @@ add_old_configure_assignment('MOZ_X11', True, when=toolkit_gtk)
# Wayland support
# ==============================================================
wayland_headers = pkg_check_modules(
'MOZ_WAYLAND', 'gtk+-wayland-3.0 >= 3.10 xkbcommon >= 0.4.1',
'MOZ_WAYLAND', 'gtk+-wayland-3.0 >= 3.10 xkbcommon >= 0.4.1 libdrm > 2.4',
allow_missing=depends(full_toolkit)(lambda t: t == 'cairo-gtk3'),
when=depends(full_toolkit)(lambda t: t in ('cairo-gtk3', 'cairo-gtk3-wayland')))

Просмотреть файл

@ -122,7 +122,6 @@ bool WaylandDMABufSurface::Create(int aWidth, int aHeight, bool aHasAlpha) {
return false;
}
#ifdef HAVE_GBM_MODIFIERS
if (nsGbmLib::IsModifierAvailable() && mGmbFormat->mModifiersCount > 0) {
mGbmBufferObject = nsGbmLib::CreateWithModifiers(
display->GetGbmDevice(), mWidth, mHeight, mGmbFormat->mFormat,
@ -131,7 +130,6 @@ bool WaylandDMABufSurface::Create(int aWidth, int aHeight, bool aHasAlpha) {
mBufferModifier = nsGbmLib::GetModifier(mGbmBufferObject);
}
}
#endif
if (!mGbmBufferObject) {
mGbmBufferObject =
@ -143,7 +141,6 @@ bool WaylandDMABufSurface::Create(int aWidth, int aHeight, bool aHasAlpha) {
return false;
}
#ifdef HAVE_GBM_MODIFIERS
if (nsGbmLib::IsModifierAvailable() && display->GetGbmDeviceFd() != -1) {
mBufferPlaneCount = nsGbmLib::GetPlaneCount(mGbmBufferObject);
for (int i = 0; i < mBufferPlaneCount; i++) {
@ -157,9 +154,7 @@ bool WaylandDMABufSurface::Create(int aWidth, int aHeight, bool aHasAlpha) {
mStrides[i] = nsGbmLib::GetStrideForPlane(mGbmBufferObject, i);
mOffsets[i] = nsGbmLib::GetOffset(mGbmBufferObject, i);
}
} else
#endif
{
} else {
mBufferPlaneCount = 1;
mStrides[0] = nsGbmLib::GetStride(mGbmBufferObject);
mDmabufFds[0] = nsGbmLib::GetFd(mGbmBufferObject);

Просмотреть файл

@ -13,6 +13,7 @@
#include <algorithm>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <dlfcn.h>
#ifdef MOZ_WIDGET_GTK
# include <gdk/gdkkeysyms-compat.h>
#endif