Permalink
Browse files

fix build

*missing from 4.2.2 merge

Change-Id: I1dd9710d41a2d2fb0a8a326a4d64cc6987706eef
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
  • Loading branch information...
1 parent 47a5d59 commit 1d8c395d3119d8cd2b41f591da5a6f6b7291c30c @Whitehawkx Whitehawkx committed Feb 15, 2013
Showing with 4 additions and 1 deletion.
  1. +1 −1 libs/ui/GraphicBufferAllocator.cpp
  2. +3 −0 services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -199,7 +199,6 @@ status_t GraphicBufferAllocator::alloc(uint32_t w, uint32_t h, PixelFormat forma
w = h = 1;
// we have a h/w allocator and h/w buffer is requested
- status_t err;
#ifdef EXYNOS4_ENHANCEMENTS
if ((format == 0x101) || (format == 0x105) || (format == 0x107)) {
@@ -209,6 +208,7 @@ status_t GraphicBufferAllocator::alloc(uint32_t w, uint32_t h, PixelFormat forma
usage |= GRALLOC_USAGE_HW_FIMC1; // Exynos HWC wants FIMC-friendly memory allocation
}
#endif
+ status_t err;
// If too many async frees are queued up then wait for some of them to
// complete before attempting to allocate more memory. This is exercised
@@ -1000,6 +1000,9 @@ class HWCLayerVersion0 : public Iterable<HWCLayerVersion0, hwc_layer_t> {
getLayer()->visibleRegionScreen.numRects = 0;
getLayer()->visibleRegionScreen.rects = NULL;
}
+ virtual void setPerFrameDefaultState() {
+ //getLayer()->compositionType = HWC_FRAMEBUFFER;
+ }
virtual void setSkip(bool skip) {
if (skip) {
getLayer()->flags |= HWC_SKIP_LAYER;

0 comments on commit 1d8c395

Please sign in to comment.