From 15dff47da404c987ed07e451bf99a666f5ca3f63 Mon Sep 17 00:00:00 2001
From: Greg V <greg@unrelenting.technology>
Date: Fri, 3 Jan 2020 22:56:50 +0000
Subject: [PATCH] Bug 1606941 - prefer GLX in glxtest for now r=stransky

WebRender qualification needs actual GPU vendor info.
It's currently only available through GLX
(eglQueryRendererIntegerMESA is not available yet)
so let's only use the Wayland native path for non-Xwayland systems for now.

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

--HG--
extra : moz-landing-system : lando
---
 toolkit/xre/glxtest.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/toolkit/xre/glxtest.cpp b/toolkit/xre/glxtest.cpp
index c128ed581b5c..6db6fa7ec81e 100644
--- a/toolkit/xre/glxtest.cpp
+++ b/toolkit/xre/glxtest.cpp
@@ -552,8 +552,9 @@ bool fire_glxtest_process() {
     write_end_of_the_pipe = pfd[1];
     close_logging();
     // TODO: --display command line argument is not properly handled
+    // NOTE: prefers X for now because eglQueryRendererIntegerMESA does not exist yet
 #ifdef MOZ_WAYLAND
-    if (IsWaylandDisabled() || !wayland_egltest())
+    if (IsWaylandDisabled() || getenv("DISPLAY") || !wayland_egltest())
 #endif
       glxtest();
     close(pfd[1]);