diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-06 20:46:37 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-06 20:46:37 -0400 |
| commit | 9d6a685ba939f413a8d3e1e97627593aa1cdf6cb (patch) | |
| tree | cec0f6e25b6e30ac8d4345875ce281a3f0f705ad /libs/surfaceflinger/LayerDim.cpp | |
| parent | fe7c2a50148ac9f0d6fbe0030fc53f457c10870a (diff) | |
| parent | 351a7073fb60eb3534ec8c69ab263f057a124500 (diff) | |
| download | frameworks_base-9d6a685ba939f413a8d3e1e97627593aa1cdf6cb.zip frameworks_base-9d6a685ba939f413a8d3e1e97627593aa1cdf6cb.tar.gz frameworks_base-9d6a685ba939f413a8d3e1e97627593aa1cdf6cb.tar.bz2 | |
Merge changes I430cf57b,I51f02f67,I464f13f3 into eclair
* changes:
fix [2168528] enable glTexImage2D code path in SF for software-only buffers
fix [2168531] have software-only gralloc buffer side-step the HAL
fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
Diffstat (limited to 'libs/surfaceflinger/LayerDim.cpp')
| -rw-r--r-- | libs/surfaceflinger/LayerDim.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/surfaceflinger/LayerDim.cpp b/libs/surfaceflinger/LayerDim.cpp index 8ba0a9d..538dc77 100644 --- a/libs/surfaceflinger/LayerDim.cpp +++ b/libs/surfaceflinger/LayerDim.cpp @@ -21,8 +21,8 @@ #include <utils/Errors.h> #include <utils/Log.h> -#include "Buffer.h" -#include "BufferAllocator.h" +#include <ui/GraphicBuffer.h> + #include "LayerDim.h" #include "SurfaceFlinger.h" #include "DisplayHardware/DisplayHardware.h" @@ -70,9 +70,9 @@ void LayerDim::initDimmer(SurfaceFlinger* flinger, uint32_t w, uint32_t h) if (LIKELY(flags & DisplayHardware::DIRECT_TEXTURE)) { // 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); + sp<GraphicBuffer> buffer = new GraphicBuffer(w, h, PIXEL_FORMAT_RGB_565, + GraphicBuffer::USAGE_SW_WRITE_OFTEN | + GraphicBuffer::USAGE_HW_TEXTURE); android_native_buffer_t* clientBuf = buffer->getNativeBuffer(); |