diff options
Diffstat (limited to 'services')
4 files changed, 0 insertions, 42 deletions
diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp index cf131b1..438a6da 100644 --- a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp +++ b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp @@ -384,10 +384,6 @@ status_t DisplayHardware::compositionComplete() const { return mNativeWindow->compositionComplete(); } -int DisplayHardware::getCurrentBufferIndex() const { - return mNativeWindow->getCurrentBufferIndex(); -} - void DisplayHardware::flip(const Region& dirty) const { checkGLErrors(); diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardware.h b/services/surfaceflinger/DisplayHardware/DisplayHardware.h index 45d4b45..77da272 100644 --- a/services/surfaceflinger/DisplayHardware/DisplayHardware.h +++ b/services/surfaceflinger/DisplayHardware/DisplayHardware.h @@ -93,9 +93,6 @@ public: } inline Rect bounds() const { return getBounds(); } - // only for debugging - int getCurrentBufferIndex() const; - private: void init(uint32_t displayIndex) __attribute__((noinline)); void fini() __attribute__((noinline)); diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index bbb30b0..42ae408 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; diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index ffd3ac9..7f6c90c 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -335,7 +335,6 @@ private: status_t electronBeamOnAnimationImplLocked(); void debugFlashRegions(); - void debugShowFPS() const; void drawWormhole() const; |