зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 819a428097dc (bug 1557658) for backout conflicts with Bug 1557266. CLOSED TREE
This commit is contained in:
Родитель
0c6758a3a2
Коммит
0c58ec27a3
|
@ -15,9 +15,6 @@ bool nsWaylandDisplay::mIsDMABufEnabled;
|
|||
bool nsWaylandDisplay::mIsDMABufPrefLoaded;
|
||||
#endif
|
||||
|
||||
#define GBMLIB_NAME "libgbm.so.1"
|
||||
#define DRMLIB_NAME "libdrm.so.2"
|
||||
|
||||
// nsWaylandDisplay needs to be created for each calling thread(main thread,
|
||||
// compositor thread and render thread)
|
||||
#define MAX_DISPLAY_CONNECTIONS 3
|
||||
|
@ -381,11 +378,8 @@ bool nsGbmLib::Load() {
|
|||
if (!sGbmLibHandle && !sLibLoaded) {
|
||||
sLibLoaded = true;
|
||||
|
||||
sGbmLibHandle = dlopen(GBMLIB_NAME, RTLD_LAZY | RTLD_LOCAL);
|
||||
sGbmLibHandle = dlopen("libgbm.so", RTLD_LAZY | RTLD_LOCAL);
|
||||
if (!sGbmLibHandle) {
|
||||
NS_WARNING(nsPrintfCString("Failed to load %s, dmabuf isn't available.\n",
|
||||
GBMLIB_NAME)
|
||||
.get());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -407,16 +401,10 @@ bool nsGbmLib::Load() {
|
|||
sGbmLibHandle, "gbm_bo_get_stride_for_plane");
|
||||
sGetOffset = (GetOffsetFunc)dlsym(sGbmLibHandle, "gbm_bo_get_offset");
|
||||
|
||||
sXf86DrmLibHandle = dlopen(DRMLIB_NAME, RTLD_LAZY | RTLD_LOCAL);
|
||||
sXf86DrmLibHandle = dlopen("libdrm.so", RTLD_LAZY | RTLD_LOCAL);
|
||||
if (sXf86DrmLibHandle) {
|
||||
sDrmPrimeHandleToFD = (DrmPrimeHandleToFDFunc)dlsym(sXf86DrmLibHandle,
|
||||
"drmPrimeHandleToFD");
|
||||
if (!sDrmPrimeHandleToFD) {
|
||||
NS_WARNING(nsPrintfCString(
|
||||
"Failed to load %s, gbm modifiers are not available.\n",
|
||||
DRMLIB_NAME)
|
||||
.get());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче