servo: Merge #19677 - Enable GPU queries by default when opening the profiler view (from glennw:wr-queries); r=pcwalton
authorGlenn Watson <github@intuitionlibrary.com>
Wed, 03 Jan 2018 14:13:42 -0600
changeset 449456 41cdad0f5ea33329a989570741ac3f027b29d464
parent 449455 355d6145c3976a9371a45c0e7c1258efcebec0f8
child 449457 135369dad06d140310cb0b6b68b95f85e78fb7e5
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspcwalton
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #19677 - Enable GPU queries by default when opening the profiler view (from glennw:wr-queries); r=pcwalton Source-Repo: https://github.com/servo/servo Source-Revision: cdf7c0ceff7edc4374521fb19329109f999a9c3b
servo/components/compositing/compositor.rs
--- a/servo/components/compositing/compositor.rs
+++ b/servo/components/compositing/compositor.rs
@@ -1519,19 +1519,27 @@ impl<Window: WindowMethods> IOCompositor
     pub fn pinch_zoom_level(&self) -> f32 {
         // TODO(gw): Access via WR.
         1.0
     }
 
     pub fn toggle_webrender_debug(&mut self, option: WebRenderDebugOption) {
         let mut flags = self.webrender.get_debug_flags();
         let flag = match option {
-            WebRenderDebugOption::Profiler => webrender::DebugFlags::PROFILER_DBG,
-            WebRenderDebugOption::TextureCacheDebug => webrender::DebugFlags::TEXTURE_CACHE_DBG,
-            WebRenderDebugOption::RenderTargetDebug => webrender::DebugFlags::RENDER_TARGET_DBG,
+            WebRenderDebugOption::Profiler => {
+                webrender::DebugFlags::PROFILER_DBG |
+                webrender::DebugFlags::GPU_TIME_QUERIES |
+                webrender::DebugFlags::GPU_SAMPLE_QUERIES
+            }
+            WebRenderDebugOption::TextureCacheDebug => {
+                webrender::DebugFlags::TEXTURE_CACHE_DBG
+            }
+            WebRenderDebugOption::RenderTargetDebug => {
+                webrender::DebugFlags::RENDER_TARGET_DBG
+            }
         };
         flags.toggle(flag);
         self.webrender.set_debug_flags(flags);
         self.webrender_api.generate_frame(self.webrender_document, None);
     }
 }
 
 /// Why we performed a composite. This is used for debugging.