ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage bits" into gingerbread

Browse Source 
Merge commit '8eb16af29303cda190133a1d220b9ecd9341e261' into gingerbread-plus-aosp

* commit '8eb16af29303cda190133a1d220b9ecd9341e261':
  don't try to lock a buffer that wasn't allocated with SW usage bits
This commit is contained in:
Mathias Agopian 2010-08-25 12:17:19 -07:00 committed by Android Git Automerger
commit 2091772e7c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
services/surfaceflinger/Layer.cpp
View File

@ -196,12 +196,16 @@ void Layer::reloadTexture(const Region& dirty)
} else { } else {
slowpath: slowpath:
GGLSurface t; GGLSurface t;
status_t res = buffer->lock(&t, GRALLOC_USAGE_SW_READ_OFTEN); if (buffer->usage & GRALLOC_USAGE_SW_READ_MASK) {
LOGE_IF(res, "error %d (%s) locking buffer %p", status_t res = buffer->lock(&t, GRALLOC_USAGE_SW_READ_OFTEN);
res, strerror(res), buffer.get()); LOGE_IF(res, "error %d (%s) locking buffer %p",
if (res == NO_ERROR) { res, strerror(res), buffer.get());
mBufferManager.loadTexture(dirty, t); if (res == NO_ERROR) {
buffer->unlock(); mBufferManager.loadTexture(dirty, t);
buffer->unlock();
}
} else {
// we can't do anything
} }
} }
} }