diff options
| author | Mathias Agopian <mathias@google.com> | 2009-11-19 17:45:20 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-19 17:45:20 -0800 |
| commit | 5e04bbc7613da127ad830c51113d161cef4c3296 (patch) | |
| tree | c217870091ea58a2903ccbbd119cdcc881c2a4eb /libs | |
| parent | cc829a652ba3c0caaca8a6bdbab1c3385fa49c83 (diff) | |
| parent | 9aaf01b9d03e931c9d37858562ea47dbaf44a3be (diff) | |
| download | frameworks_base-5e04bbc7613da127ad830c51113d161cef4c3296.zip frameworks_base-5e04bbc7613da127ad830c51113d161cef4c3296.tar.gz frameworks_base-5e04bbc7613da127ad830c51113d161cef4c3296.tar.bz2 | |
am 9aaf01b9: am 793810f6: am 23aa34a7: Merge change I137dac6f into eclair
Merge commit '9aaf01b9d03e931c9d37858562ea47dbaf44a3be'
* commit '9aaf01b9d03e931c9d37858562ea47dbaf44a3be':
backout a workaround that is not needed anymore
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/surfaceflinger/LayerBlur.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/surfaceflinger/LayerBlur.cpp b/libs/surfaceflinger/LayerBlur.cpp index 5d4a38b..5fd7904 100644 --- a/libs/surfaceflinger/LayerBlur.cpp +++ b/libs/surfaceflinger/LayerBlur.cpp @@ -169,7 +169,6 @@ void LayerBlur::onDraw(const Region& clip) const // This reads the frame-buffer, so a h/w GL would have to // finish() its rendering first. we don't want to do that // too often. Read data is 4-bytes aligned. - glFinish(); glReadPixels(X, Y, w, h, mReadFormat, mReadType, pixels); // blur that texture. |