diff options
| author | 2013-03-05 01:04:53 +0000 | |
|---|---|---|
| committer | 2013-03-05 01:04:54 +0000 | |
| commit | eabe3140f11e515639e7a70a1286dd6af7352c9e (patch) | |
| tree | 41e01a2e42f487b7db9f2464dc4e25d61fc10ccf /services/surfaceflinger/DisplayDevice.cpp | |
| parent | f59d2f9070621e8f36b2ded3ec1d07bd3aec6150 (diff) | |
| parent | 01e29054e672301e4adbbca15b3562a59a20f267 (diff) | |
Merge "Init displays to null layer stack" into jb-mr2-dev
Diffstat (limited to 'services/surfaceflinger/DisplayDevice.cpp')
| -rw-r--r-- | services/surfaceflinger/DisplayDevice.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp index f9cc341811..ed2768c9cc 100644 --- a/services/surfaceflinger/DisplayDevice.cpp +++ b/services/surfaceflinger/DisplayDevice.cpp @@ -89,7 +89,7 @@ DisplayDevice::DisplayDevice( mIsSecure(isSecure), mSecureLayerVisible(false), mScreenAcquired(false), - mLayerStack(0), + mLayerStack(NO_LAYER_STACK), mOrientation() { init(config); @@ -196,13 +196,13 @@ void DisplayDevice::flip(const Region& dirty) const EGLDisplay dpy = mDisplay; EGLSurface surface = mSurface; -#ifdef EGL_ANDROID_swap_rectangle +#ifdef EGL_ANDROID_swap_rectangle if (mFlags & SWAP_RECTANGLE) { const Region newDirty(dirty.intersect(bounds())); const Rect b(newDirty.getBounds()); eglSetSwapRectangleANDROID(dpy, surface, b.left, b.top, b.width(), b.height()); - } + } #endif mPageFlipCount++; |