Backed out 7 changesets (bug 1510490) for Btup bustages CLOSED TREE

Backed out changeset f9d8e4ebe0a2 (bug 1510490) Backed out changeset 55fa8c9b0c7e (bug 1510490) Backed out changeset ee215fdef53f (bug 1510490) Backed out changeset c02d08e9dd38 (bug 1510490) Backed out changeset 6fafd118a82a (bug 1510490) Backed out changeset 094544e620e1 (bug 1510490) Backed out changeset 96e1ddc0637b (bug 1510490)
Brli · Dec 1, 2018 · 675011e · 675011e
1 parent 101c3df
commit 675011e
Show file tree

Hide file tree

Showing 15 changed files with 351 additions and 558 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
@@ -704,7 +704,6 @@ WebRenderMemoryReporter::CollectReports(nsIHandleReportCallback* aHandleReport,
         helper.Report(aReport.images, "resource-cache/images");
         helper.Report(aReport.rasterized_blobs,
                       "resource-cache/rasterized-blobs");
-        helper.Report(aReport.shader_cache, "shader-cache");
 
         // GPU Memory.
         helper.ReportTexture(aReport.gpu_cache_textures, "gpu-cache");
@@ -714,6 +713,9 @@ WebRenderMemoryReporter::CollectReports(nsIHandleReportCallback* aHandleReport,
         helper.ReportTexture(aReport.depth_target_textures, "depth-targets");
         helper.ReportTexture(aReport.swap_chain, "swap-chains");
 
+        // Total GPU bytes, for sanity-checking the above.
+        helper.ReportTotalGPUBytes(aReport.total_gpu_bytes_allocated);
+
         FinishAsyncMemoryReport();
       },
       [](mozilla::ipc::ResponseRejectReason aReason) {

diff --git a/gfx/webrender_bindings/RenderThread.cpp b/gfx/webrender_bindings/RenderThread.cpp
@@ -30,8 +30,6 @@ using namespace mozilla;
 
 static already_AddRefed<gl::GLContext> CreateGLContext();
 
-MOZ_DEFINE_MALLOC_SIZE_OF(WebRenderRendererMallocSizeOf)
-
 namespace mozilla {
 namespace wr {
 
@@ -130,18 +128,14 @@ void RenderThread::DoAccumulateMemoryReport(
     MemoryReport aReport,
     const RefPtr<MemoryReportPromise::Private>& aPromise) {
   MOZ_ASSERT(IsInRenderThread());
+  MOZ_ASSERT(aReport.total_gpu_bytes_allocated == 0);
 
   for (auto& r : mRenderers) {
     r.second->AccumulateMemoryReport(&aReport);
   }
 
-  // Note memory used by the shader cache, which is shared across all WR
-  // instances.
-  MOZ_ASSERT(aReport.shader_cache == 0);
-  if (mProgramCache) {
-    aReport.shader_cache = wr_program_cache_report_memory(
-        mProgramCache->Raw(), &WebRenderRendererMallocSizeOf);
-  }
+  // Note total gpu bytes allocated across all WR instances.
+  aReport.total_gpu_bytes_allocated += wr_total_gpu_bytes_allocated();
 
   aPromise->Resolve(aReport, __func__);
 }

diff --git a/gfx/webrender_bindings/RendererOGL.cpp b/gfx/webrender_bindings/RendererOGL.cpp
@@ -208,6 +208,7 @@ void RendererOGL::AccumulateMemoryReport(MemoryReport* aReport) {
                             BytesPerPixel(SurfaceFormat::B8G8R8A8) *
                             (mCompositor->UseTripleBuffering() ? 3 : 2);
   aReport->swap_chain += swapChainSize;
+  aReport->total_gpu_bytes_allocated += swapChainSize;
 }
 
 static void DoNotifyWebRenderError(layers::CompositorBridgeParent* aBridge,

diff --git a/gfx/webrender_bindings/src/bindings.rs b/gfx/webrender_bindings/src/bindings.rs
@@ -675,6 +675,11 @@ pub unsafe extern "C" fn wr_renderer_accumulate_memory_report(renderer: &mut Ren
     *report += renderer.report_memory();
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn wr_total_gpu_bytes_allocated() -> usize {
+    ::webrender::total_gpu_bytes_allocated()
+}
+
 // cbindgen doesn't support tuples, so we have a little struct instead, with
 // an Into implementation to convert from the tuple to the struct.
 #[repr(C)]
@@ -2794,11 +2799,3 @@ pub unsafe extern "C" fn wr_shaders_delete(shaders: *mut WrShaders, gl_context:
     }
     // let shaders go out of scope and get dropped
 }
-
-#[no_mangle]
-pub unsafe extern "C" fn wr_program_cache_report_memory(
-    cache: *const WrProgramCache,
-    size_of_op: VoidPtrToSizeFn,
-    ) -> usize {
-    (*cache).program_cache.report_memory(size_of_op)
-}