diff options
| author | Michael Lentine <mlentine@google.com> | 2014-10-01 22:44:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-01 22:44:46 +0000 |
| commit | db57cfbd6f9d5795846ef237fd297cb81e429679 (patch) | |
| tree | 6d6ac16215a356d2623d738f832e0b88e1617059 /services/surfaceflinger/SurfaceFlinger.h | |
| parent | dd230cb8d2a43ea453a507b12c612a221a3780e7 (diff) | |
| parent | 3f121fc650d72d0103cef8e6a651093fb1589e0a (diff) | |
| download | frameworks_native-db57cfbd6f9d5795846ef237fd297cb81e429679.zip frameworks_native-db57cfbd6f9d5795846ef237fd297cb81e429679.tar.gz frameworks_native-db57cfbd6f9d5795846ef237fd297cb81e429679.tar.bz2 | |
Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.h')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index 2cc522b..710dac7 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -377,7 +377,10 @@ private: void doComposition(); void doDebugFlashRegions(); void doDisplayComposition(const sp<const DisplayDevice>& hw, const Region& dirtyRegion); - void doComposeSurfaces(const sp<const DisplayDevice>& hw, const Region& dirty); + + // compose surfaces for display hw. this fails if using GL and the surface + // has been destroyed and is no longer valid. + bool doComposeSurfaces(const sp<const DisplayDevice>& hw, const Region& dirty); void postFramebuffer(); void drawWormhole(const sp<const DisplayDevice>& hw, const Region& region) const; |