Bug 789597 - Should support correlation of profile with capture frames. r=joe
authorBenoit Girard <b56girard@gmail.com>
Mon, 17 Sep 2012 13:58:04 -0400
changeset 107254 318635207dcb85f5bc06e6f7428cdb3d509b81e7
parent 107253 52e0b6123f87c0bdb1c0d1c8cb21ac6384c248dc
child 107255 0e5d4fe0ba075225095b010313c7f624287920d4
push id14935
push userb56girard@gmail.com
push dateMon, 17 Sep 2012 18:02:27 +0000
treeherdermozilla-inbound@318635207dcb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoe
bugs789597
milestone18.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 789597 - Should support correlation of profile with capture frames. r=joe
gfx/layers/opengl/LayerManagerOGL.cpp
--- a/gfx/layers/opengl/LayerManagerOGL.cpp
+++ b/gfx/layers/opengl/LayerManagerOGL.cpp
@@ -753,16 +753,19 @@ LayerManagerOGL::RootLayer() const
 bool LayerManagerOGL::sDrawFPS = false;
 bool LayerManagerOGL::sFrameCounter = false;
 
 static uint16_t sFrameCount = 0;
 void
 FPSState::DrawFrameCounter(GLContext* context)
 {
   SAMPLER_FRAME_NUMBER(sFrameCount);
+
+  context->fEnable(LOCAL_GL_SCISSOR_TEST);
+
   uint16_t frameNumber = sFrameCount;
   for (size_t i = 0; i < 16; i++) {
     context->fScissor(3*i, 0, 3, 3);
 
     // We should do this using a single draw call
     // instead of 16 glClear()
     if ((frameNumber >> i) & 0x1) {
       context->fClearColor(0.0, 0.0, 0.0, 0.0);