Merge branch 'master' into honeycomb-release (8d5d2549) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/Layer.cpp

+10 −6

Original line number	Diff line number	Diff line
		@@ -253,6 +253,7 @@ void Layer::reloadTexture(const Region& dirty)
		} else {
		slowpath:
		GGLSurface t;
		if (buffer->usage & GRALLOC_USAGE_SW_READ_MASK) {
		status_t res = buffer->lock(&t, GRALLOC_USAGE_SW_READ_OFTEN);
		LOGE_IF(res, "error %d (%s) locking buffer %p",
		res, strerror(res), buffer.get());
		@@ -260,6 +261,9 @@ slowpath:
		mBufferManager.loadTexture(dirty, t);
		buffer->unlock();
		}
		} else {
		// we can't do anything
		}
		}
		}