diff options
| -rw-r--r-- | libs/surfaceflinger/LayerBase.cpp | 3 | ||||
| -rw-r--r-- | libs/ui/BufferMapper.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libs/surfaceflinger/LayerBase.cpp b/libs/surfaceflinger/LayerBase.cpp index a841ab3..fbce73d 100644 --- a/libs/surfaceflinger/LayerBase.cpp +++ b/libs/surfaceflinger/LayerBase.cpp @@ -461,7 +461,8 @@ void LayerBase::drawWithOpenGL(const Region& clip, const Texture& texture) const glRotatef(-90, 0, 0, 1); } - if (!(mFlags & DisplayHardware::NPOT_EXTENSION)) { + if (!(mFlags & (DisplayHardware::NPOT_EXTENSION | + DisplayHardware::DIRECT_TEXTURE))) { // find the smallest power-of-two that will accommodate our surface GLuint tw = 1 << (31 - clz(width)); GLuint th = 1 << (31 - clz(height)); diff --git a/libs/ui/BufferMapper.cpp b/libs/ui/BufferMapper.cpp index 92a9a86..4add8f9 100644 --- a/libs/ui/BufferMapper.cpp +++ b/libs/ui/BufferMapper.cpp @@ -65,7 +65,7 @@ status_t BufferMapper::lock(buffer_handle_t handle, { status_t err = mAllocMod->lock(mAllocMod, handle, usage, bounds.left, bounds.top, bounds.width(), bounds.height(), vaddr); - LOGW_IF(err, "unlock(...) failed %d (%s)", err, strerror(-err)); + LOGW_IF(err, "lock(...) failed %d (%s)", err, strerror(-err)); return err; } |