Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build breakage

Browse Source 
Change-Id: Ib3904c4be5b7df0f6d02f92d63f056968243621d
This commit is contained in:
John Reck
2014-12-12 07:22:19 -08:00
parent 7fc885b0bf
commit a7c24b439e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/DisplayListOp.h
View File

@@ -720,7 +720,7 @@ public:
virtual const char* name() { return "DrawBitmap"; } virtual const char* name() { return "DrawBitmap"; }
virtual void onDefer(OpenGLRenderer& /* renderer */, DeferInfo& deferInfo, virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
const DeferredDisplayState& state) { const DeferredDisplayState& state) {
deferInfo.batchId = DeferredDisplayList::kOpBatch_Bitmap; deferInfo.batchId = DeferredDisplayList::kOpBatch_Bitmap;
deferInfo.mergeId = getAtlasEntry(renderer) ? deferInfo.mergeId = getAtlasEntry(renderer) ?
@@ -954,7 +954,7 @@ public:
virtual const char* name() { return "DrawPatch"; } virtual const char* name() { return "DrawPatch"; }
virtual void onDefer(OpenGLRenderer& /* renderer */, DeferInfo& deferInfo, virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
const DeferredDisplayState& state) { const DeferredDisplayState& state) {
deferInfo.batchId = DeferredDisplayList::kOpBatch_Patch; deferInfo.batchId = DeferredDisplayList::kOpBatch_Patch;
deferInfo.mergeId = getAtlasEntry(renderer) ? (mergeid_t) mEntry->getMergeId() : (mergeid_t) mBitmap; deferInfo.mergeId = getAtlasEntry(renderer) ? (mergeid_t) mEntry->getMergeId() : (mergeid_t) mBitmap;