Bug 1395327 - Disable webrender samplers, as they're causing MacOS to crash. r?kats draft
authorAlexis Beingessner <a.beingessner@gmail.com>
Thu, 31 Aug 2017 14:52:29 -0400
changeset 656839 619e355a4a6bd27229ced88af90bcd355183d3ac
parent 656783 4984da22242841a5d84c4e5fd866e93a450d9723
child 729251 faf5342141c1396f0a69684776703e8997d79bd8
push id77333
push userbmo:a.beingessner@gmail.com
push dateThu, 31 Aug 2017 18:53:34 +0000
reviewerskats
bugs1395327
milestone57.0a1
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);