Bug 1696937 [Linux] Remove wayland/drm info from about:support, r=jhorak

We can't get meaningful drm info at about:config as the info gathered too early and GfxPlatformGtk() is not initialized yet.

Differential Revision: https://phabricator.services.mozilla.com/D107502
This commit is contained in:
stransky 2021-03-08 21:26:19 +00:00
Родитель e2fa1effe1
Коммит dca8b9611f
3 изменённых файлов: 1 добавлений и 21 удалений

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

@ -548,11 +548,6 @@ IsWayland:
If true then the Wayland windowing system was in use. If true then the Wayland windowing system was in use.
type: boolean type: boolean
IsWaylandDRM:
description: >
If true then the Wayland DRM backend was in use.
type: boolean
IsWebRenderResourcePathOverridden: IsWebRenderResourcePathOverridden:
description: > description: >
If true then the WebRender resources (i.e. shaders) are loaded from a user specified path. If true then the WebRender resources (i.e. shaders) are loaded from a user specified path.

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

@ -52,7 +52,6 @@ nsresult GfxInfo::Init() {
mIsMesa = false; mIsMesa = false;
mIsAccelerated = true; mIsAccelerated = true;
mIsWayland = false; mIsWayland = false;
mIsWaylandDRM = false;
mIsXWayland = false; mIsXWayland = false;
mHasMultipleGPUs = false; mHasMultipleGPUs = false;
mGlxTestError = false; mGlxTestError = false;
@ -70,8 +69,6 @@ void GfxInfo::AddCrashReportAnnotations() {
CrashReporter::Annotation::AdapterDriverVersion, mDriverVersion); CrashReporter::Annotation::AdapterDriverVersion, mDriverVersion);
CrashReporter::AnnotateCrashReport(CrashReporter::Annotation::IsWayland, CrashReporter::AnnotateCrashReport(CrashReporter::Annotation::IsWayland,
mIsWayland); mIsWayland);
CrashReporter::AnnotateCrashReport(CrashReporter::Annotation::IsWaylandDRM,
mIsWaylandDRM);
CrashReporter::AnnotateCrashReport( CrashReporter::AnnotateCrashReport(
CrashReporter::Annotation::DesktopEnvironment, mDesktopEnvironment); CrashReporter::Annotation::DesktopEnvironment, mDesktopEnvironment);
@ -464,11 +461,6 @@ void GfxInfo::GetData() {
#ifdef MOZ_WAYLAND #ifdef MOZ_WAYLAND
mIsWayland = gdk_display_get_default() && mIsWayland = gdk_display_get_default() &&
!GDK_IS_X11_DISPLAY(gdk_display_get_default()); !GDK_IS_X11_DISPLAY(gdk_display_get_default());
if (mIsWayland) {
mIsWaylandDRM = GetDMABufDevice()->IsDMABufVAAPIEnabled() ||
GetDMABufDevice()->IsDMABufWebGLEnabled() ||
GetDMABufDevice()->IsDMABufTexturesEnabled();
}
#endif #endif
// Make a best effort guess at whether or not we are using the XWayland compat // Make a best effort guess at whether or not we are using the XWayland compat
@ -991,13 +983,7 @@ NS_IMETHODIMP
GfxInfo::GetWindowProtocol(nsAString& aWindowProtocol) { GfxInfo::GetWindowProtocol(nsAString& aWindowProtocol) {
GetData(); GetData();
if (mIsWayland) { if (mIsWayland) {
if (mIsWaylandDRM) { aWindowProtocol = GfxDriverInfo::GetWindowProtocol(WindowProtocol::Wayland);
aWindowProtocol =
GfxDriverInfo::GetWindowProtocol(WindowProtocol::WaylandDRM);
} else {
aWindowProtocol =
GfxDriverInfo::GetWindowProtocol(WindowProtocol::Wayland);
}
} else if (mIsXWayland) { } else if (mIsXWayland) {
aWindowProtocol = aWindowProtocol =
GfxDriverInfo::GetWindowProtocol(WindowProtocol::XWayland); GfxDriverInfo::GetWindowProtocol(WindowProtocol::XWayland);

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

@ -109,7 +109,6 @@ class GfxInfo final : public GfxInfoBase {
bool mIsMesa; bool mIsMesa;
bool mIsAccelerated; bool mIsAccelerated;
bool mIsWayland; bool mIsWayland;
bool mIsWaylandDRM;
bool mIsXWayland; bool mIsXWayland;
bool mHasMultipleGPUs; bool mHasMultipleGPUs;
bool mGlxTestError; bool mGlxTestError;