Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1294232 - Refactor blocklisting on Linux to support the downloadable blocklist. r=jrmuizel

Browse Source 
MozReview-Commit-ID: ESJY9kkqXR8

Differential Revision: https://phabricator.services.mozilla.com/D19190
This commit is contained in:
Andrew Comminos 2019-02-08 14:36:08 -05:00 committed by Andrew Osmond
parent 3befab3ee9
commit 6828eee6b1
27 changed files with 334 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
View File

@ -291,6 +291,7 @@ function spoofTheme(aId, aName, aDesc) {
function spoofGfxAdapter() {
try {
let gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
gfxInfo.spoofVendorID(GFX_VENDOR_ID);
gfxInfo.spoofDeviceID(GFX_DEVICE_ID);
} catch (x) {

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Device.js
View File

@ -30,6 +30,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
// Set the vendor/device ID, etc, to match the test file.
switch (Services.appinfo.OS) {

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_DriverNew.js
View File

@ -30,6 +30,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
// Set the vendor/device ID, etc, to match the test file.
switch (Services.appinfo.OS) {

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_DriverNew.js
View File

@ -30,6 +30,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
// Set the vendor/device ID, etc, to match the test file.
switch (Services.appinfo.OS) {

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_DriverOld.js
View File

@ -31,6 +31,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
// Set the vendor/device ID, etc, to match the test file.
switch (Services.appinfo.OS) {

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_OK.js
View File

@ -30,6 +30,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
// Set the vendor/device ID, etc, to match the test file.
switch (Services.appinfo.OS) {

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_GTE_DriverOld.js
View File

@ -30,6 +30,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
// Set the vendor/device ID, etc, to match the test file.
switch (Services.appinfo.OS) {

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_GTE_OK.js
View File

@ -30,6 +30,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
// Set the vendor/device ID, etc, to match the test file.
switch (Services.appinfo.OS) {

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_No_Comparison.js
View File

@ -30,6 +30,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
gfxInfo.spoofVendorID("0xabcd");
gfxInfo.spoofDeviceID("0x6666");

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OK.js
View File

@ -30,6 +30,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
// Set the vendor/device ID, etc, to match the test file.
switch (Services.appinfo.OS) {

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_match.js
View File

@ -29,6 +29,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
// Set the vendor/device ID, etc, to match the test file.
gfxInfo.spoofDriverVersion("8.52.322.2201");

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_DriverVersion.js
View File

@ -30,6 +30,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
// Set the vendor/device ID, etc, to match the test file.
gfxInfo.spoofDriverVersion("8.52.322.2202");

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_OSVersion.js
View File

@ -30,6 +30,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
// Set the vendor/device ID, etc, to match the test file.
gfxInfo.spoofDriverVersion("8.52.322.2201");

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Vendor.js
View File

@ -30,6 +30,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
// Set the vendor/device ID, etc, to match the test file.
switch (Services.appinfo.OS) {

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Version.js
View File

@ -29,6 +29,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
// Set the vendor/device ID, etc, to match the test file.
switch (Services.appinfo.OS) {

1
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_prefs.js
View File

@ -34,6 +34,7 @@ async function run_test() {
}
gfxInfo.QueryInterface(Ci.nsIGfxInfoDebug);
gfxInfo.fireTestProcess();
// Set the vendor/device ID, etc, to match the test file.
switch (Services.appinfo.OS) {

64
toolkit/xre/glxtest.cpp
View File

@ -58,6 +58,20 @@ typedef uint32_t GLenum;
#define GL_RENDERER 0x1F01
#define GL_VERSION 0x1F02
// GLX_MESA_query_renderer
#define GLX_RENDERER_VENDOR_ID_MESA 0x8183
#define GLX_RENDERER_DEVICE_ID_MESA 0x8184
#define GLX_RENDERER_VERSION_MESA 0x8185
#define GLX_RENDERER_ACCELERATED_MESA 0x8186
#define GLX_RENDERER_VIDEO_MEMORY_MESA 0x8187
#define GLX_RENDERER_UNIFIED_MEMORY_ARCHITECTURE_MESA 0x8188
#define GLX_RENDERER_PREFERRED_PROFILE_MESA 0x8189
#define GLX_RENDERER_OPENGL_CORE_PROFILE_VERSION_MESA 0x818A
#define GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA 0x818B
#define GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA 0x818C
#define GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA 0x818D
#define GLX_RENDERER_ID_MESA 0x818E
namespace mozilla {
namespace widget {
// the read end of the pipe, which will be used by GfxInfo
@ -201,13 +215,13 @@ void glxtest() {
void *glXBindTexImageEXT = glXGetProcAddress("glXBindTexImageEXT");
///// Get GL vendor/renderer/versions strings /////
enum { bufsize = 1024 };
enum { bufsize = 2048 };
char buf[bufsize];
const GLubyte *vendorString = glGetString(GL_VENDOR);
const GLubyte *rendererString = glGetString(GL_RENDERER);
const GLubyte *versionString = glGetString(GL_VERSION);
const GLubyte* versionString = glGetString(GL_VERSION);
const GLubyte* vendorString = glGetString(GL_VENDOR);
const GLubyte* rendererString = glGetString(GL_RENDERER);
if (!vendorString || !rendererString || !versionString)
if (!versionString || !vendorString || !rendererString)
fatal_error("glGetString returned null");
int length =
@ -217,6 +231,46 @@ void glxtest() {
if (length >= bufsize)
fatal_error("GL strings length too large for buffer size");
// If GLX_MESA_query_renderer is available, populate additional data.
typedef Bool (*PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC) (int attribute, unsigned int* value);
PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC glXQueryCurrentRendererIntegerMESAProc =
cast<PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC>(glXGetProcAddress("glXQueryCurrentRendererIntegerMESA"));
if (glXQueryCurrentRendererIntegerMESAProc) {
unsigned int vendorId, deviceId, accelerated, videoMemoryMB;
glXQueryCurrentRendererIntegerMESAProc(GLX_RENDERER_VENDOR_ID_MESA, &vendorId);
glXQueryCurrentRendererIntegerMESAProc(GLX_RENDERER_DEVICE_ID_MESA, &deviceId);
glXQueryCurrentRendererIntegerMESAProc(GLX_RENDERER_ACCELERATED_MESA, &accelerated);
glXQueryCurrentRendererIntegerMESAProc(GLX_RENDERER_VIDEO_MEMORY_MESA, &videoMemoryMB);
// Truncate IDs to 4 digits- that's all PCI IDs are.
vendorId &= 0xFFFF;
deviceId &= 0xFFFF;
length += snprintf(buf + length, bufsize,
"MESA_VENDOR_ID\n0x%04x\n"
"MESA_DEVICE_ID\n0x%04x\n"
"MESA_ACCELERATED\n%s\n"
"MESA_VRAM\n%dMB\n",
vendorId, deviceId, accelerated ? "TRUE" : "FALSE",
videoMemoryMB);
if (length >= bufsize)
fatal_error("GL strings length too large for buffer size");
}
// From Mesa's GL/internal/dri_interface.h, to be used by DRI clients.
typedef const char * (* PFNGLXGETSCREENDRIVERPROC) (Display *dpy, int scrNum);
PFNGLXGETSCREENDRIVERPROC glXGetScreenDriverProc =
cast<PFNGLXGETSCREENDRIVERPROC>(glXGetProcAddress("glXGetScreenDriver"));
if (glXGetScreenDriverProc) {
const char* driDriver = glXGetScreenDriverProc(dpy, DefaultScreen(dpy));
if (driDriver) {
length += snprintf(buf + length, bufsize, "DRI_DRIVER\n%s\n", driDriver);
if (length >= bufsize)
fatal_error("GL strings length too large for buffer size");
}
}
///// Clean up. Indeed, the parent process might fail to kill us (e.g. if it
///// doesn't need to check GL info) so we might be staying alive for longer
///// than expected, so it's important to consume as little memory as

5
widget/GfxDriverInfo.cpp
View File

@ -381,6 +381,11 @@ const nsAString& GfxDriverInfo::GetDeviceVendor(DeviceVendor id) {
// Choose an arbitrary Qualcomm PCI VENdor ID for now.
// TODO: This should be "QCOM" when Windows device ID parsing is reworked.
DECLARE_VENDOR_ID(VendorQualcomm, "0x5143");
DECLARE_VENDOR_ID(VendorMesaAll, "mesa/all");
DECLARE_VENDOR_ID(VendorMesaLLVMPipe, "mesa/llvmpipe");
DECLARE_VENDOR_ID(VendorMesaSoftPipe, "mesa/softpipe");
DECLARE_VENDOR_ID(VendorMesaSWRast, "mesa/swrast");
DECLARE_VENDOR_ID(VendorMesaUnknown, "mesa/unknown");
// Suppress a warning.
DECLARE_VENDOR_ID(DeviceVendorMax, "");
}

14
widget/GfxDriverInfo.h
View File

@ -127,6 +127,18 @@ enum DeviceVendor {
VendorMicrosoft,
VendorParallels,
VendorQualcomm,
// Wildcard for all Mesa drivers.
VendorMesaAll,
// Note that the following list of Mesa drivers is not comprehensive; we pull
// the DRI driver at runtime. These drivers are provided for convenience when
// populating the local blocklist.
VendorMesaLLVMPipe,
VendorMesaSoftPipe,
VendorMesaSWRast,
// A generic ID to be provided when we can't determine the DRI driver on Mesa.
VendorMesaUnknown,
DeviceVendorMax
};
@ -276,7 +288,7 @@ inline bool ParseDriverVersion(const nsAString &aVersion,
uint64_t *aNumericVersion) {
*aNumericVersion = 0;
#if defined(XP_WIN)
#if defined(XP_WIN) || defined(MOZ_X11)
int a, b, c, d;
char aStr[8], bStr[8], cStr[8], dStr[8];
/* honestly, why do I even bother */

18
widget/GfxInfoBase.cpp
View File

@ -695,7 +695,7 @@ int32_t GfxInfoBase::FindBlocklistedDeviceInList(
return 0;
}
#if defined(XP_WIN) || defined(ANDROID)
#if defined(XP_WIN) || defined(ANDROID) || defined(MOZ_X11)
uint64_t driverVersion[2] = {0, 0};
if (!adapterInfoFailed[0]) {
ParseDriverVersion(adapterDriverVersionString[0], &driverVersion[0]);
@ -728,11 +728,7 @@ int32_t GfxInfoBase::FindBlocklistedDeviceInList(
continue;
}
if (!info[i].mAdapterVendor.Equals(
GfxDriverInfo::GetDeviceVendor(VendorAll),
nsCaseInsensitiveStringComparator()) &&
!info[i].mAdapterVendor.Equals(adapterVendorID[infoIndex],
nsCaseInsensitiveStringComparator())) {
if (!DoesVendorMatch(info[i].mAdapterVendor, adapterVendorID[infoIndex])) {
continue;
}
@ -769,7 +765,7 @@ int32_t GfxInfoBase::FindBlocklistedDeviceInList(
continue;
}
#if defined(XP_WIN) || defined(ANDROID)
#if defined(XP_WIN) || defined(ANDROID) || defined(MOZ_X11)
switch (info[i].mComparisonOp) {
case DRIVER_LESS_THAN:
match = driverVersion[infoIndex] < info[i].mDriverVersion;
@ -883,6 +879,14 @@ void GfxInfoBase::SetFeatureStatus(
sFeatureStatus = new nsTArray<dom::GfxInfoFeatureStatus>(aFS);
}
bool GfxInfoBase::DoesVendorMatch(const nsAString& aBlocklistVendor,
const nsAString& aAdapterVendor) {
return aBlocklistVendor.Equals(aAdapterVendor,
nsCaseInsensitiveStringComparator()) ||
aBlocklistVendor.Equals(GfxDriverInfo::GetDeviceVendor(VendorAll),
nsCaseInsensitiveStringComparator());
}
nsresult GfxInfoBase::GetFeatureStatusImpl(
int32_t aFeature, int32_t* aStatus, nsAString& aSuggestedVersion,
const nsTArray<GfxDriverInfo>& aDriverInfo, nsACString& aFailureId,

4
widget/GfxInfoBase.h
View File

@ -125,6 +125,10 @@ class GfxInfoBase : public nsIGfxInfo,
virtual const nsTArray<GfxDriverInfo>& GetGfxDriverInfo() = 0;
virtual void DescribeFeatures(JSContext* aCx, JS::Handle<JSObject*> obj);
virtual bool DoesVendorMatch(const nsAString& aBlocklistVendor,
const nsAString& aAdapterVendor);
bool InitFeatureObject(JSContext* aCx, JS::Handle<JSObject*> aContainer,
const char* aName,
mozilla::gfx::FeatureStatus& aKnownStatus,

389
widget/GfxInfoX11.cpp
View File

@ -14,9 +14,15 @@
#include "nsExceptionHandler.h"
#include "nsICrashReporter.h"
#include "prenv.h"
#include "nsPrintfCString.h"
#include "nsWhitespaceTokenizer.h"
#include "GfxInfoX11.h"
#ifdef DEBUG
bool fire_glxtest_process();
#endif
namespace mozilla {
namespace widget {
@ -30,27 +36,20 @@ pid_t glxtest_pid = 0;
nsresult GfxInfo::Init() {
mGLMajorVersion = 0;
mMajorVersion = 0;
mMinorVersion = 0;
mRevisionVersion = 0;
mIsMesa = false;
mIsNVIDIA = false;
mIsFGLRX = false;
mIsNouveau = false;
mIsIntel = false;
mIsOldSwrast = false;
mIsLlvmpipe = false;
mGLMinorVersion = 0;
mHasTextureFromPixmap = false;
mIsMesa = false;
mIsAccelerated = true;
return GfxInfoBase::Init();
}
void GfxInfo::AddCrashReportAnnotations() {
CrashReporter::AnnotateCrashReport(CrashReporter::Annotation::AdapterVendorID,
mVendor);
mVendorId);
CrashReporter::AnnotateCrashReport(CrashReporter::Annotation::AdapterDeviceID,
mRenderer);
mDeviceId);
CrashReporter::AnnotateCrashReport(
CrashReporter::Annotation::AdapterDriverVersion, mVersion);
CrashReporter::Annotation::AdapterDriverVersion, mDriverVersion);
}
void GfxInfo::GetData() {
@ -108,7 +107,18 @@ void GfxInfo::GetData() {
bool error = waiting_for_glxtest_process_failed || exited_with_error_code ||
received_signal;
nsCString glVendor;
nsCString glRenderer;
nsCString glVersion;
nsCString textureFromPixmap;
// Available if GLX_MESA_query_renderer is supported.
nsCString mesaVendor;
nsCString mesaDevice;
nsCString mesaAccelerated;
// Available if using a DRI-based libGL stack.
nsCString driDriver;
nsCString *stringToFill = nullptr;
char *bufptr = buf;
if (!error) {
@ -119,13 +129,23 @@ void GfxInfo::GetData() {
stringToFill->Assign(line);
stringToFill = nullptr;
} else if (!strcmp(line, "VENDOR"))
stringToFill = &mVendor;
stringToFill = &glVendor;
else if (!strcmp(line, "RENDERER"))
stringToFill = &mRenderer;
stringToFill = &glRenderer;
else if (!strcmp(line, "VERSION"))
stringToFill = &mVersion;
stringToFill = &glVersion;
else if (!strcmp(line, "TFP"))
stringToFill = &textureFromPixmap;
else if (!strcmp(line, "MESA_VENDOR_ID"))
stringToFill = &mesaVendor;
else if (!strcmp(line, "MESA_DEVICE_ID"))
stringToFill = &mesaDevice;
else if (!strcmp(line, "MESA_ACCELERATED"))
stringToFill = &mesaAccelerated;
else if (!strcmp(line, "MESA_VRAM"))
stringToFill = &mAdapterRAM;
else if (!strcmp(line, "DRI_DRIVER"))
stringToFill = &driDriver;
}
}
@ -140,18 +160,18 @@ void GfxInfo::GetData() {
}
const char *spoofedVendor = PR_GetEnv("MOZ_GFX_SPOOF_GL_VENDOR");
if (spoofedVendor) mVendor.Assign(spoofedVendor);
if (spoofedVendor) glVendor.Assign(spoofedVendor);
const char *spoofedRenderer = PR_GetEnv("MOZ_GFX_SPOOF_GL_RENDERER");
if (spoofedRenderer) mRenderer.Assign(spoofedRenderer);
if (spoofedRenderer) glRenderer.Assign(spoofedRenderer);
const char *spoofedVersion = PR_GetEnv("MOZ_GFX_SPOOF_GL_VERSION");
if (spoofedVersion) mVersion.Assign(spoofedVersion);
if (spoofedVersion) glVersion.Assign(spoofedVersion);
const char *spoofedOS = PR_GetEnv("MOZ_GFX_SPOOF_OS");
if (spoofedOS) mOS.Assign(spoofedOS);
const char *spoofedOSRelease = PR_GetEnv("MOZ_GFX_SPOOF_OS_RELEASE");
if (spoofedOSRelease) mOSRelease.Assign(spoofedOSRelease);
if (error || mVendor.IsEmpty() || mRenderer.IsEmpty() || mVersion.IsEmpty() ||
mOS.IsEmpty() || mOSRelease.IsEmpty()) {
if (error || glVendor.IsEmpty() || glRenderer.IsEmpty() ||
glVersion.IsEmpty() || mOS.IsEmpty() || mOSRelease.IsEmpty()) {
mAdapterDescription.AppendLiteral("GLXtest process failed");
if (waiting_for_glxtest_process_failed)
mAdapterDescription.AppendPrintf(
@ -173,83 +193,134 @@ void GfxInfo::GetData() {
return;
}
mAdapterDescription.Append(mVendor);
mAdapterDescription.AppendLiteral(" -- ");
mAdapterDescription.Append(mRenderer);
AddCrashReportAnnotations();
// determine the major OpenGL version. That's the first integer in the version
// string.
mGLMajorVersion = strtol(mVersion.get(), 0, 10);
// determine driver type (vendor) and where in the version string
// the actual driver version numbers should be expected to be found
// (whereToReadVersionNumbers)
const char *whereToReadVersionNumbers = nullptr;
const char *Mesa_in_version_string = strstr(mVersion.get(), "Mesa");
if (Mesa_in_version_string) {
mIsMesa = true;
// with Mesa, the version string contains "Mesa major.minor" and that's all
// the version information we get: there is no actual driver version info.
whereToReadVersionNumbers = Mesa_in_version_string + strlen("Mesa");
if (strcasestr(mVendor.get(), "nouveau")) mIsNouveau = true;
if (strcasestr(mRenderer.get(),
"intel")) // yes, intel is in the renderer string
mIsIntel = true;
if (strcasestr(mRenderer.get(), "llvmpipe")) mIsLlvmpipe = true;
if (strcasestr(mRenderer.get(), "software rasterizer")) mIsOldSwrast = true;
} else if (strstr(mVendor.get(), "NVIDIA Corporation")) {
mIsNVIDIA = true;
// with the NVIDIA driver, the version string contains "NVIDIA major.minor"
// note that here the vendor and version strings behave differently, that's
// why we don't put this above alongside Mesa_in_version_string.
const char *NVIDIA_in_version_string = strstr(mVersion.get(), "NVIDIA");
if (NVIDIA_in_version_string)
whereToReadVersionNumbers = NVIDIA_in_version_string + strlen("NVIDIA");
} else if (strstr(mVendor.get(), "ATI Technologies Inc")) {
mIsFGLRX = true;
// with the FGLRX driver, the version string only gives a OpenGL version :/
// so let's return that. that can at least give a rough idea of how old the
// driver is.
whereToReadVersionNumbers = mVersion.get();
}
// read major.minor version numbers of the driver (not to be confused with the
// OpenGL version)
if (whereToReadVersionNumbers) {
// copy into writable buffer, for tokenization
strncpy(buf, whereToReadVersionNumbers, buf_size);
bufptr = buf;
// now try to read major.minor version numbers. In case of failure,
// gracefully exit: these numbers have been initialized as 0 anyways
char *token = NS_strtok(".", &bufptr);
if (token) {
mMajorVersion = strtol(token, 0, 10);
token = NS_strtok(".", &bufptr);
if (token) {
mMinorVersion = strtol(token, 0, 10);
token = NS_strtok(".", &bufptr);
if (token) mRevisionVersion = strtol(token, 0, 10);
// Scan the GL_VERSION string for the GL and driver versions.
nsCWhitespaceTokenizer tokenizer(glVersion);
while (tokenizer.hasMoreTokens()) {
nsCString token(tokenizer.nextToken());
unsigned int major = 0, minor = 0, revision = 0, patch = 0;
if (sscanf(token.get(), "%u.%u.%u.%u", &major, &minor, &revision, &patch) >=
2) {
// A survey of GL_VENDOR strings indicates that the first version is
// always the GL version, the second is usually the driver version.
if (mGLMajorVersion == 0) {
mGLMajorVersion = major;
mGLMinorVersion = minor;
} else if (mDriverVersion.IsEmpty()) { // Not already spoofed.
mDriverVersion =
nsPrintfCString("%u.%u.%u.%u", major, minor, revision, patch);
}
}
}
}
static inline uint64_t version(uint32_t major, uint32_t minor,
uint32_t revision = 0) {
return (uint64_t(major) << 32) + (uint64_t(minor) << 16) + uint64_t(revision);
if (mGLMajorVersion == 0) {
NS_WARNING("Failed to parse GL version!");
return;
}
// Mesa always exposes itself in the GL_VERSION string, but not always the
// GL_VENDOR string.
mIsMesa = glVersion.Find("Mesa") != -1;
// We need to use custom vendor IDs for mesa so we can treat them
// differently than the proprietary drivers.
if (mIsMesa) {
mIsAccelerated = !mesaAccelerated.Equals("FALSE");
// Process software rasterizers before the DRI driver string; we may be
// forcing software rasterization on a DRI-accelerated X server by using
// LIBGL_ALWAYS_SOFTWARE or a similar restriction.
if (strcasestr(glRenderer.get(), "llvmpipe")) {
CopyUTF16toUTF8(GfxDriverInfo::GetDeviceVendor(VendorMesaLLVMPipe),
mVendorId);
mIsAccelerated = false;
} else if (strcasestr(glRenderer.get(), "softpipe")) {
CopyUTF16toUTF8(GfxDriverInfo::GetDeviceVendor(VendorMesaSoftPipe),
mVendorId);
mIsAccelerated = false;
} else if (strcasestr(glRenderer.get(), "software rasterizer") ||
!mIsAccelerated) {
// Fallback to reporting swrast if GLX_MESA_query_renderer tells us
// we're using an unaccelerated context.
CopyUTF16toUTF8(GfxDriverInfo::GetDeviceVendor(VendorMesaSWRast),
mVendorId);
mIsAccelerated = false;
} else if (!driDriver.IsEmpty()) {
mVendorId = nsPrintfCString("mesa/%s", driDriver.get());
} else {
// Some other mesa configuration where we couldn't get enough info.
NS_WARNING("Failed to detect Mesa driver being used!");
CopyUTF16toUTF8(GfxDriverInfo::GetDeviceVendor(VendorMesaUnknown),
mVendorId);
}
if (!mesaDevice.IsEmpty()) {
mDeviceId = mesaDevice;
} else {
NS_WARNING(
"Failed to get Mesa device ID! GLX_MESA_query_renderer unsupported?");
}
} else if (glVendor.EqualsLiteral("NVIDIA Corporation")) {
CopyUTF16toUTF8(GfxDriverInfo::GetDeviceVendor(VendorNVIDIA), mVendorId);
// TODO: Use NV-CONTROL X11 extension to query Device ID and VRAM.
} else if (glVendor.EqualsLiteral("ATI Technologies Inc.")) {
CopyUTF16toUTF8(GfxDriverInfo::GetDeviceVendor(VendorATI), mVendorId);
// TODO: Look into ways to find the device ID on FGLRX.
} else {
NS_WARNING("Failed to detect GL vendor!");
}
// Fallback to GL_VENDOR and GL_RENDERER.
if (mVendorId.IsEmpty()) {
mVendorId.Assign(glVendor.get());
}
if (mDeviceId.IsEmpty()) {
mDeviceId.Assign(glRenderer.get());
}
mAdapterDescription.Assign(glRenderer);
AddCrashReportAnnotations();
}
const nsTArray<GfxDriverInfo> &GfxInfo::GetGfxDriverInfo() {
// Nothing here yet.
// if (!sDriverInfo->Length()) {
//
//}
if (!sDriverInfo->Length()) {
// Mesa 10.0 provides the GLX_MESA_query_renderer extension, which allows us
// to query device IDs backing a GL context for blacklisting.
APPEND_TO_DRIVER_BLOCKLIST(
OperatingSystem::Linux,
(nsAString &)GfxDriverInfo::GetDeviceVendor(VendorMesaAll),
GfxDriverInfo::allDevices, GfxDriverInfo::allFeatures,
nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, DRIVER_LESS_THAN,
V(10, 0, 0, 0), "FEATURE_FAILURE_OLD_MESA", "Mesa 10.0");
// NVIDIA baseline (ported from old blocklist)
APPEND_TO_DRIVER_BLOCKLIST(
OperatingSystem::Linux,
(nsAString &)GfxDriverInfo::GetDeviceVendor(VendorNVIDIA),
GfxDriverInfo::allDevices, GfxDriverInfo::allFeatures,
nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, DRIVER_LESS_THAN,
V(257, 21, 0, 0), "FEATURE_FAILURE_OLD_NVIDIA", "NVIDIA 257.21");
// fglrx baseline (chosen arbitrarily as 2013-07-22 release).
APPEND_TO_DRIVER_BLOCKLIST(
OperatingSystem::Linux,
(nsAString &)GfxDriverInfo::GetDeviceVendor(VendorATI),
GfxDriverInfo::allDevices, GfxDriverInfo::allFeatures,
nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, DRIVER_LESS_THAN,
V(13, 15, 100, 1), "FEATURE_FAILURE_OLD_FGLRX", "fglrx 13.15.100.1");
}
return *sDriverInfo;
}
bool GfxInfo::DoesVendorMatch(const nsAString &aBlocklistVendor,
const nsAString &aAdapterVendor) {
if (mIsMesa &&
aBlocklistVendor.Equals(GfxDriverInfo::GetDeviceVendor(VendorMesaAll),
nsCaseInsensitiveStringComparator())) {
return true;
}
return GfxInfoBase::DoesVendorMatch(aBlocklistVendor, aAdapterVendor);
}
nsresult GfxInfo::GetFeatureStatusImpl(
int32_t aFeature, int32_t *aStatus, nsAString &aSuggestedDriverVersion,
const nsTArray<GfxDriverInfo> &aDriverInfo, nsACString &aFailureId,
@ -268,6 +339,13 @@ nsresult GfxInfo::GetFeatureStatusImpl(
GetData();
if (mGLMajorVersion == 0) {
// If we failed to get a GL version, glxtest failed.
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
aFailureId = "FEATURE_FAILURE_GLXTEST_FAILED";
return NS_OK;
}
if (mGLMajorVersion == 1) {
// We're on OpenGL 1. In most cases that indicates really old hardware.
// We better block them, rather than rely on them to fail gracefully,
@ -277,103 +355,13 @@ nsresult GfxInfo::GetFeatureStatusImpl(
return NS_OK;
}
// Don't evaluate any special cases if we're checking the downloaded
// blocklist.
if (!aDriverInfo.Length()) {
// Blacklist software GL implementations from using layers acceleration.
// On the test infrastructure, we'll force-enable layers acceleration.
if (aFeature == nsIGfxInfo::FEATURE_OPENGL_LAYERS &&
(mIsLlvmpipe || mIsOldSwrast) &&
!PR_GetEnv("MOZ_LAYERS_ALLOW_SOFTWARE_GL")) {
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
aFailureId = "FEATURE_FAILURE_SOFTWARE_GL";
return NS_OK;
}
if (aFeature == nsIGfxInfo::FEATURE_WEBRENDER) {
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_OS_VERSION;
aFailureId = "FEATURE_UNQUALIFIED_WEBRENDER_LINUX";
return NS_OK;
}
// Only check features relevant to Linux.
if (aFeature == nsIGfxInfo::FEATURE_OPENGL_LAYERS ||
aFeature == nsIGfxInfo::FEATURE_WEBGL_OPENGL ||
aFeature == nsIGfxInfo::FEATURE_WEBGL2 ||
aFeature == nsIGfxInfo::FEATURE_WEBGL_MSAA) {
// whitelist the linux test slaves' current configuration.
// this is necessary as they're still using the slightly outdated 190.42
// driver. this isn't a huge risk, as at least this is the exact setting
// in which we do continuous testing, and this only affects GeForce 9400
// cards on linux on this precise driver version, which is very few users.
// We do the same thing on Windows XP, see in widget/windows/GfxInfo.cpp
if (mIsNVIDIA && !strcmp(mRenderer.get(), "GeForce 9400/PCI/SSE2") &&
!strcmp(mVersion.get(), "3.2.0 NVIDIA 190.42")) {
*aStatus = nsIGfxInfo::FEATURE_STATUS_OK;
return NS_OK;
}
if (mIsMesa) {
if (mIsNouveau &&
version(mMajorVersion, mMinorVersion) < version(8, 0)) {
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
aFailureId = "FEATURE_FAILURE_MESA_1";
aSuggestedDriverVersion.AssignLiteral("Mesa 8.0");
} else if (version(mMajorVersion, mMinorVersion, mRevisionVersion) <
version(7, 10, 3)) {
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
aFailureId = "FEATURE_FAILURE_MESA_2";
aSuggestedDriverVersion.AssignLiteral("Mesa 7.10.3");
} else if (mIsOldSwrast) {
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
aFailureId = "FEATURE_FAILURE_SW_RAST";
} else if (mIsLlvmpipe &&
version(mMajorVersion, mMinorVersion) < version(9, 1)) {
// bug 791905, Mesa bug 57733, fixed in Mesa 9.1 according to
// https://bugs.freedesktop.org/show_bug.cgi?id=57733#c3
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
aFailureId = "FEATURE_FAILURE_MESA_3";
} else if (aFeature == nsIGfxInfo::FEATURE_WEBGL_MSAA) {
if (mIsIntel &&
version(mMajorVersion, mMinorVersion) < version(8, 1)) {
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
aFailureId = "FEATURE_FAILURE_MESA_4";
aSuggestedDriverVersion.AssignLiteral("Mesa 8.1");
}
}
} else if (mIsNVIDIA) {
if (version(mMajorVersion, mMinorVersion, mRevisionVersion) <
version(257, 21)) {
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
aFailureId = "FEATURE_FAILURE_OLD_NV";
aSuggestedDriverVersion.AssignLiteral("NVIDIA 257.21");
}
} else if (mIsFGLRX) {
// FGLRX does not report a driver version number, so we have the OpenGL
// version instead. by requiring OpenGL 3, we effectively require recent
// drivers.
if (version(mMajorVersion, mMinorVersion, mRevisionVersion) <
version(3, 0)) {
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
aFailureId = "FEATURE_FAILURE_OLD_FGLRX";
aSuggestedDriverVersion.AssignLiteral("<Something recent>");
}
// Bug 724640: FGLRX + Linux 2.6.32 is a crashy combo
bool unknownOS = mOS.IsEmpty() || mOSRelease.IsEmpty();
bool badOS =
mOS.Find("Linux", true) != -1 && mOSRelease.Find("2.6.32") != -1;
if (unknownOS || badOS) {
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_OS_VERSION;
aFailureId = "FEATURE_FAILURE_OLD_OS";
}
} else {
// like on windows, let's block unknown vendors. Think of virtual
// machines. Also, this case is hit whenever the GLXtest probe failed to
// get driver info or crashed.
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
}
}
// Blacklist software GL implementations from using layers acceleration.
// On the test infrastructure, we'll force-enable layers acceleration.
if (aFeature == nsIGfxInfo::FEATURE_OPENGL_LAYERS && !mIsAccelerated &&
!PR_GetEnv("MOZ_LAYERS_ALLOW_SOFTWARE_GL")) {
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
aFailureId = "FEATURE_FAILURE_SOFTWARE_GL";
return NS_OK;
}
return GfxInfoBase::GetFeatureStatusImpl(
@ -410,7 +398,8 @@ GfxInfo::GetAdapterDescription2(nsAString &aAdapterDescription) {
NS_IMETHODIMP
GfxInfo::GetAdapterRAM(nsAString &aAdapterRAM) {
aAdapterRAM.Truncate();
GetData();
CopyUTF8toUTF16(mAdapterRAM, aAdapterRAM);
return NS_OK;
}
@ -431,7 +420,7 @@ GfxInfo::GetAdapterDriver2(nsAString &aAdapterDriver) {
NS_IMETHODIMP
GfxInfo::GetAdapterDriverVersion(nsAString &aAdapterDriverVersion) {
GetData();
CopyASCIItoUTF16(mVersion, aAdapterDriverVersion);
CopyASCIItoUTF16(mDriverVersion, aAdapterDriverVersion);
return NS_OK;
}
@ -454,7 +443,7 @@ GfxInfo::GetAdapterDriverDate2(nsAString &aAdapterDriverDate) {
NS_IMETHODIMP
GfxInfo::GetAdapterVendorID(nsAString &aAdapterVendorID) {
GetData();
CopyUTF8toUTF16(mVendor, aAdapterVendorID);
CopyUTF8toUTF16(mVendorId, aAdapterVendorID);
return NS_OK;
}
@ -466,7 +455,7 @@ GfxInfo::GetAdapterVendorID2(nsAString &aAdapterVendorID) {
NS_IMETHODIMP
GfxInfo::GetAdapterDeviceID(nsAString &aAdapterDeviceID) {
GetData();
CopyUTF8toUTF16(mRenderer, aAdapterDeviceID);
CopyUTF8toUTF16(mDeviceId, aAdapterDeviceID);
return NS_OK;
}
@ -494,17 +483,23 @@ GfxInfo::GetIsGPU2Active(bool *aIsGPU2Active) { return NS_ERROR_FAILURE; }
// We don't support spoofing anything on Linux
NS_IMETHODIMP GfxInfo::SpoofVendorID(const nsAString &aVendorID) {
CopyUTF16toUTF8(aVendorID, mVendor);
GetData();
CopyUTF16toUTF8(aVendorID, mVendorId);
mIsAccelerated = !(mVendorId.EqualsLiteral("mesa/llvmpipe") ||
mVendorId.EqualsLiteral("mesa/softpipe") ||
mVendorId.EqualsLiteral("mesa/swrast"));
return NS_OK;
}
NS_IMETHODIMP GfxInfo::SpoofDeviceID(const nsAString &aDeviceID) {
CopyUTF16toUTF8(aDeviceID, mRenderer);
GetData();
CopyUTF16toUTF8(aDeviceID, mDeviceId);
return NS_OK;
}
NS_IMETHODIMP GfxInfo::SpoofDriverVersion(const nsAString &aDriverVersion) {
CopyUTF16toUTF8(aDriverVersion, mVersion);
GetData();
CopyUTF16toUTF8(aDriverVersion, mDriverVersion);
return NS_OK;
}
@ -513,6 +508,16 @@ NS_IMETHODIMP GfxInfo::SpoofOSVersion(uint32_t aVersion) {
return NS_OK;
}
NS_IMETHODIMP GfxInfo::FireTestProcess() {
// If the pid is zero, then we have never run the test process to query for
// driver information. This would normally be run on startup, but we need to
// manually invoke it for XPC shell tests.
if (glxtest_pid == 0) {
fire_glxtest_process();
}
return NS_OK;
}
#endif
} // end namespace widget

17
widget/GfxInfoX11.h
View File

@ -9,6 +9,7 @@
#define __GfxInfoX11_h__
#include "GfxInfoBase.h"
#include "nsString.h"
namespace mozilla {
namespace widget {
@ -60,17 +61,21 @@ class GfxInfo final : public GfxInfoBase {
OperatingSystem* aOS = nullptr) override;
virtual const nsTArray<GfxDriverInfo>& GetGfxDriverInfo() override;
virtual bool DoesVendorMatch(const nsAString& aBlocklistVendor,
const nsAString& aAdapterVendor) override;
private:
nsCString mVendor;
nsCString mRenderer;
nsCString mVersion;
nsCString mVendorId;
nsCString mDeviceId;
nsCString mDriverVersion;
nsCString mAdapterDescription;
nsCString mAdapterRAM;
nsCString mOS;
nsCString mOSRelease;
bool mIsMesa, mIsNVIDIA, mIsFGLRX, mIsNouveau, mIsIntel, mIsOldSwrast,
mIsLlvmpipe;
bool mHasTextureFromPixmap;
int mGLMajorVersion, mMajorVersion, mMinorVersion, mRevisionVersion;
unsigned int mGLMajorVersion, mGLMinorVersion;
bool mIsMesa;
bool mIsAccelerated;
void AddCrashReportAnnotations();
};

4
widget/android/GfxInfo.cpp
View File

@ -533,6 +533,10 @@ NS_IMETHODIMP GfxInfo::SpoofOSVersion(uint32_t aVersion) {
return NS_OK;
}
NS_IMETHODIMP GfxInfo::FireTestProcess() {
return NS_OK;
}
#endif
nsString GfxInfo::Model() {

5
widget/cocoa/GfxInfo.mm
View File

@ -354,4 +354,9 @@ NS_IMETHODIMP GfxInfo::SpoofOSVersion(uint32_t aVersion) {
return NS_OK;
}
/* void fireTestProcess (); */
NS_IMETHODIMP GfxInfo::FireTestProcess() {
return NS_OK;
}
#endif

5
widget/nsIGfxInfoDebug.idl
View File

@ -16,4 +16,9 @@ interface nsIGfxInfoDebug : nsISupports
void spoofDriverVersion(in AString aDriverVersion);
void spoofOSVersion(in unsigned long aVersion);
/* Manually invoke any test processes required to query for driver
information. This is used by XPC shell tests which do not run these queries
by default. */
void fireTestProcess();
};

4
widget/windows/GfxInfo.cpp
View File

@ -1827,4 +1827,8 @@ NS_IMETHODIMP GfxInfo::SpoofOSVersion(uint32_t aVersion) {
return NS_OK;
}
NS_IMETHODIMP GfxInfo::FireTestProcess() {
return NS_OK;
}
#endif