Bug 729817 - Allow the Nouveau driver with Mesa >= 8.0.1 - r=bjacob
authorZack Weinberg <zackw@panix.com>
Thu, 08 Mar 2012 23:19:26 -0500
changeset 88611 46568dcbb76437bafc66f31a9d1d1f81cb6b21b3
parent 88610 ba47d55874eb0a13141d4e81b398646074e0c07d
child 88612 d40277ae0b5d584b1b052fa7bd239543ad236e7d
push id22208
push usermak77@bonardo.net
push dateFri, 09 Mar 2012 12:34:50 +0000
treeherdermozilla-central@ead9016b4102 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbjacob
bugs729817
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 729817 - Allow the Nouveau driver with Mesa >= 8.0.1 - r=bjacob
widget/xpwidgets/GfxInfoX11.cpp
--- a/widget/xpwidgets/GfxInfoX11.cpp
+++ b/widget/xpwidgets/GfxInfoX11.cpp
@@ -329,19 +329,19 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aF
           !strcmp(mRenderer.get(), "GeForce 9400/PCI/SSE2") &&
           !strcmp(mVersion.get(), "3.2.0 NVIDIA 190.42"))
       {
         *aStatus = nsIGfxInfo::FEATURE_NO_INFO;
         return NS_OK;
       }
 
       if (mIsMesa) {
-        if (mIsNouveau) {
+        if (mIsNouveau && version(mMajorVersion, mMinorVersion) < version(8,0)) {
           *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
-          aSuggestedDriverVersion.AssignLiteral("<Not the Nouveau driver>");
+          aSuggestedDriverVersion.AssignLiteral("Mesa 8.0");
         } else if (version(mMajorVersion, mMinorVersion, mRevisionVersion) < version(7,10,3)) {
           *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
           aSuggestedDriverVersion.AssignLiteral("Mesa 7.10.3");
         }
       } else if (mIsNVIDIA) {
         if (version(mMajorVersion, mMinorVersion, mRevisionVersion) < version(257,21)) {
           *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
           aSuggestedDriverVersion.AssignLiteral("NVIDIA 257.21");