diff options
| author | Ed Heyl <ed@google.com> | 2012-07-28 09:55:54 -0700 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2012-07-28 09:55:54 -0700 |
| commit | 747c480b0e3cf9401ff53421be6a82b23fdc04c2 (patch) | |
| tree | 5dec2bd0b82021367c1707faaf11be7a0b4b719b /libs | |
| parent | 657ea79b623101bd0ae540267645ecfd9a3e07ba (diff) | |
| parent | 72a36d876d81f0336173bc92996570db96cabd96 (diff) | |
| download | frameworks_native-747c480b0e3cf9401ff53421be6a82b23fdc04c2.zip frameworks_native-747c480b0e3cf9401ff53421be6a82b23fdc04c2.tar.gz frameworks_native-747c480b0e3cf9401ff53421be6a82b23fdc04c2.tar.bz2 | |
Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev
Conflicts:
include/media/hardware/CryptoAPI.h
Change-Id: I84bf34edbef000558f088bbf1d1e5b55d6217d2e
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ui/FramebufferNativeWindow.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp index 5a36c3b..31a69b2 100644 --- a/libs/ui/FramebufferNativeWindow.cpp +++ b/libs/ui/FramebufferNativeWindow.cpp @@ -93,8 +93,13 @@ FramebufferNativeWindow::FramebufferNativeWindow() mUpdateOnDemand = (fbDev->setUpdateRect != 0); // initialize the buffer FIFO - mNumBuffers = NUM_FRAME_BUFFERS; - mNumFreeBuffers = NUM_FRAME_BUFFERS; + if(fbDev->numFramebuffers >= MIN_NUM_FRAME_BUFFERS && + fbDev->numFramebuffers <= MAX_NUM_FRAME_BUFFERS){ + mNumBuffers = fbDev->numFramebuffers; + } else { + mNumBuffers = MIN_NUM_FRAME_BUFFERS; + } + mNumFreeBuffers = mNumBuffers; mBufferHead = mNumBuffers-1; /* @@ -158,10 +163,11 @@ FramebufferNativeWindow::FramebufferNativeWindow() FramebufferNativeWindow::~FramebufferNativeWindow() { if (grDev) { - if (buffers[0] != NULL) - grDev->free(grDev, buffers[0]->handle); - if (buffers[1] != NULL) - grDev->free(grDev, buffers[1]->handle); + for(int i = 0; i < mNumBuffers; i++) { + if (buffers[i] != NULL) { + grDev->free(grDev, buffers[i]->handle); + } + } gralloc_close(grDev); } |