diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-19 16:23:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-19 16:23:29 -0800 |
| commit | 66112b114dc865d38f0eed3b3c56f961570ebe2f (patch) | |
| tree | 085930a879bfcfe4c998ae2e76d139fa53864e18 | |
| parent | 3250af908d1824d471a73925343f77a67438c8a3 (diff) | |
| parent | 60f5d3694b4422ac306320ea39678354cb534630 (diff) | |
| download | frameworks_native-66112b114dc865d38f0eed3b3c56f961570ebe2f.zip frameworks_native-66112b114dc865d38f0eed3b3c56f961570ebe2f.tar.gz frameworks_native-66112b114dc865d38f0eed3b3c56f961570ebe2f.tar.bz2 | |
Merge change I137dac6f into eclair
* changes:
backout a workaround that is not needed anymore
| -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. |