diff options
| author | 2016-01-11 19:28:17 -0800 | |
|---|---|---|
| committer | 2016-01-11 19:28:19 -0800 | |
| commit | b250a834e433b4f483e8d8362a6fda8d6594c7b8 (patch) | |
| tree | 4effddedd8fe6ad96acfa03853761dc537d6ec6c | |
| parent | ae10e1368c78034e0fd88010220d6e5e684a2f3a (diff) | |
Fix deep copy of entry queue
also fixes several 64 bit compilation issues
Change-Id: I1825f822d02be72c21bdcd07cefa68217856ddc2
| -rw-r--r-- | libs/hwui/FrameReorderer.cpp | 4 | ||||
| -rw-r--r-- | libs/hwui/LayerReorderer.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/LayerUpdateQueue.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libs/hwui/FrameReorderer.cpp b/libs/hwui/FrameReorderer.cpp index 4bfc0b413c56..f492c7d6b679 100644 --- a/libs/hwui/FrameReorderer.cpp +++ b/libs/hwui/FrameReorderer.cpp @@ -452,7 +452,7 @@ void FrameReorderer::deferBitmapOp(const BitmapOp& op) { && PaintUtils::getXfermodeDirect(op.paint) == SkXfermode::kSrcOver_Mode && op.bitmap->colorType() != kAlpha_8_SkColorType && hasMergeableClip(*bakedState)) { - mergeid_t mergeId = (mergeid_t) op.bitmap->getGenerationID(); + mergeid_t mergeId = reinterpret_cast<mergeid_t>(op.bitmap->getGenerationID()); // TODO: AssetAtlas in mergeId currentLayer().deferMergeableOp(mAllocator, bakedState, OpBatchType::Bitmap, mergeId); } else { @@ -509,7 +509,7 @@ void FrameReorderer::deferPatchOp(const PatchOp& op) { if (bakedState->computedState.transform.isPureTranslate() && PaintUtils::getXfermodeDirect(op.paint) == SkXfermode::kSrcOver_Mode && hasMergeableClip(*bakedState)) { - mergeid_t mergeId = (mergeid_t) op.bitmap->getGenerationID(); + mergeid_t mergeId = reinterpret_cast<mergeid_t>(op.bitmap->getGenerationID()); // TODO: AssetAtlas in mergeId // Only use the MergedPatch batchId when merged, so Bitmap+Patch don't try to merge together diff --git a/libs/hwui/LayerReorderer.cpp b/libs/hwui/LayerReorderer.cpp index 9a17e9349e56..946897b87b45 100644 --- a/libs/hwui/LayerReorderer.cpp +++ b/libs/hwui/LayerReorderer.cpp @@ -53,7 +53,7 @@ public: void dump() const { ALOGD(" Batch %p, id %d, merging %d, count %d, bounds " RECT_STRING, - this, mBatchId, mMerging, mOps.size(), RECT_ARGS(mBounds)); + this, mBatchId, mMerging, (int) mOps.size(), RECT_ARGS(mBounds)); } protected: batchid_t mBatchId; diff --git a/libs/hwui/LayerUpdateQueue.h b/libs/hwui/LayerUpdateQueue.h index be612d2a15e7..5b1a8543dd0d 100644 --- a/libs/hwui/LayerUpdateQueue.h +++ b/libs/hwui/LayerUpdateQueue.h @@ -42,7 +42,7 @@ public: LayerUpdateQueue() {} void enqueueLayerWithDamage(RenderNode* renderNode, Rect dirty); void clear(); - const std::vector<Entry> entries() const { return mEntries; } + const std::vector<Entry>& entries() const { return mEntries; } private: std::vector<Entry> mEntries; }; |