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 /include/ui/FramebufferNativeWindow.h | |
| 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 'include/ui/FramebufferNativeWindow.h')
| -rw-r--r-- | include/ui/FramebufferNativeWindow.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/ui/FramebufferNativeWindow.h b/include/ui/FramebufferNativeWindow.h index e0b14f7..5ec738f 100644 --- a/include/ui/FramebufferNativeWindow.h +++ b/include/ui/FramebufferNativeWindow.h @@ -28,7 +28,8 @@ #include <ui/ANativeObjectBase.h> #include <ui/Rect.h> -#define NUM_FRAME_BUFFERS 2 +#define MIN_NUM_FRAME_BUFFERS 2 +#define MAX_NUM_FRAME_BUFFERS 3 extern "C" EGLNativeWindowType android_createDisplaySurface(void); @@ -77,7 +78,7 @@ private: framebuffer_device_t* fbDev; alloc_device_t* grDev; - sp<NativeBuffer> buffers[NUM_FRAME_BUFFERS]; + sp<NativeBuffer> buffers[MAX_NUM_FRAME_BUFFERS]; sp<NativeBuffer> front; mutable Mutex mutex; |