Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout dd81ac5bb79d (Bug 703484) for regressing OMTC OGL on Mac.

Browse Source
This commit is contained in:
Benoit Girard 2012-06-06 11:23:39 -04:00
parent 28be7e7827
commit cab4271026
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
widget/android/GfxInfo.cpp
View File

@ -255,17 +255,14 @@ GfxInfo::GetGfxDriverInfo()
/* The following entry, when uncommented, will allow us to whitelist a
* specific device. See the long comment in GetFeatureStatusImpl for more
* info. */
#ifdef MOZ_JAVA_COMPOSITOR
APPEND_TO_DRIVER_BLOCKLIST2( DRIVER_OS_ALL,
(nsAString&) GfxDriverInfo::GetDeviceVendor(VendorAll), GfxDriverInfo::allDevices,
nsIGfxInfo::FEATURE_OPENGL_LAYERS, nsIGfxInfo::FEATURE_NO_INFO,
DRIVER_COMPARISON_IGNORED, GfxDriverInfo::allDriverVersions );
#else
// APPEND_TO_DRIVER_BLOCKLIST( DRIVER_OS_ALL,
// my_vendor_id, my_device_id,
// nsIGfxInfo::FEATURE_OPENGL_LAYERS, nsIGfxInfo::FEATURE_NO_INFO,
// DRIVER_LESS_THAN, GfxDriverInfo::allDevices );
APPEND_TO_DRIVER_BLOCKLIST2( DRIVER_OS_ALL,
(nsAString&) GfxDriverInfo::GetDeviceVendor(VendorAll), GfxDriverInfo::allDevices,
nsIGfxInfo::FEATURE_OPENGL_LAYERS, nsIGfxInfo::FEATURE_BLOCKED_DEVICE,
DRIVER_LESS_THAN, GfxDriverInfo::allDriverVersions );
#endif
}
return *mDriverInfo;
}
@ -284,7 +281,7 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature,
if (aOS)
*aOS = os;
// Don't evaluate special cases when evaluating the downloaded blocklist.
// Don't evaluate special cases when evaluating the downlaoded blocklist.
if (!aDriverInfo.Length()) {
if (aFeature == FEATURE_OPENGL_LAYERS) {
/* The following code is an old way to whitelist devices when we're ready.

4
widget/android/nsWindow.cpp
View File

@ -689,9 +689,6 @@ nsWindow::GetLayerManager(PLayersChild*, LayersBackend, LayerManagerPersistence,
mLayerManager = CreateBasicLayerManager();
return mLayerManager;
}
mUseAcceleratedRendering = GetShouldAccelerate();
#ifdef MOZ_JAVA_COMPOSITOR
bool useCompositor = UseOffMainThreadCompositing();
@ -706,6 +703,7 @@ nsWindow::GetLayerManager(PLayersChild*, LayersBackend, LayerManagerPersistence,
sFailedToCreateGLContext = true;
}
#endif
mUseAcceleratedRendering = GetShouldAccelerate();
if (!mUseAcceleratedRendering ||
sFailedToCreateGLContext)