diff options
| author | Mathias Agopian <mathias@google.com> | 2009-08-11 22:34:02 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-08-11 23:44:13 -0700 |
| commit | 2ec8458c5fd5b1bfad2d6e16b606f5acbcfa34cc (patch) | |
| tree | 2b81d3ecbac6fa27ca3c232f695445982d3727f0 | |
| parent | 5cec4742b3a1d7448bd32ae57cb4cf70b484c64c (diff) | |
| download | frameworks_base-2ec8458c5fd5b1bfad2d6e16b606f5acbcfa34cc.zip frameworks_base-2ec8458c5fd5b1bfad2d6e16b606f5acbcfa34cc.tar.gz frameworks_base-2ec8458c5fd5b1bfad2d6e16b606f5acbcfa34cc.tar.bz2 | |
second take, hopefully this time it doesn't break one of the builds: "SurfaceFlinger will now allocate buffers based on the usage specified by the clients. This allows to allocate the right kind of buffer automatically, without having the user to specify anything."
| -rw-r--r-- | libs/surfaceflinger/LayerBuffer.cpp | 1 | ||||
| -rw-r--r-- | libs/surfaceflinger/LayerDim.cpp | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libs/surfaceflinger/LayerBuffer.cpp b/libs/surfaceflinger/LayerBuffer.cpp index e1f4bea..bd6d472 100644 --- a/libs/surfaceflinger/LayerBuffer.cpp +++ b/libs/surfaceflinger/LayerBuffer.cpp @@ -467,7 +467,6 @@ void LayerBuffer::BufferSource::onDraw(const Region& clip) const mTempBitmap.clear(); mTempBitmap = new android::Buffer( tmp_w, tmp_h, src.img.format, - BufferAllocator::USAGE_HW_TEXTURE | BufferAllocator::USAGE_HW_2D); err = mTempBitmap->initCheck(); } diff --git a/libs/surfaceflinger/LayerDim.cpp b/libs/surfaceflinger/LayerDim.cpp index 6ebb49f..f613767 100644 --- a/libs/surfaceflinger/LayerDim.cpp +++ b/libs/surfaceflinger/LayerDim.cpp @@ -71,8 +71,7 @@ void LayerDim::initDimmer(SurfaceFlinger* flinger, uint32_t w, uint32_t h) // TODO: api to pass the usage flags sp<Buffer> buffer = new Buffer(w, h, PIXEL_FORMAT_RGB_565, BufferAllocator::USAGE_SW_WRITE_OFTEN | - BufferAllocator::USAGE_HW_TEXTURE | - BufferAllocator::USAGE_HW_2D); + BufferAllocator::USAGE_HW_TEXTURE); android_native_buffer_t* clientBuf = buffer->getNativeBuffer(); @@ -97,7 +96,7 @@ void LayerDim::initDimmer(SurfaceFlinger* flinger, uint32_t w, uint32_t h) // initialize the texture with zeros GGLSurface t; - buffer->lock(&t, GRALLOC_USAGE_SW_READ_NEVER | GRALLOC_USAGE_SW_WRITE_OFTEN); + buffer->lock(&t, GRALLOC_USAGE_SW_WRITE_OFTEN); memset(t.data, 0, t.stride * t.height * 2); buffer->unlock(); sUseTexture = true; |