wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 724640 - Block FGLRX driver on Linux 2.6.32 kernel version - r=glandium

Browse Source
This commit is contained in:
Benoit Jacob 2012-04-02 09:02:00 -04:00
parent 0ce8f5b8a9
commit a450534b41
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
widget/xpwidgets/GfxInfoX11.cpp
View File

@ -41,6 +41,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <errno.h> #include <errno.h>
#include <sys/utsname.h>
#include "nsCRTGlue.h" #include "nsCRTGlue.h"
#include "prenv.h" #include "prenv.h"
@ -160,6 +161,15 @@ GfxInfo::GetData()
if (!strcmp(textureFromPixmap.get(), "TRUE")) if (!strcmp(textureFromPixmap.get(), "TRUE"))
mHasTextureFromPixmap = true; mHasTextureFromPixmap = true;
// only useful for Linux kernel version check for FGLRX driver.
// assumes X client == X server, which is sad.
utsname unameobj;
if (!uname(&unameobj))
{
mOS.Assign(unameobj.sysname);
mOSRelease.Assign(unameobj.release);
}
const char *spoofedVendor = PR_GetEnv("MOZ_GFX_SPOOF_GL_VENDOR"); const char *spoofedVendor = PR_GetEnv("MOZ_GFX_SPOOF_GL_VENDOR");
if (spoofedVendor) if (spoofedVendor)
mVendor.Assign(spoofedVendor); mVendor.Assign(spoofedVendor);
@ -169,11 +179,19 @@ GfxInfo::GetData()
const char *spoofedVersion = PR_GetEnv("MOZ_GFX_SPOOF_GL_VERSION"); const char *spoofedVersion = PR_GetEnv("MOZ_GFX_SPOOF_GL_VERSION");
if (spoofedVersion) if (spoofedVersion)
mVersion.Assign(spoofedVersion); mVersion.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 || if (error ||
mVendor.IsEmpty() || mVendor.IsEmpty() ||
mRenderer.IsEmpty() || mRenderer.IsEmpty() ||
mVersion.IsEmpty()) mVersion.IsEmpty() ||
mOS.IsEmpty() ||
mOSRelease.IsEmpty())
{ {
mAdapterDescription.AppendLiteral("GLXtest process failed"); mAdapterDescription.AppendLiteral("GLXtest process failed");
if (waiting_for_glxtest_process_failed) if (waiting_for_glxtest_process_failed)
@ -351,6 +369,14 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature,
// by requiring OpenGL 3, we effectively require recent drivers. // by requiring OpenGL 3, we effectively require recent drivers.
if (version(mMajorVersion, mMinorVersion, mRevisionVersion) < version(3, 0)) { if (version(mMajorVersion, mMinorVersion, mRevisionVersion) < version(3, 0)) {
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION; *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
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;
} }
} else { } else {
// like on windows, let's block unknown vendors. Think of virtual machines. // like on windows, let's block unknown vendors. Think of virtual machines.

2
widget/xpwidgets/GfxInfoX11.h
View File

@ -98,6 +98,8 @@ private:
nsCString mRenderer; nsCString mRenderer;
nsCString mVersion; nsCString mVersion;
nsCString mAdapterDescription; nsCString mAdapterDescription;
nsCString mOS;
nsCString mOSRelease;
bool mIsMesa, mIsNVIDIA, mIsFGLRX, mIsNouveau; bool mIsMesa, mIsNVIDIA, mIsFGLRX, mIsNouveau;
bool mHasTextureFromPixmap; bool mHasTextureFromPixmap;
int mGLMajorVersion, mMajorVersion, mMinorVersion, mRevisionVersion; int mGLMajorVersion, mMajorVersion, mMinorVersion, mRevisionVersion;