Bug 1395327 - Disable webrender samplers, as they're causing MacOS to crash. r=kats
authorAlexis Beingessner <a.beingessner@gmail.com>
Thu, 31 Aug 2017 14:52:29 -0400
changeset 378030 3ba255876335c727a546dca2f6c0c48576c6e538
parent 378029 4f95bb8143aa3a4d43aca222753bd6aeee1d9394
child 378031 4c74a9958b31e99aef1e43b05efd7c48d057d595
push id50161
push userkgupta@mozilla.com
push dateThu, 31 Aug 2017 19:34:19 +0000
treeherderautoland@3ba255876335 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1395327
milestone57.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
Bug 1395327 - Disable webrender samplers, as they're causing MacOS to crash. r=kats MozReview-Commit-ID: EU599EOaZZ7
gfx/webrender/src/device.rs
--- a/gfx/webrender/src/device.rs
+++ b/gfx/webrender/src/device.rs
@@ -564,29 +564,33 @@ impl<T> GpuFrameProfile<T> {
         if let Some(query) = self.timers.add(GpuTimer { tag, time_ns: 0 }) {
             self.gl.begin_query(gl::TIME_ELAPSED, query);
         }
 
         marker
     }
 
     fn done_sampler(&mut self) {
+        /* FIXME: samplers crash on MacOS
         debug_assert!(self.inside_frame);
         if self.samplers.pending != 0 {
             self.gl.end_query(gl::SAMPLES_PASSED);
             self.samplers.pending = 0;
         }
+        */
     }
 
-    fn add_sampler(&mut self, tag: T) where T: NamedTag {
+    fn add_sampler(&mut self, _tag: T) where T: NamedTag {
+        /* FIXME: samplers crash on MacOS
         self.done_sampler();
 
         if let Some(query) = self.samplers.add(GpuSampler { tag, count: 0 }) {
             self.gl.begin_query(gl::SAMPLES_PASSED, query);
         }
+        */
     }
 
     fn is_valid(&self) -> bool {
         !self.timers.set.is_empty() || !self.samplers.set.is_empty()
     }
 
     fn build_samples(&mut self) -> (Vec<GpuTimer<T>>, Vec<GpuSampler<T>>) {
         debug_assert!(!self.inside_frame);