diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-31 09:45:25 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-31 09:45:25 +0200 |
commit | 2d4ff8df91414b42974c72b2870f5c6e9ad397a8 (patch) | |
tree | 15b23dc6494a147e723cfdb3765be1568cf6c113 /gfx/thebes | |
parent | f4b8be889cb7ee31a62af5660f36aaa192599009 (diff) | |
parent | 14eb8dc7bee8670e39d1199591d335579601f2ad (diff) | |
download | UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.gz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.lz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.xz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.zip |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'gfx/thebes')
-rw-r--r-- | gfx/thebes/ContextStateTracker.cpp | 12 | ||||
-rw-r--r-- | gfx/thebes/DeviceManagerDx.cpp | 2 | ||||
-rw-r--r-- | gfx/thebes/DeviceManagerDx.h | 2 | ||||
-rw-r--r-- | gfx/thebes/gfxPlatform.cpp | 2 | ||||
-rwxr-xr-x | gfx/thebes/gfxWindowsPlatform.cpp | 7 | ||||
-rw-r--r-- | gfx/thebes/gfxWindowsPlatform.h | 1 |
6 files changed, 0 insertions, 26 deletions
diff --git a/gfx/thebes/ContextStateTracker.cpp b/gfx/thebes/ContextStateTracker.cpp index e3659e5fc..a179abad9 100644 --- a/gfx/thebes/ContextStateTracker.cpp +++ b/gfx/thebes/ContextStateTracker.cpp @@ -5,9 +5,6 @@ #include "ContextStateTracker.h" #include "GLContext.h" -#ifdef MOZ_ENABLE_PROFILER_SPS -#include "ProfilerMarkers.h" -#endif namespace mozilla { @@ -110,15 +107,6 @@ ContextStateTrackerOGL::Flush(GLContext* aGL) aGL->fDeleteQueries(1, &handle); -#ifdef MOZ_ENABLE_PROFILER_SPS - PROFILER_MARKER_PAYLOAD("gpu_timer_query", new GPUMarkerPayload( - mCompletedSections[0].mCpuTimeStart, - mCompletedSections[0].mCpuTimeEnd, - 0, - gpuTime - )); -#endif - mCompletedSections.RemoveElementAt(0); } } diff --git a/gfx/thebes/DeviceManagerDx.cpp b/gfx/thebes/DeviceManagerDx.cpp index c194f40f2..2f2693c76 100644 --- a/gfx/thebes/DeviceManagerDx.cpp +++ b/gfx/thebes/DeviceManagerDx.cpp @@ -389,7 +389,6 @@ DeviceManagerDx::CreateDevice(IDXGIAdapter* aAdapter, void DeviceManagerDx::CreateWARPCompositorDevice() { - ScopedGfxFeatureReporter reporterWARP("D3D11-WARP", gfxPrefs::LayersD3D11ForceWARP()); FeatureState& d3d11 = gfxConfig::GetFeature(Feature::D3D11_COMPOSITING); HRESULT hr; @@ -434,7 +433,6 @@ DeviceManagerDx::CreateWARPCompositorDevice() } mCompositorDevice->SetExceptionMode(0); - reporterWARP.SetSuccessful(); } FeatureStatus diff --git a/gfx/thebes/DeviceManagerDx.h b/gfx/thebes/DeviceManagerDx.h index ea6dd4846..e29ab0731 100644 --- a/gfx/thebes/DeviceManagerDx.h +++ b/gfx/thebes/DeviceManagerDx.h @@ -34,8 +34,6 @@ struct ID3D11Device; struct IDirectDraw7; namespace mozilla { -class ScopedGfxFeatureReporter; - namespace gfx { class FeatureState; diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp index 4db7bc29f..684117788 100644 --- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -18,7 +18,6 @@ #include "mozilla/Logging.h" #include "mozilla/Services.h" -#include "gfxCrashReporterUtils.h" #include "gfxPlatform.h" #include "gfxPrefs.h" #include "gfxEnv.h" @@ -650,7 +649,6 @@ gfxPlatform::Init() gfxPrefs::CanvasAzureAccelerated(), gfxPrefs::DisableGralloc(), gfxPrefs::ForceShmemTiles()); - ScopedGfxFeatureReporter::AppNote(forcedPrefs); } InitMoz2DLogging(); diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index c68f622c6..a988859eb 100755 --- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -33,8 +33,6 @@ #include "nsIGfxInfo.h" -#include "gfxCrashReporterUtils.h" - #include "gfxGDIFontList.h" #include "gfxGDIFont.h" @@ -400,7 +398,6 @@ gfxWindowsPlatform::InitDWriteSupport() return false; } - mozilla::ScopedGfxFeatureReporter reporter("DWrite"); decltype(DWriteCreateFactory)* createDWriteFactory = (decltype(DWriteCreateFactory)*) GetProcAddress(LoadLibraryW(L"dwrite.dll"), "DWriteCreateFactory"); if (!createDWriteFactory) { @@ -422,7 +419,6 @@ gfxWindowsPlatform::InitDWriteSupport() Factory::SetDWriteFactory(mDWriteFactory); SetupClearTypeParams(); - reporter.SetSuccessful(); return true; } @@ -1569,8 +1565,6 @@ gfxWindowsPlatform::InitializeD2DConfig() void gfxWindowsPlatform::InitializeD2D() { - ScopedGfxFeatureReporter d2d1_1("D2D1.1"); - FeatureState& d2d1 = gfxConfig::GetFeature(Feature::DIRECT2D); DeviceManagerDx* dm = DeviceManagerDx::Get(); @@ -1621,7 +1615,6 @@ gfxWindowsPlatform::InitializeD2D() } MOZ_ASSERT(d2d1.IsEnabled()); - d2d1_1.SetSuccessful(); } bool diff --git a/gfx/thebes/gfxWindowsPlatform.h b/gfx/thebes/gfxWindowsPlatform.h index f77d9a87a..f401038fc 100644 --- a/gfx/thebes/gfxWindowsPlatform.h +++ b/gfx/thebes/gfxWindowsPlatform.h @@ -13,7 +13,6 @@ */ #include "cairo-win32.h" -#include "gfxCrashReporterUtils.h" #include "gfxFontUtils.h" #include "gfxWindowsSurface.h" #include "gfxFont.h" |