diff options
author | Andreas Gampe <agampe@google.com> | 2014-11-22 00:35:09 +0000 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-11-22 00:35:09 +0000 |
commit | 64bb413a664001c95c8439cf097dc3033f4ed733 (patch) | |
tree | d4562f7bb5656865d32e5d684b5a41542ecfaf58 /libs/hwui/DeferredDisplayList.cpp | |
parent | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 (diff) | |
download | frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.zip frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.tar.gz frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.tar.bz2 |
Revert "resolved conflicts for merge of 220c3f4f to master"
Reverted as hwui doesn't agree.
This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.
Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a
Diffstat (limited to 'libs/hwui/DeferredDisplayList.cpp')
-rw-r--r-- | libs/hwui/DeferredDisplayList.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/hwui/DeferredDisplayList.cpp b/libs/hwui/DeferredDisplayList.cpp index d857bc6..ea1d714 100644 --- a/libs/hwui/DeferredDisplayList.cpp +++ b/libs/hwui/DeferredDisplayList.cpp @@ -55,7 +55,7 @@ public: virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) = 0; virtual ~Batch() {} virtual bool purelyDrawBatch() { return false; } - virtual bool coversBounds(const Rect& /* bounds */) { return false; } + virtual bool coversBounds(const Rect& bounds) { return false; } }; class DrawBatch : public Batch { @@ -91,7 +91,7 @@ public: return false; } - virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int /* index */) { + virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) { DEFER_LOGD("%d replaying DrawBatch %p, with %d ops (batch id %x, merge id %p)", index, this, mOps.size(), getBatchId(), getMergeId()); @@ -247,7 +247,7 @@ public: if (newClipSideFlags & kClipSide_Bottom) mClipRect.bottom = state->mClip.bottom; } - virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int /* index */) { + virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) { DEFER_LOGD("%d replaying MergingDrawBatch %p, with %d ops," " clip flags %x (batch id %x, merge id %p)", index, this, mOps.size(), mClipSideFlags, getBatchId(), getMergeId()); @@ -291,7 +291,7 @@ public: // creates a single operation batch StateOpBatch(const StateOp* op, const DeferredDisplayState* state) : mOp(op), mState(state) {} - virtual void replay(OpenGLRenderer& renderer, Rect& /* dirty */, int /* index */) { + virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) { DEFER_LOGD("replaying state op batch %p", this); renderer.restoreDisplayState(*mState); @@ -309,10 +309,10 @@ private: class RestoreToCountBatch : public Batch { public: - RestoreToCountBatch(const StateOp* /* op */, const DeferredDisplayState* state, - int restoreCount) : mState(state), mRestoreCount(restoreCount) {} + RestoreToCountBatch(const StateOp* op, const DeferredDisplayState* state, int restoreCount) : + mState(state), mRestoreCount(restoreCount) {} - virtual void replay(OpenGLRenderer& renderer, Rect& /* dirty */, int /* index */) { + virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) { DEFER_LOGD("batch %p restoring to count %d", this, mRestoreCount); renderer.restoreDisplayState(*mState); |