diff options
| author | 2012-01-06 15:54:37 -0800 | |
|---|---|---|
| committer | 2012-01-11 22:03:41 -0800 | |
| commit | 0db7590ed2785cfa8973dbcb6b93627ea02774ce (patch) | |
| tree | 4371c3f854095cee97dec40f23b7713c40c611f0 /services/surfaceflinger/SurfaceFlinger.cpp | |
| parent | 7e9a3706d9236be563341cf076ddd41098e161ea (diff) | |
remove dead/usnused code
Change-Id: I6fa2bc6ee01790abd2c1533f043d61a5e5c8d26e
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index bbb30b029649..42ae4088540c 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -41,7 +41,6 @@ #include <utils/StopWatch.h> #include <ui/GraphicBufferAllocator.h> -#include <ui/GraphicLog.h> #include <ui/PixelFormat.h> #include <pixelflinger/pixelflinger.h> @@ -431,21 +430,10 @@ bool SurfaceFlinger::threadLoop() const DisplayHardware& hw(graphicPlane(0).displayHardware()); if (CC_LIKELY(hw.canDraw())) { // repaint the framebuffer (if needed) - - const int index = hw.getCurrentBufferIndex(); - GraphicLog& logger(GraphicLog::getInstance()); - - logger.log(GraphicLog::SF_REPAINT, index); handleRepaint(); - // inform the h/w that we're done compositing - logger.log(GraphicLog::SF_COMPOSITION_COMPLETE, index); hw.compositionComplete(); - - logger.log(GraphicLog::SF_SWAP_BUFFERS, index); postFramebuffer(); - - logger.log(GraphicLog::SF_REPAINT_DONE, index); } else { // pretend we did the post hw.compositionComplete(); @@ -1097,23 +1085,6 @@ void SurfaceFlinger::drawWormhole() const } } -void SurfaceFlinger::debugShowFPS() const -{ - static int mFrameCount; - static int mLastFrameCount = 0; - static nsecs_t mLastFpsTime = 0; - static float mFps = 0; - mFrameCount++; - nsecs_t now = systemTime(); - nsecs_t diff = now - mLastFpsTime; - if (diff > ms2ns(250)) { - mFps = ((mFrameCount - mLastFrameCount) * float(s2ns(1))) / diff; - mLastFpsTime = now; - mLastFrameCount = mFrameCount; - } - // XXX: mFPS has the value we want - } - status_t SurfaceFlinger::addLayer(const sp<LayerBase>& layer) { Mutex::Autolock _l(mStateLock); @@ -1707,11 +1678,6 @@ status_t SurfaceFlinger::onTransact( setTransactionFlags(eTransactionNeeded|eTraversalNeeded); return NO_ERROR; } - case 1006:{ // enable/disable GraphicLog - int enabled = data.readInt32(); - GraphicLog::getInstance().setEnabled(enabled); - return NO_ERROR; - } case 1008: // toggle use of hw composer n = data.readInt32(); mDebugDisableHWC = n ? 1 : 0; |