From ca9a2f4f6f90cb65bd36a5381db602e8ea5cc17b Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Tue, 5 Nov 2013 14:01:24 -0800 Subject: [PATCH] Bug 917496 - Disable GPUAdapterReporter because its values are frequently bogus. r=Hughman. --HG-- extra : rebase_source : ae3bbbc142dfcf7101aaac94acc52e67e68e97fd --- gfx/thebes/d3dkmtQueryStatistics.h | 3 +++ gfx/thebes/gfxWindowsPlatform.cpp | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gfx/thebes/d3dkmtQueryStatistics.h b/gfx/thebes/d3dkmtQueryStatistics.h index 03c6601517c..9305f1dbddb 100644 --- a/gfx/thebes/d3dkmtQueryStatistics.h +++ b/gfx/thebes/d3dkmtQueryStatistics.h @@ -6,6 +6,9 @@ * Windows 8 RC SDK. The work for this file itself was based on the one in ProcessHacker at * http://processhacker.svn.sourceforge.net/viewvc/processhacker/2.x/trunk/plugins/ExtendedTools/d3dkmt.h?revision=4758&view=markup * For more details see Mozilla Bug 689870. + * [Bug 917496 indicates that some of these structs may not match reality, and + * therefore should not be trusted. See the reference to bug 917496 in + * gfxWindowsPlatform.cpp.] */ typedef struct _D3DKMTQS_COUNTER diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index a82943cedc5..89118141670 100644 --- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -385,13 +385,16 @@ gfxWindowsPlatform::gfxWindowsPlatform() UpdateRenderMode(); - mGPUAdapterReporter = new GPUAdapterReporter(); - NS_RegisterMemoryReporter(mGPUAdapterReporter); + // This reporter is disabled because it frequently gives bogus values. See + // bug 917496. + //mGPUAdapterReporter = new GPUAdapterReporter(); + //NS_RegisterMemoryReporter(mGPUAdapterReporter); + mGPUAdapterReporter = nullptr; } gfxWindowsPlatform::~gfxWindowsPlatform() { - NS_UnregisterMemoryReporter(mGPUAdapterReporter); + //NS_UnregisterMemoryReporter(mGPUAdapterReporter); mDeviceManager = nullptr;