diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 19:52:22 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 21:15:25 -0700 |
| commit | 9261bae1d2a769cb7453d2cadb6040be38ec86e5 (patch) | |
| tree | b9edeeb20bf20eb9f76902a9671dbe10e871717b /libs/surfaceflinger/Layer.cpp | |
| parent | 4cce5bd5ccc7c8468d0f8cc359525f82a45dedec (diff) | |
| parent | 4d3b5c1e36f2a3746a1c87f8af97d4fe97e8f49e (diff) | |
| download | frameworks_native-9261bae1d2a769cb7453d2cadb6040be38ec86e5.zip frameworks_native-9261bae1d2a769cb7453d2cadb6040be38ec86e5.tar.gz frameworks_native-9261bae1d2a769cb7453d2cadb6040be38ec86e5.tar.bz2 | |
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 f65d669..96395a8 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 |