diff options
| author | 2009-07-25 19:52:22 -0700 | |
|---|---|---|
| committer | 2009-07-25 21:15:25 -0700 | |
| commit | 2af1b3db3d4f687d008db74b150f149e956b4bc6 (patch) | |
| tree | 39d7d5bf15667c01f9b6dfe02bdd0e7fa36cd303 /libs/surfaceflinger/Layer.cpp | |
| parent | 8ecb36eec61f119f500a805b82438aadb3396a19 (diff) | |
| parent | cf4550c3198d6b3d92cdc52707fe70d7cc0caa9f (diff) | |
Merge korg/donut into korg/master
Diffstat (limited to 'libs/surfaceflinger/Layer.cpp')
| -rw-r--r-- | libs/surfaceflinger/Layer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/surfaceflinger/Layer.cpp b/libs/surfaceflinger/Layer.cpp index f65d66984d7f..96395a883c13 100644 --- a/libs/surfaceflinger/Layer.cpp +++ b/libs/surfaceflinger/Layer.cpp @@ -108,7 +108,7 @@ status_t Layer::setBuffers( Client* client, // we always force a 4-byte aligned bpr. uint32_t alignment = 1; - if (flags & ISurfaceComposer::eGPU) { + if ((flags & ISurfaceComposer::eGPU) && (mFlinger->getGPU() != 0)) { // FIXME: this value should come from the h/w alignment = 8; // FIXME: this is msm7201A specific, as its GPU only supports |